Merge branch 'develop' of https://github.com/bluekitchen/btstack into develop

2025-02-04 15:39:59 +00:00 · 2017-01-14 22:03:37 +01:00 · 2017-01-14 22:03:37 +01:00 · 9f2140b6fd
commit 9f2140b6fd
parent c8b300b968 1a68220246
14 changed files with 30 additions and 1 deletions
--- a/port/arduino/btstack_config.h
+++ b/port/arduino/btstack_config.h
@ -10,10 +10,11 @@

 // BTstack features that can be enabled
 #define ENABLE_BLE
-#define ENABLE_CLASSIC
 #define ENABLE_LOG_INTO_HCI_DUMP
 #define ENABLE_LOG_INFO 
 #define ENABLE_LOG_ERROR
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL

 // BTstack configuration. buffers, sizes, ...
 #define HCI_ACL_PAYLOAD_SIZE 200
--- a/port/ez430-rf2560/btstack_config.h
+++ b/port/ez430-rf2560/btstack_config.h
@ -11,6 +11,8 @@
 // BTstack features that can be enabled
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
+#define ENABLE_LE_PERIPHERAL
+// #define ENABLE_LE_CENTRAL
 #define ENABLE_LOG_INTO_HCI_DUMP
 // #define ENABLE_LOG_ERROR
 // #define ENABLE_LOG_INFO 
--- a/port/libusb/btstack_config.h
+++ b/port/libusb/btstack_config.h
@ -14,6 +14,8 @@
 // BTstack features that can be enabled
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL
 #define ENABLE_LE_SECURE_CONNECTIONS
 #define ENABLE_LOG_ERROR
 #define ENABLE_LOG_INFO 
--- a/port/msp-exp430f5438-cc2564b/btstack_config.h
+++ b/port/msp-exp430f5438-cc2564b/btstack_config.h
@ -11,6 +11,8 @@
 // BTstack features that can be enabled
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
+#define ENABLE_LE_PERIPHERAL
+// #define ENABLE_LE_CENTRAL
 // #define ENABLE_LOG_INTO_HCI_DUMP
 // #define ENABLE_LOG_ERROR
 // #define ENABLE_LOG_INFO 
--- a/port/msp430f5229lp-cc2564b/btstack_config.h
+++ b/port/msp430f5229lp-cc2564b/btstack_config.h
@ -11,6 +11,8 @@
 // BTstack features that can be enabled
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
+#define ENABLE_LE_PERIPHERAL
+// #define ENABLE_LE_CENTRAL
 #define ENABLE_LOG_INTO_HCI_DUMP
 // #define ENABLE_LOG_ERROR
 // #define ENABLE_LOG_INFO 
--- a/port/mtk/btstack_config.h
+++ b/port/mtk/btstack_config.h
@ -13,6 +13,8 @@
 // BTstack features that can be enabled
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL
 #define ENABLE_LOG_ERROR
 #define ENABLE_LOG_INFO 
 #define ENABLE_LOG_INTO_HCI_DUMP
--- a/port/nrf5-zephyr/btstack_config.h
+++ b/port/nrf5-zephyr/btstack_config.h
@ -9,6 +9,8 @@

 // BTstack features that can be enabled
 #define ENABLE_BLE
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL
 #define ENABLE_LOG_INFO
 #define ENABLE_LOG_ERROR

--- a/port/nrf5x/btstack_config.h
+++ b/port/nrf5x/btstack_config.h
@ -11,6 +11,8 @@
 // BTstack features that can be enabled
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL
 #define ENABLE_LOG_INFO
 #define ENABLE_LOG_ERROR

--- a/port/pic32-harmony/src/btstack_config.h
+++ b/port/pic32-harmony/src/btstack_config.h
@ -12,6 +12,8 @@
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
 #define ENABLE_LE_SECURE_CONNECTIONS
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL
 #define ENABLE_LOG_INFO
 #define ENABLE_LOG_ERROR

--- a/port/posix-h4/btstack_config.h
+++ b/port/posix-h4/btstack_config.h
@ -14,6 +14,8 @@
 // BTstack features that can be enabled
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL
 #define ENABLE_LE_SECURE_CONNECTIONS
 #define ENABLE_LOG_ERROR
 #define ENABLE_LOG_INFO 
--- a/port/posix-h5/btstack_config.h
+++ b/port/posix-h5/btstack_config.h
@ -14,6 +14,8 @@
 // BTstack features that can be enabled
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL
 #define ENABLE_LE_SECURE_CONNECTIONS
 #define ENABLE_LOG_ERROR
 #define ENABLE_LOG_INFO 
--- a/port/stm32-f103rb-nucleo/btstack_config.h
+++ b/port/stm32-f103rb-nucleo/btstack_config.h
@ -10,6 +10,8 @@

 // BTstack features that can be enabled
 #define ENABLE_BLE
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL
 #define ENABLE_CLASSIC
 // #define ENABLE_LOG_INFO 
 // #define ENABLE_LOG_ERROR
--- a/port/wiced/btstack_config.h
+++ b/port/wiced/btstack_config.h
@ -12,6 +12,8 @@
 // BTstack features that can be enabled
 #define ENABLE_BLE
 #define ENABLE_CLASSIC
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL
 // #define ENABLE_LE_SECURE_CONNECTIONS
 #define ENABLE_LOG_ERROR
 // #define ENABLE_LOG_INFO
--- a/src/ble/sm.c
+++ b/src/ble/sm.c
@ -51,6 +51,10 @@
 #include "hci_dump.h"
 #include "l2cap.h"

+#if !defined(ENABLE_LE_PERIPHERAL) && !defined(ENABLE_LE_CENTRAL)
+#error "LE Security Manager used, but neither ENABLE_LE_PERIPHERAL nor ENABLE_LE_CENTRAL defined. Please add at least one to btstack_config.h."
+#endif
+
 #ifdef ENABLE_LE_SECURE_CONNECTIONS
 #ifdef HAVE_HCI_CONTROLLER_DHKEY_SUPPORT
 #error "Support for DHKEY Support in HCI Controller not implemented yet. Please use software implementation"