From 20286b37b23489028794c59a6ef34e678c6f7713 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 14 Jan 2022 18:57:46 +0100 Subject: [PATCH] blufi: remove duplicate definition of blufi_env Keeping the single definition in blufi_prf.c --- .../btc/profile/esp/blufi/bluedroid_host/esp_blufi.c | 8 +------- .../bt/common/btc/profile/esp/blufi/blufi_protocol.c | 3 +-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/components/bt/common/btc/profile/esp/blufi/bluedroid_host/esp_blufi.c b/components/bt/common/btc/profile/esp/blufi/bluedroid_host/esp_blufi.c index d55007de50..ff0b96600a 100644 --- a/components/bt/common/btc/profile/esp/blufi/bluedroid_host/esp_blufi.c +++ b/components/bt/common/btc/profile/esp/blufi/bluedroid_host/esp_blufi.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -35,12 +35,6 @@ #if (BLUFI_INCLUDED == TRUE) -#if GATT_DYNAMIC_MEMORY == FALSE -tBLUFI_ENV blufi_env; -#else -tBLUFI_ENV *blufi_env_ptr; -#endif - static uint8_t server_if; static uint16_t conn_id; static uint8_t blufi_service_uuid128[32] = { diff --git a/components/bt/common/btc/profile/esp/blufi/blufi_protocol.c b/components/bt/common/btc/profile/esp/blufi/blufi_protocol.c index d2828df0d8..24f81c5fab 100644 --- a/components/bt/common/btc/profile/esp/blufi/blufi_protocol.c +++ b/components/bt/common/btc/profile/esp/blufi/blufi_protocol.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -18,7 +18,6 @@ //#include "esp_wifi.h" #if (BLUFI_INCLUDED == TRUE) -// extern tBLUFI_ENV blufi_env; void btc_blufi_protocol_handler(uint8_t type, uint8_t *data, int len) {