bluetooth: controller: Auto-setup master/slave role count

Thomas Stenersen · joerchan · commit 41eb1836bcab · 2019-11-07T10:57:18.000+01:00
Remove explicit setting for BLECTRL_MASTER_COUNT, it's now set imlicitly
as BT_MAX_CONN - BLECTRL_SLAVE_COUNT.

The BLECTRL_SLAVE_COUNT is set to:
- BT_CONN_MAX if !BT_CENTRAL
- 1 if BT_CENTRAL &amp;&amp; BT_PERIPHERAL
- 0 otherwise

Furthermore, the BLECTRL_SLAVE_COUNT is range limited to BT_MAX_CONN,
meaning Kconfig will reset to a default value if a config outside the
range is set.

Build asserts have been added to verify a sane configuration.

Signed-off-by: Thomas Stenersen &lt;thomas.stenersen@nordicsemi.no&gt;
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebug.conf
@@ -140,8 +140,6 @@ CONFIG_BT_GATT_HIDS_C=y
 CONFIG_BT_GATT_HIDS_C_REPORTS_MAX=9
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=2
-CONFIG_BLECTRL_SLAVE_COUNT=0
 
 CONFIG_ENTROPY_CC310=n
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebugMCUBoot.conf
@@ -141,8 +141,6 @@ CONFIG_BT_GATT_HIDS_C=y
 CONFIG_BT_GATT_HIDS_C_REPORTS_MAX=9
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=2
-CONFIG_BLECTRL_SLAVE_COUNT=0
 
 CONFIG_ENTROPY_CC310=n
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebugWithShell.conf
@@ -144,8 +144,6 @@ CONFIG_BT_GATT_HIDS_C=y
 CONFIG_BT_GATT_HIDS_C_REPORTS_MAX=9
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=2
-CONFIG_BLECTRL_SLAVE_COUNT=0
 
 CONFIG_ENTROPY_CC310=n
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZRelease.conf
@@ -134,8 +134,6 @@ CONFIG_BT_GATT_HIDS_C=y
 CONFIG_BT_GATT_HIDS_C_REPORTS_MAX=9
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=2
-CONFIG_BLECTRL_SLAVE_COUNT=0
 
 CONFIG_ENTROPY_CC310=n
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZReleaseMCUBoot.conf
@@ -135,8 +135,6 @@ CONFIG_BT_GATT_HIDS_C=y
 CONFIG_BT_GATT_HIDS_C_REPORTS_MAX=9
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=2
-CONFIG_BLECTRL_SLAVE_COUNT=0
 
 CONFIG_ENTROPY_CC310=n
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebug.conf
@@ -204,8 +204,6 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=0
-CONFIG_BLECTRL_SLAVE_COUNT=1
 
 CONFIG_ENTROPY_CC310=n
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebugMCUBoot.conf
@@ -205,8 +205,6 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=0
-CONFIG_BLECTRL_SLAVE_COUNT=1
 
 CONFIG_ENTROPY_CC310=n
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebugWithShell.conf
@@ -208,8 +208,6 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=0
-CONFIG_BLECTRL_SLAVE_COUNT=1
 
 CONFIG_ENTROPY_CC310=n
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZRelease.conf
@@ -195,8 +195,6 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=0
-CONFIG_BLECTRL_SLAVE_COUNT=1
 
 CONFIG_ENTROPY_CC310=n
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZReleaseMCUBoot.conf
@@ -196,8 +196,6 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=0
-CONFIG_BLECTRL_SLAVE_COUNT=1
 
 CONFIG_ENTROPY_CC310=n
 
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebug.conf
@@ -154,8 +154,6 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=0
-CONFIG_BLECTRL_SLAVE_COUNT=1
 
 CONFIG_EVENT_MANAGER=y
 CONFIG_LINKER_ORPHAN_SECTION_PLACE=y
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebugMCUBoot.conf
@@ -155,8 +155,6 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=0
-CONFIG_BLECTRL_SLAVE_COUNT=1
 
 CONFIG_EVENT_MANAGER=y
 CONFIG_LINKER_ORPHAN_SECTION_PLACE=y
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebugWithShell.conf
@@ -158,8 +158,6 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=0
-CONFIG_BLECTRL_SLAVE_COUNT=1
 
 CONFIG_EVENT_MANAGER=y
 CONFIG_LINKER_ORPHAN_SECTION_PLACE=y
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZRelease.conf
@@ -148,8 +148,6 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=0
-CONFIG_BLECTRL_SLAVE_COUNT=1
 
 CONFIG_EVENT_MANAGER=y
 CONFIG_LINKER_ORPHAN_SECTION_PLACE=y
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZReleaseMCUBoot.conf
@@ -149,8 +149,6 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
 CONFIG_BT_LL_NRFXLIB=y
