component/bt: Add a macro to control the compilation of blufi.

This commit is contained in:
wangcheng
2020-08-07 15:02:53 +08:00
parent 3adfbaeb2f
commit e7375c79b0
10 changed files with 39 additions and 10 deletions

View File

@ -90,9 +90,9 @@ static const btc_func_t profile_tab[BTC_PID_NUM] = {
#endif ///BLE_INCLUDED == TRUE #endif ///BLE_INCLUDED == TRUE
[BTC_PID_BLE_HID] = {NULL, NULL}, [BTC_PID_BLE_HID] = {NULL, NULL},
[BTC_PID_SPPLIKE] = {NULL, NULL}, [BTC_PID_SPPLIKE] = {NULL, NULL},
#if (GATTS_INCLUDED == TRUE) #if (BLUFI_INCLUDED == TRUE)
[BTC_PID_BLUFI] = {btc_blufi_call_handler, btc_blufi_cb_handler }, [BTC_PID_BLUFI] = {btc_blufi_call_handler, btc_blufi_cb_handler },
#endif ///GATTS_INCLUDED == TRUE #endif ///BLUFI_INCLUDED == TRUE
[BTC_PID_DM_SEC] = {NULL, btc_dm_sec_cb_handler }, [BTC_PID_DM_SEC] = {NULL, btc_dm_sec_cb_handler },
#endif #endif
[BTC_PID_ALARM] = {btc_alarm_handler, NULL }, [BTC_PID_ALARM] = {btc_alarm_handler, NULL },
@ -275,12 +275,13 @@ static void btc_deinit_mem(void) {
osi_free(btc_creat_tab_env_ptr); osi_free(btc_creat_tab_env_ptr);
btc_creat_tab_env_ptr = NULL; btc_creat_tab_env_ptr = NULL;
} }
#if (BLUFI_INCLUDED == TRUE)
if (blufi_env_ptr) { if (blufi_env_ptr) {
osi_free(blufi_env_ptr); osi_free(blufi_env_ptr);
blufi_env_ptr = NULL; blufi_env_ptr = NULL;
} }
#endif #endif
#endif
#if BTC_HF_CLIENT_INCLUDED == TRUE && HFP_DYNAMIC_MEMORY == TRUE #if BTC_HF_CLIENT_INCLUDED == TRUE && HFP_DYNAMIC_MEMORY == TRUE
if (hf_client_local_param_ptr) { if (hf_client_local_param_ptr) {
@ -329,12 +330,13 @@ static bt_status_t btc_init_mem(void) {
goto error_exit; goto error_exit;
} }
memset((void *)btc_creat_tab_env_ptr, 0, sizeof(esp_btc_creat_tab_t)); memset((void *)btc_creat_tab_env_ptr, 0, sizeof(esp_btc_creat_tab_t));
#if (BLUFI_INCLUDED == TRUE)
if ((blufi_env_ptr = (tBLUFI_ENV *)osi_malloc(sizeof(tBLUFI_ENV))) == NULL) { if ((blufi_env_ptr = (tBLUFI_ENV *)osi_malloc(sizeof(tBLUFI_ENV))) == NULL) {
goto error_exit; goto error_exit;
} }
memset((void *)blufi_env_ptr, 0, sizeof(tBLUFI_ENV)); memset((void *)blufi_env_ptr, 0, sizeof(tBLUFI_ENV));
#endif #endif
#endif
#if BTC_HF_CLIENT_INCLUDED == TRUE && HFP_DYNAMIC_MEMORY == TRUE #if BTC_HF_CLIENT_INCLUDED == TRUE && HFP_DYNAMIC_MEMORY == TRUE
if ((hf_client_local_param_ptr = (hf_client_local_param_t *)osi_malloc(sizeof(hf_client_local_param_t))) == NULL) { if ((hf_client_local_param_ptr = (hf_client_local_param_t *)osi_malloc(sizeof(hf_client_local_param_t))) == NULL) {

View File

@ -53,7 +53,9 @@ typedef enum {
BTC_PID_GAP_BLE, BTC_PID_GAP_BLE,
BTC_PID_BLE_HID, BTC_PID_BLE_HID,
BTC_PID_SPPLIKE, BTC_PID_SPPLIKE,
#if (BLUFI_INCLUDED == TRUE)
BTC_PID_BLUFI, BTC_PID_BLUFI,
#endif ///BLUFI_INCLUDED == TRUE
BTC_PID_DM_SEC, BTC_PID_DM_SEC,
BTC_PID_ALARM, BTC_PID_ALARM,
#if (CLASSIC_BT_INCLUDED == TRUE) #if (CLASSIC_BT_INCLUDED == TRUE)

View File

@ -118,6 +118,13 @@ config BT_GATTS_ENABLE
help help
This option can be disabled when the app work only on gatt client mode This option can be disabled when the app work only on gatt client mode
config BT_BLE_BLUFI_ENABLE
bool "Include blufi function"
depends on BT_GATTS_ENABLE
default n
help
This option can be close when the app does not require blufi function.
choice BT_GATTS_SEND_SERVICE_CHANGE_MODE choice BT_GATTS_SEND_SERVICE_CHANGE_MODE
prompt "GATTS Service Change Mode" prompt "GATTS Service Change Mode"
default BT_GATTS_SEND_SERVICE_CHANGE_AUTO default BT_GATTS_SEND_SERVICE_CHANGE_AUTO

View File

@ -23,7 +23,8 @@
#include "osi/future.h" #include "osi/future.h"
#include "btc_gatts.h" #include "btc_gatts.h"
#include "btc_gatt_util.h" #include "btc_gatt_util.h"
#include "common/bt_target.h"
#if (BLUFI_INCLUDED == TRUE)
esp_err_t esp_blufi_register_callbacks(esp_blufi_callbacks_t *callbacks) esp_err_t esp_blufi_register_callbacks(esp_blufi_callbacks_t *callbacks)
{ {
if (esp_bluedroid_get_status() == ESP_BLUEDROID_STATUS_UNINITIALIZED) { if (esp_bluedroid_get_status() == ESP_BLUEDROID_STATUS_UNINITIALIZED) {
@ -162,3 +163,4 @@ esp_err_t esp_blufi_send_custom_data(uint8_t *data, uint32_t data_len)
return (btc_transfer_context(&msg, &arg, sizeof(btc_blufi_args_t), btc_blufi_call_deep_copy) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL); return (btc_transfer_context(&msg, &arg, sizeof(btc_blufi_args_t), btc_blufi_call_deep_copy) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL);
} }
#endif ///BLUFI_INCLUDED == TRUE

View File

@ -38,7 +38,7 @@
#include "esp_blufi_api.h" #include "esp_blufi_api.h"
#include "esp_gatt_common_api.h" #include "esp_gatt_common_api.h"
#if (GATTS_INCLUDED == TRUE) #if (BLUFI_INCLUDED == TRUE)
#define BT_BD_ADDR_STR "%02x:%02x:%02x:%02x:%02x:%02x" #define BT_BD_ADDR_STR "%02x:%02x:%02x:%02x:%02x:%02x"
#define BT_BD_ADDR_HEX(addr) addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] #define BT_BD_ADDR_HEX(addr) addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]
@ -1134,4 +1134,4 @@ uint16_t btc_blufi_get_version(void)
return BTC_BLUFI_VERSION; return BTC_BLUFI_VERSION;
} }
#endif ///GATTS_INCLUDED == TRUE #endif ///BLUFI_INCLUDED == TRUE

View File

@ -34,8 +34,7 @@
#include "blufi_int.h" #include "blufi_int.h"
//#include "esp_wifi.h" //#include "esp_wifi.h"
#if (BLUFI_INCLUDED == TRUE)
#if (GATTS_INCLUDED == TRUE)
// extern tBLUFI_ENV blufi_env; // extern tBLUFI_ENV blufi_env;
void btc_blufi_protocol_handler(uint8_t type, uint8_t *data, int len) void btc_blufi_protocol_handler(uint8_t type, uint8_t *data, int len)
@ -269,4 +268,4 @@ void btc_blufi_protocol_handler(uint8_t type, uint8_t *data, int len)
} }
} }
#endif ///(GATTS_INCLUDED == TRUE) #endif ///BLUFI_INCLUDED == TRUE

