Update/add config macros

Author: h2zero

src/nimconfig.h

@@ -176,33 +176,20 @@
 **********************************/
 
 /* This section should not be altered */
-#ifdef CONFIG_BT_NIMBLE_ROLE_CENTRAL // workaround
-#undef CONFIG_BT_NIMBLE_ROLE_CENTRAL
-#endif
 #ifndef CONFIG_BT_NIMBLE_ROLE_CENTRAL_DISABLED
-#define CONFIG_BT_NIMBLE_ROLE_CENTRAL
+#define CONFIG_BT_NIMBLE_ROLE_CENTRAL 1
 #endif
 
-#ifdef CONFIG_BT_NIMBLE_ROLE_OBSERVER // workaround
-#undef CONFIG_BT_NIMBLE_ROLE_OBSERVER
-#endif
 #ifndef CONFIG_BT_NIMBLE_ROLE_OBSERVER_DISABLED
-#define CONFIG_BT_NIMBLE_ROLE_OBSERVER
-#endif
-
-#ifdef CONFIG_BT_NIMBLE_ROLE_PERIPHERAL // workaround
-#undef CONFIG_BT_NIMBLE_ROLE_PERIPHERAL
+#define CONFIG_BT_NIMBLE_ROLE_OBSERVER 1
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_ROLE_PERIPHERAL_DISABLED
-#define CONFIG_BT_NIMBLE_ROLE_PERIPHERAL
+#define CONFIG_BT_NIMBLE_ROLE_PERIPHERAL 1
 #endif
 
-#ifdef CONFIG_BT_NIMBLE_ROLE_BROADCASTER// workaround
-#undef CONFIG_BT_NIMBLE_ROLE_BROADCASTER
-#endif
 #ifndef CONFIG_BT_NIMBLE_ROLE_BROADCASTER_DISABLED
-#define CONFIG_BT_NIMBLE_ROLE_BROADCASTER
+#define CONFIG_BT_NIMBLE_ROLE_BROADCASTER 1
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_PINNED_TO_CORE
@@ -241,8 +228,14 @@
 #define CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE 0x0
 #endif
 
-#ifndef CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT
-#define CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT 12
+#ifdef CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT // backward compatibility
+#define CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT
+#elif !defined(CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT)
+#define CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT 12
+#endif
+
+#ifndef CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE
+#define CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE 256
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_RPA_TIMEOUT
@@ -270,27 +263,32 @@
 #define CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN 31
 
 /** @brief ACL Buffer count */
-#define CONFIG_BT_NIMBLE_ACL_BUF_COUNT 12
+#define CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT 12
 
 /** @brief ACL Buffer size */
 #define CONFIG_BT_NIMBLE_TRANSPORT_ACL_SIZE 255
 
-/** @brief HCI Event Buffer size */
+/** @brief Transport (HCI) Event Buffer size */
 #if CONFIG_BT_NIMBLE_EXT_ADV
-#  define CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE 257
+#  define CONFIG_BT_NIMBLE_TRANSPORT_EVT_SIZE 257
 #else
-#  define CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE 70
+#  define CONFIG_BT_NIMBLE_TRANSPORT_EVT_SIZE 70
 #endif
 
 /** @brief Number of high priority HCI event buffers */
-#define CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT 30
+#define CONFIG_BT_NIMBLE_TRANSPORT_EVT_COUNT 30
 
 /** @brief Number of low priority HCI event buffers */
-#define CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT 8
+#define CONFIG_BT_NIMBLE_TRANSPORT_EVT_DISCARD_COUNT 8
 
 /** @brief Maximum number of connection oriented channels */
 #define CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM 0
 
+#define CONFIG_BT_NIMBLE_L2CAP_COC_SDU_BUFF_COUNT 1
+#define CONFIG_BT_NIMBLE_EATT_CHAN_NUM 0
+#define CONFIG_BT_NIMBLE_SVC_GAP_CENT_ADDR_RESOLUTION -1
+#define CONFIG_BT_NIMBLE_GATT_MAX_PROCS 4
+
 #define CONFIG_BT_NIMBLE_HS_FLOW_CTRL 1
 #define CONFIG_BT_NIMBLE_HS_FLOW_CTRL_ITVL 1000
 #define CONFIG_BT_NIMBLE_HS_FLOW_CTRL_THRESH 2