-CONFIG_BLECTRL_MASTER_COUNT=0
-CONFIG_BLECTRL_SLAVE_COUNT=1
 
 CONFIG_EVENT_MANAGER=y
 CONFIG_LINKER_ORPHAN_SECTION_PLACE=y
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
@@ -6,19 +6,17 @@
 
 menu "Nordic BLE controller"
 
-config BLECTRL_MASTER_COUNT
-	int "Number of concurrent master roles"
-	default 1
-	help
-	  Number of concurrent master roles defines how many simultaneous
-	  connections can be created with the device working as a master.
-
 config BLECTRL_SLAVE_COUNT
 	int "Number of concurrent slave roles"
-	default 1
+	default BT_MAX_CONN if (BT_PERIPHERAL && !BT_CENTRAL)
+	default 1 if BT_PERIPHERAL
+	default 0
+	range 0 BT_MAX_CONN
 	help
 	  Number of concurrent slave roles defines how many simultaneous
 	  connections can be created with the device working as a slave.
+	  NOTE: the number of master roles is defined as
+	  BT_MAX_CONN - BLECTRL_SLAVE_COUNT
 
 config BLECTLR_PRIO
 	# Hidden option to set the priority of the controller threads
diff --git a/subsys/bluetooth/controller/hci_driver.c b/subsys/bluetooth/controller/hci_driver.c
@@ -32,6 +32,21 @@ static K_THREAD_STACK_DEFINE(recv_thread_stack, CONFIG_BLECTLR_RX_STACK_SIZE);
 static K_THREAD_STACK_DEFINE(signal_thread_stack,
 			     CONFIG_BLECTLR_SIGNAL_STACK_SIZE);
 
+
+/* It should not be possible to set CONFIG_BLECTRL_SLAVE_COUNT larger than
+ * CONFIG_BT_MAX_CONN. Kconfig should make sure of that, this assert is to
+ * verify that assumption.
+ */
+BUILD_ASSERT(CONFIG_BLECTRL_SLAVE_COUNT <= CONFIG_BT_MAX_CONN);
+
+#define BLECTRL_MASTER_COUNT (CONFIG_BT_MAX_CONN - CONFIG_BLECTRL_SLAVE_COUNT)
+
+BUILD_ASSERT(!IS_ENABLED(CONFIG_BT_CENTRAL) ||
+			 (BLECTRL_MASTER_COUNT > 0));
+
+BUILD_ASSERT(!IS_ENABLED(CONFIG_BT_PERIPHERAL) ||
+			 (CONFIG_BLECTRL_SLAVE_COUNT > 0));
+
 #ifdef CONFIG_BT_CTLR_DATA_LENGTH_MAX
 	#define MAX_TX_PACKET_SIZE CONFIG_BT_CTLR_DATA_LENGTH_MAX
 	#define MAX_RX_PACKET_SIZE CONFIG_BT_CTLR_DATA_LENGTH_MAX
@@ -55,7 +70,7 @@ static K_THREAD_STACK_DEFINE(signal_thread_stack,
 	+ BLE_CONTROLLER_MEM_SLAVE_LINKS_SHARED)
 
 #define MEMPOOL_SIZE ((CONFIG_BLECTRL_SLAVE_COUNT * SLAVE_MEM_SIZE) + \
-		      (CONFIG_BLECTRL_MASTER_COUNT * MASTER_MEM_SIZE))
+		      (BLECTRL_MASTER_COUNT * MASTER_MEM_SIZE))
 
 static u8_t ble_controller_mempool[MEMPOOL_SIZE];
 
@@ -392,7 +407,7 @@ static int ble_enable(void)
 	int required_memory;
 	ble_controller_cfg_t cfg;
 
-	cfg.master_count.count = CONFIG_BLECTRL_MASTER_COUNT;
+	cfg.master_count.count = BLECTRL_MASTER_COUNT;
 
 	/* NOTE: ble_controller_cfg_set() returns a negative errno on error. */
 	required_memory =