View File

@ -15,6 +15,7 @@
#ifndef __BLUFI_INT_H__ #ifndef __BLUFI_INT_H__
#define __BLUFI_INT_H__ #define __BLUFI_INT_H__
#if (BLUFI_INCLUDED == TRUE)
#define BTC_BLUFI_GREAT_VER 0x01 //Version + Subversion #define BTC_BLUFI_GREAT_VER 0x01 //Version + Subversion
#define BTC_BLUFI_SUB_VER 0x02 //Version + Subversion #define BTC_BLUFI_SUB_VER 0x02 //Version + Subversion
#define BTC_BLUFI_VERSION ((BTC_BLUFI_GREAT_VER<<8)|BTC_BLUFI_SUB_VER) //Version + Subversion #define BTC_BLUFI_VERSION ((BTC_BLUFI_GREAT_VER<<8)|BTC_BLUFI_SUB_VER) //Version + Subversion
@ -191,3 +192,4 @@ void btc_blufi_cb_deep_copy(btc_msg_t *msg, void *p_dest, void *p_src);
void btc_blufi_cb_deep_free(btc_msg_t *msg); void btc_blufi_cb_deep_free(btc_msg_t *msg);
#endif /* __BLUFI_INT_H__ */ #endif /* __BLUFI_INT_H__ */
#endif ///BLUFI_INCLUDED == TRUE

