From d97313cac8595212a181a3993cde376b9b3944bb Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sun, 20 Nov 2022 17:59:08 +1100 Subject: [PATCH] Fix c++ for config --- .../ble/ble_stack/port/include/ble_config.h | 259 +++++++++--------- 1 file changed, 131 insertions(+), 128 deletions(-) diff --git a/source/Core/BSP/Pinecilv2/bl_mcu_sdk/components/ble/ble_stack/port/include/ble_config.h b/source/Core/BSP/Pinecilv2/bl_mcu_sdk/components/ble/ble_stack/port/include/ble_config.h index 278219af..9c4d83d6 100644 --- a/source/Core/BSP/Pinecilv2/bl_mcu_sdk/components/ble/ble_stack/port/include/ble_config.h +++ b/source/Core/BSP/Pinecilv2/bl_mcu_sdk/components/ble/ble_stack/port/include/ble_config.h @@ -2,6 +2,9 @@ #define BLE_CONFIG_H #include "FreeRTOSConfig.h" +#ifdef __cplusplus +extern "C" { +#endif /** * CONFIG_BLUETOOTH: Enable the bluetooh stack @@ -54,9 +57,9 @@ #ifndef CONFIG_BT_RX_STACK_SIZE #if defined(CONFIG_BT_MESH) -#define CONFIG_BT_RX_STACK_SIZE 3072 //2048//1536//1024 +#define CONFIG_BT_RX_STACK_SIZE 3072 // 2048//1536//1024 #else -#define CONFIG_BT_RX_STACK_SIZE 2048 //1536//1024 +#define CONFIG_BT_RX_STACK_SIZE 2048 // 1536//1024 #endif #endif @@ -74,7 +77,7 @@ */ #ifndef CONFIG_BT_HCI_TX_STACK_SIZE -#define CONFIG_BT_HCI_TX_STACK_SIZE 1536 //1024//200 +#define CONFIG_BT_HCI_TX_STACK_SIZE 1536 // 1024//200 #endif /** @@ -96,63 +99,63 @@ #endif /** -* CONFIG_BT_HCI_CMD_COUNT: hci cmd buffer count,range 2 to 64 -*/ + * CONFIG_BT_HCI_CMD_COUNT: hci cmd buffer count,range 2 to 64 + */ #ifndef CONFIG_BT_HCI_CMD_COUNT #define CONFIG_BT_HCI_CMD_COUNT 2 #endif /** -* CONFIG_BT_RX_BUF_COUNT: number of buffer for incoming ACL packages or HCI -* events,range 2 to 255 -*/ + * CONFIG_BT_RX_BUF_COUNT: number of buffer for incoming ACL packages or HCI + * events,range 2 to 255 + */ #ifndef CONFIG_BT_RX_BUF_COUNT #if defined(CONFIG_BT_MESH) #define CONFIG_BT_RX_BUF_COUNT 10 #else #define CONFIG_BT_RX_BUF_COUNT 5 -#endif //CONFIG_BT_MESH +#endif // CONFIG_BT_MESH #endif /** -* CONFIG_BT_RX_BUF_RSV_COUNT: number of buffer that HCI_LE_EVENT reserved -* events,range 1 to CONFIG_BT_RX_BUF_COUNT -*/ + * CONFIG_BT_RX_BUF_RSV_COUNT: number of buffer that HCI_LE_EVENT reserved + * events,range 1 to CONFIG_BT_RX_BUF_COUNT + */ #define CONFIG_BT_RX_BUF_RSV_COUNT (1) #if (CONFIG_BT_RX_BUF_RSV_COUNT >= CONFIG_BT_RX_BUF_COUNT) #error "CONFIG_BT_RX_BUF_RSV_COUNT config error" #endif /** -* CONFIG_BT_RX_BUF_LEN: the max length for rx buffer -* range 73 to 2000 -*/ + * CONFIG_BT_RX_BUF_LEN: the max length for rx buffer + * range 73 to 2000 + */ #ifndef CONFIG_BT_RX_BUF_LEN #if defined(CONFIG_BT_BREDR) -#define CONFIG_BT_RX_BUF_LEN 680 //CONFIG_BT_L2CAP_RX_MTU + 4 + 4 +#define CONFIG_BT_RX_BUF_LEN 680 // CONFIG_BT_L2CAP_RX_MTU + 4 + 4 #else -#define CONFIG_BT_RX_BUF_LEN 255 //108 //76 +#define CONFIG_BT_RX_BUF_LEN 255 // 108 //76 #endif #endif /** -* CONFIG_BT_CENTRAL: Enable central Role -*/ + * CONFIG_BT_CENTRAL: Enable central Role + */ #ifdef CONFIG_BT_CENTRAL #undef CONFIG_BT_CENTRAL #define CONFIG_BT_CENTRAL 1 #endif /** -* CONFIG_BT_WHITELIST : Enable autoconnect whilt list device */ + * CONFIG_BT_WHITELIST : Enable autoconnect whilt list device */ #ifndef CONFIG_BT_WHITELIST #define CONFIG_BT_WHITELIST 1 #endif /** -* CONFIG_BT_PERIPHERAL: Enable peripheral Role -*/ + * CONFIG_BT_PERIPHERAL: Enable peripheral Role + */ #ifdef CONFIG_BT_PERIPHERAL #undef CONFIG_BT_PERIPHERAL #define CONFIG_BT_PERIPHERAL 1 @@ -175,29 +178,29 @@ #endif #endif /** -* CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT: number of buffer for outgoing L2CAP packages -* range 2 to 255 -*/ + * CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT: number of buffer for outgoing L2CAP packages + * range 2 to 255 + */ #ifndef CONFIG_BT_L2CAP_TX_BUF_COUNT #define CONFIG_BT_L2CAP_TX_BUF_COUNT CFG_BLE_TX_BUFF_DATA #endif /** -* CONFIG_BT_L2CAP_TX_MTU: Max L2CAP MTU for L2CAP tx buffer -* range 65 to 2000 if SMP enabled,otherwise range 23 to 2000 -*/ + * CONFIG_BT_L2CAP_TX_MTU: Max L2CAP MTU for L2CAP tx buffer + * range 65 to 2000 if SMP enabled,otherwise range 23 to 2000 + */ #ifndef CONFIG_BT_L2CAP_TX_MTU #ifdef CONFIG_BT_SMP -#define CONFIG_BT_L2CAP_TX_MTU 247 //96 //65 +#define CONFIG_BT_L2CAP_TX_MTU 247 // 96 //65 #else -#define CONFIG_BT_L2CAP_TX_MTU 247 //23 +#define CONFIG_BT_L2CAP_TX_MTU 247 // 23 #endif #endif /** -* CONFIG_BT_L2CAP_TX_USER_DATA_SIZE: the max length for L2CAP tx buffer user data size -* range 4 to 65535 -*/ + * CONFIG_BT_L2CAP_TX_USER_DATA_SIZE: the max length for L2CAP tx buffer user data size + * range 4 to 65535 + */ #ifndef CONFIG_BT_L2CAP_TX_USER_DATA_SIZE #define CONFIG_BT_L2CAP_TX_USER_DATA_SIZE 4 #endif @@ -206,53 +209,53 @@ #define CONFIG_BT_ATT_PREPARE_COUNT 64 #else /** -* CONFIG_BT_ATT_PREPARE_COUNT: Number of buffers available for ATT prepare write, setting -* this to 0 disables GATT long/reliable writes. -* range 0 to 64 -*/ + * CONFIG_BT_ATT_PREPARE_COUNT: Number of buffers available for ATT prepare write, setting + * this to 0 disables GATT long/reliable writes. + * range 0 to 64 + */ #ifndef CONFIG_BT_ATT_PREPARE_COUNT #define CONFIG_BT_ATT_PREPARE_COUNT 0 #endif #endif /** -* CONFIG_BLUETOOTH_SMP:Eable the Security Manager Protocol -* (SMP), making it possible to pair devices over LE -*/ + * CONFIG_BLUETOOTH_SMP:Eable the Security Manager Protocol + * (SMP), making it possible to pair devices over LE + */ #ifdef CONFIG_BT_SMP #undef CONFIG_BT_SMP #define CONFIG_BT_SMP 1 /** -* CONFIG_BT_SIGNING:enables data signing which is used for transferring -* authenticated data in an unencrypted connection -*/ + * CONFIG_BT_SIGNING:enables data signing which is used for transferring + * authenticated data in an unencrypted connection + */ #ifdef CONFIG_BT_SIGNING #undef CONFIG_BT_SIGNING #define CONFIG_BT_SIGNING 1 #endif /** -* CONFIG_BT_SMP_SC_ONLY:enables support for Secure Connection Only Mode. In this -* mode device shall only use Security Mode 1 Level 4 with exception -* for services that only require Security Mode 1 Level 1 (no security). -* Security Mode 1 Level 4 stands for authenticated LE Secure Connections -* pairing with encryption. Enabling this option disables legacy pairing -*/ + * CONFIG_BT_SMP_SC_ONLY:enables support for Secure Connection Only Mode. In this + * mode device shall only use Security Mode 1 Level 4 with exception + * for services that only require Security Mode 1 Level 1 (no security). + * Security Mode 1 Level 4 stands for authenticated LE Secure Connections + * pairing with encryption. Enabling this option disables legacy pairing + */ #ifdef CONFIG_BT_SMP_SC_ONLY #undef CONFIG_BT_SMP_SC_ONLY #define CONFIG_BT_SMP_SC_ONLY 1 #endif /** -* CONFIG_BT_USE_DEBUG_KEYS:This option places Security Manager in -* a Debug Mode. In this mode predefined -* Diffie-Hellman private/public key pair is used as described -* in Core Specification Vol. 3, Part H, 2.3.5.6.1. This option should -* only be enabled for debugging and should never be used in production. -* If this option is enabled anyone is able to decipher encrypted air -* traffic. -*/ + * CONFIG_BT_USE_DEBUG_KEYS:This option places Security Manager in + * a Debug Mode. In this mode predefined + * Diffie-Hellman private/public key pair is used as described + * in Core Specification Vol. 3, Part H, 2.3.5.6.1. This option should + * only be enabled for debugging and should never be used in production. + * If this option is enabled anyone is able to decipher encrypted air + * traffic. + */ #ifdef CONFIG_BT_USE_DEBUG_KEYS #ifndef CONFIG_BT_TINYCRYPT_ECC #error "CONFIG_BT_USE_DEBUG_KEYS depends on CONFIG_BT_TINYCRYPT_ECC" @@ -262,9 +265,9 @@ #endif /** -* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL:enables support for LE Connection -* oriented Channels,allowing the creation of dynamic L2CAP Channels -*/ + * CONFIG_BT_L2CAP_DYNAMIC_CHANNEL:enables support for LE Connection + * oriented Channels,allowing the creation of dynamic L2CAP Channels + */ #ifdef CONFIG_BT_L2CAP_DYNAMIC_CHANNEL #undef CONFIG_BT_L2CAP_DYNAMIC_CHANNEL #define CONFIG_BT_L2CAP_DYNAMIC_CHANNEL 1 @@ -273,9 +276,9 @@ #endif /** -* CONFIG_BT_PRIVACY:Enable local Privacy Feature support. This makes it possible -* to use Resolvable Private Addresses (RPAs). -*/ + * CONFIG_BT_PRIVACY:Enable local Privacy Feature support. This makes it possible + * to use Resolvable Private Addresses (RPAs). + */ #ifdef CONFIG_BT_PRIVACY #ifndef CONFIG_BT_SMP #error "CONFIG_BT_PRIVACY depends on CONFIG_BT_SMP" @@ -284,65 +287,65 @@ #define CONFIG_BT_PRIVACY 1 /** -* CONFIG_BT_RPA_TIMEOUT:Resolvable Private Address timeout -* range 1 to 65535,seconds -*/ + * CONFIG_BT_RPA_TIMEOUT:Resolvable Private Address timeout + * range 1 to 65535,seconds + */ #ifndef CONFIG_BT_RPA_TIMEOUT #define CONFIG_BT_RPA_TIMEOUT 900 #endif #endif /** -* CONFIG_BT_GATT_DYNAMIC_DB:enables GATT services to be added dynamically to database -*/ + * CONFIG_BT_GATT_DYNAMIC_DB:enables GATT services to be added dynamically to database + */ #ifdef CONFIG_BT_GATT_DYNAMIC_DB #undef CONFIG_BT_GATT_DYNAMIC_DB #define CONFIG_BT_GATT_DYNAMIC_DB 1 #endif /** -* CONFIG_BT_GATT_CLIENT:GATT client role support -*/ + * CONFIG_BT_GATT_CLIENT:GATT client role support + */ #ifdef CONFIG_BT_GATT_CLIENT #undef CONFIG_BT_GATT_CLIENT #define CONFIG_BT_GATT_CLIENT 1 #endif /** -* CONFIG_BT_MAX_PAIRED:Maximum number of paired devices -* range 1 to 128 -*/ + * CONFIG_BT_MAX_PAIRED:Maximum number of paired devices + * range 1 to 128 + */ #ifndef CONFIG_BT_MAX_PAIRED #define CONFIG_BT_MAX_PAIRED CONFIG_BT_MAX_CONN #endif #endif /** -* If this option is set TinyCrypt library is used for emulating the -* ECDH HCI commands and events needed by e.g. LE Secure Connections. -* In builds including the BLE Host, if not set the controller crypto is -* used for ECDH and if the controller doesn't support the required HCI -* commands the LE Secure Connections support will be disabled. -* In builds including the HCI Raw interface and the BLE Controller, this -* option injects support for the 2 HCI commands required for LE Secure -* Connections so that Hosts can make use of those -*/ + * If this option is set TinyCrypt library is used for emulating the + * ECDH HCI commands and events needed by e.g. LE Secure Connections. + * In builds including the BLE Host, if not set the controller crypto is + * used for ECDH and if the controller doesn't support the required HCI + * commands the LE Secure Connections support will be disabled. + * In builds including the HCI Raw interface and the BLE Controller, this + * option injects support for the 2 HCI commands required for LE Secure + * Connections so that Hosts can make use of those + */ #ifdef CONFIG_BT_TINYCRYPT_ECC #undef CONFIG_BT_TINYCRYPT_ECC #define CONFIG_BT_TINYCRYPT_ECC 1 #endif /** -* CONFIG_BLUETOOTH_MAX_CONN:Maximum number of connections -* range 1 to 128 -*/ + * CONFIG_BLUETOOTH_MAX_CONN:Maximum number of connections + * range 1 to 128 + */ #ifndef CONFIG_BT_MAX_CONN #define CONFIG_BT_MAX_CONN CFG_CON #endif /** -* CONFIG_BT_DEVICE_NAME:Bluetooth device name. Name can be up -* to 248 bytes long (excluding NULL termination). Can be empty string -*/ + * CONFIG_BT_DEVICE_NAME:Bluetooth device name. Name can be up + * to 248 bytes long (excluding NULL termination). Can be empty string + */ #ifndef CONFIG_BT_DEVICE_NAME #if defined(CONFIG_AUTO_PTS) #define CONFIG_BT_DEVICE_NAME "AUTO_PTS_TEST0123456789012345" @@ -357,8 +360,8 @@ #endif #endif /** -* CONFIG_BT_CONTROLLER_NAME:Bluetooth controller name. -*/ + * CONFIG_BT_CONTROLLER_NAME:Bluetooth controller name. + */ #ifndef CONFIG_BT_CONTROLLER_NAME #if defined(BL602) #define CONFIG_BT_CONTROLLER_NAME "BL602-BLE-DEV" @@ -368,33 +371,33 @@ #endif /** -* CONFIG_BT_MAX_SCO_CONN:Maximum number of simultaneous SCO connections. -*/ + * CONFIG_BT_MAX_SCO_CONN:Maximum number of simultaneous SCO connections. + */ #ifndef CONFIG_BT_MAX_SCO_CONN #define CONFIG_BT_MAX_SCO_CONN CONFIG_MAX_SCO #endif /** -* CONFIG_BT_WORK_QUEUE_STACK_SIZE:Work queue stack size. -*/ + * CONFIG_BT_WORK_QUEUE_STACK_SIZE:Work queue stack size. + */ #ifndef CONFIG_BT_WORK_QUEUE_STACK_SIZE #ifndef CONFIG_BT_MESH -#define CONFIG_BT_WORK_QUEUE_STACK_SIZE 1536 //1280//512 +#define CONFIG_BT_WORK_QUEUE_STACK_SIZE 1536 // 1280//512 #else #define CONFIG_BT_WORK_QUEUE_STACK_SIZE 2048 #endif /* CONFIG_BT_MESH */ #endif /** -* CONFIG_BT_WORK_QUEUE_PRIO:Work queue priority. -*/ + * CONFIG_BT_WORK_QUEUE_PRIO:Work queue priority. + */ #ifndef CONFIG_BT_WORK_QUEUE_PRIO #define CONFIG_BT_WORK_QUEUE_PRIO (configMAX_PRIORITIES - 2) #endif /** -* CONFIG_BT_HCI_RESERVE:Headroom that the driver needs for sending and receiving buffers. -*/ + * CONFIG_BT_HCI_RESERVE:Headroom that the driver needs for sending and receiving buffers. + */ #ifndef CONFIG_BT_HCI_RESERVE #ifdef CONFIG_BLUETOOTH_H4 #define CONFIG_BT_HCI_RESERVE 0 @@ -406,8 +409,8 @@ #endif /** -* CONFIG_BLUETOOTH_DEBUG_LOG:Enable bluetooth debug log. -*/ + * CONFIG_BLUETOOTH_DEBUG_LOG:Enable bluetooth debug log. + */ #if defined(BFLB_BLE) #if defined(CFG_BLE_STACK_DBG_PRINT) #undef CONFIG_BT_DEBUG @@ -422,64 +425,64 @@ #endif #endif /** -* CONFIG_BT_DEBUG_L2CAP:Enable bluetooth l2cap debug log. -*/ + * CONFIG_BT_DEBUG_L2CAP:Enable bluetooth l2cap debug log. + */ #ifdef CONFIG_BT_DEBUG_L2CAP #undef CONFIG_BT_DEBUG_L2CAP #define CONFIG_BT_DEBUG_L2CAP 1 #endif /** -* CONFIG_BT_DEBUG_CONN:Enable bluetooth conn debug log. -*/ + * CONFIG_BT_DEBUG_CONN:Enable bluetooth conn debug log. + */ #ifdef CONFIG_BT_DEBUG_CONN #undef CONFIG_BT_DEBUG_CONN #define CONFIG_BT_DEBUG_CONN 1 #endif /** -* CONFIG_BT_DEBUG_ATT:Enable bluetooth att debug log. -*/ + * CONFIG_BT_DEBUG_ATT:Enable bluetooth att debug log. + */ #ifdef CONFIG_BT_DEBUG_ATT #undef CONFIG_BT_DEBUG_ATT #define CONFIG_BT_DEBUG_ATT 1 #endif /** -* CONFIG_BT_DEBUG_GATT:Enable bluetooth gatt debug log. -*/ + * CONFIG_BT_DEBUG_GATT:Enable bluetooth gatt debug log. + */ #ifdef CONFIG_BT_DEBUG_GATT #undef CONFIG_BT_DEBUG_GATT #define CONFIG_BT_DEBUG_GATT 1 #endif /** -* CONFIG_BT_DEBUG_HCI_CORE:Enable bluetooth hci core debug log. -*/ + * CONFIG_BT_DEBUG_HCI_CORE:Enable bluetooth hci core debug log. + */ #ifdef CONFIG_BT_DEBUG_HCI_CORE #undef CONFIG_BT_DEBUG_HCI_CORE #define CONFIG_BT_DEBUG_HCI_CORE 1 #endif /** -* CONFIG_BT_DEBUG_HCI_DRIVER:Enable bluetooth hci driver debug log. -*/ + * CONFIG_BT_DEBUG_HCI_DRIVER:Enable bluetooth hci driver debug log. + */ #ifdef CONFIG_BT_DEBUG_HCI_DRIVER #undef CONFIG_BT_DEBUG_HCI_DRIVER #define CONFIG_BT_DEBUG_HCI_DRIVER 1 #endif /** -* CONFIG_BT_TEST:Enable bluetooth test. -*/ + * CONFIG_BT_TEST:Enable bluetooth test. + */ #ifdef CONFIG_BT_TEST #undef CONFIG_BT_TEST #define CONFIG_BT_TEST 1 #endif /** -* CONFIG_BT_DEBUG_CORE:Enable bluetooth core debug log. -*/ + * CONFIG_BT_DEBUG_CORE:Enable bluetooth core debug log. + */ #ifdef CONFIG_BT_DEBUG_CORE #undef CONFIG_BT_DEBUG_CORE #define CONFIG_BT_DEBUG_CORE 1 @@ -487,16 +490,16 @@ #ifndef CONFIG_BT_ATT_TX_MAX /* -* Take throuthput test into consideration, set att tx max the same with lowstack tx buffer count. -* att semaphore determine the max numble packets can send to lowsatck at once. -*/ + * Take throuthput test into consideration, set att tx max the same with lowstack tx buffer count. + * att semaphore determine the max numble packets can send to lowsatck at once. + */ #define CONFIG_BT_ATT_TX_MAX 10 #endif #ifndef CONFIG_BT_CONN_TX_MAX /* -* Take throuthput test into consideration, set upperstack conn tx max the same with lowstack tx buffer count. -*/ + * Take throuthput test into consideration, set upperstack conn tx max the same with lowstack tx buffer count. + */ #define CONFIG_BT_CONN_TX_MAX 10 #endif @@ -541,7 +544,7 @@ #endif #if defined(CONFIG_BT_BREDR) -#define CONFIG_BT_PAGE_TIMEOUT 0x2000 //5.12s +#define CONFIG_BT_PAGE_TIMEOUT 0x2000 // 5.12s #define CONFIG_BT_L2CAP_RX_MTU 672 #ifndef CONFIG_BT_RFCOMM_TX_STACK_SIZE @@ -555,7 +558,7 @@ #endif #if defined(CONFIG_BT_AUDIO) -#define CONFIG_BT_MAX_ISO_CONN 8 //range 1 to 64 +#define CONFIG_BT_MAX_ISO_CONN 8 // range 1 to 64 #endif @@ -574,7 +577,7 @@ //#define CONFIG_BT_ADV_WITH_PUBLIC_ADDR 1 #define CONFIG_BT_ATT_PREPARE_COUNT 64 #endif -#endif //BFLB_BLE +#endif // BFLB_BLE /*******************************Bouffalo Lab Patch******************************/ /*Fix the issue that DHKEY_check_failed error happens in smp procedure if CONFIG_BT_PRIVACY is enabled.*/ @@ -602,15 +605,15 @@ happens, which cause memory leak issue.*/ #endif #define BFLB_RELEASE_CMD_SEM_IF_CONN_DISC -/*Fix the issue when local auth_req is 0(no boinding), +/*Fix the issue when local auth_req is 0(no boinding), BT_SMP_DIST_ENC_KEY bit is not cleared while remote ENC_KEY is received.*/ #define BFLB_BLE_PATCH_CLEAR_REMOTE_KEY_BIT #if defined(CONFIG_BT_CENTRAL) || defined(CONFIG_BT_OBSERVER) // #define BFLB_BLE_NOTIFY_ADV_DISCARDED #endif -#if defined(__cplusplus) -} +#ifdef __cplusplus +}; #endif #endif /* BLE_CONFIG_H */