View File

@ -88,6 +88,13 @@
#define UC_BT_GATTC_ENABLE FALSE #define UC_BT_GATTC_ENABLE FALSE
#endif #endif
//BLUFI
#ifdef CONFIG_BT_BLE_BLUFI_ENABLE
#define UC_BT_BLUFI_ENABLE CONFIG_BT_BLE_BLUFI_ENABLE
#else
#define UC_BT_BLUFI_ENABLE FALSE
#endif
//GATTC CACHE //GATTC CACHE
#ifdef CONFIG_BT_GATTC_CACHE_NVS_FLASH #ifdef CONFIG_BT_GATTC_CACHE_NVS_FLASH
#define UC_BT_GATTC_CACHE_NVS_FLASH_ENABLED CONFIG_BT_GATTC_CACHE_NVS_FLASH #define UC_BT_GATTC_CACHE_NVS_FLASH_ENABLED CONFIG_BT_GATTC_CACHE_NVS_FLASH

View File

@ -144,6 +144,12 @@
#define GATTC_INCLUDED FALSE #define GATTC_INCLUDED FALSE
#endif /* UC_BT_GATTC_ENABLE */ #endif /* UC_BT_GATTC_ENABLE */
#if (UC_BT_BLUFI_ENABLE)
#define BLUFI_INCLUDED TRUE
#else
#define BLUFI_INCLUDED FALSE
#endif /* UC_BT_BLUFI_ENABLE */
#if (UC_BT_GATTC_ENABLE && UC_BT_GATTC_CACHE_NVS_FLASH_ENABLED) #if (UC_BT_GATTC_ENABLE && UC_BT_GATTC_CACHE_NVS_FLASH_ENABLED)
#define GATTC_CACHE_NVS TRUE #define GATTC_CACHE_NVS TRUE
#else #else

View File

@ -29,3 +29,5 @@ CONFIG_BT_ACL_CONNECTIONS=4
CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=n CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=n
CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=n CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=n
CONFIG_BT_SMP_ENABLE=n CONFIG_BT_SMP_ENABLE=n
CONFIG_BT_BLE_BLUFI_ENABLE=y
CONFIG_MBEDTLS_HARDWARE_MPI=n