bluetooth: controller: Merge BT_HCI_VS_EXT into BT_HCI_VS

18c23da removes CONFIG_BT_HCI_VS_EXT. Align BLE controller configuration with the changes. Jira: NCSDK-27508 Signed-off-by: Marek Pieta <[email protected]>
rlubos · May 20, 2024 · eb6ef9b · eb6ef9b
1 parent 9bd11d7
commit eb6ef9b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/samples/bluetooth/peripheral_lbs/prj_minimal.conf b/samples/bluetooth/peripheral_lbs/prj_minimal.conf
@@ -93,7 +93,7 @@ CONFIG_BT_GATT_CACHING=n
 CONFIG_BT_GATT_SERVICE_CHANGED=n
 CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS=n
 CONFIG_BT_SETTINGS_CCC_LAZY_LOADING=y
-CONFIG_BT_HCI_VS_EXT=n
+CONFIG_BT_HCI_VS=n
 
 # Disable Bluetooth controller features not needed
 CONFIG_BT_CTLR_PRIVACY=n

diff --git a/samples/bluetooth/peripheral_uart/prj_minimal.conf b/samples/bluetooth/peripheral_uart/prj_minimal.conf
@@ -113,7 +113,7 @@ CONFIG_BT_GATT_CACHING=n
 CONFIG_BT_GATT_SERVICE_CHANGED=n
 CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS=n
 CONFIG_BT_SETTINGS_CCC_LAZY_LOADING=y
-CONFIG_BT_HCI_VS_EXT=n
+CONFIG_BT_HCI_VS=n
 
 # Disable Bluetooth controller features not needed
 CONFIG_BT_CTLR_PRIVACY=n

diff --git a/subsys/bluetooth/controller/hci_internal.c b/subsys/bluetooth/controller/hci_internal.c
@@ -618,7 +618,6 @@ static void vs_zephyr_supported_commands(sdc_hci_vs_zephyr_supported_commands_t
 	cmds->read_version_info = 1;
 	cmds->read_supported_commands = 1;
 
-#if defined(CONFIG_BT_HCI_VS_EXT)
 	cmds->write_bd_addr = 1;
 	cmds->read_static_addresses = 1;
 	cmds->read_key_hierarchy_roots = 1;
@@ -630,7 +629,6 @@ static void vs_zephyr_supported_commands(sdc_hci_vs_zephyr_supported_commands_t
 	cmds->write_tx_power_level = 1;
 	cmds->read_tx_power_level = 1;
 #endif /* CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL */
-#endif /* CONFIG_BT_HCI_VS_EXT */
 }
 
 static void vs_supported_commands(sdc_hci_vs_supported_vs_commands_t *cmds)
@@ -1550,7 +1548,6 @@ static uint8_t vs_cmd_put(uint8_t const *const cmd, uint8_t *const raw_event_out
 		vs_zephyr_supported_commands((void *)event_out_params);
 		return 0;
 
-#if defined(CONFIG_BT_HCI_VS_EXT)
 	case SDC_HCI_OPCODE_CMD_VS_ZEPHYR_READ_STATIC_ADDRESSES:
 		/* We always return one entry */
 		*param_length_out += sizeof(sdc_hci_cmd_vs_zephyr_read_static_addresses_return_t);
@@ -1579,7 +1576,6 @@ static uint8_t vs_cmd_put(uint8_t const *const cmd, uint8_t *const raw_event_out
 		return sdc_hci_cmd_vs_zephyr_read_tx_power((void *)cmd_params,
 							   (void *)event_out_params);
 #endif /* CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL */
-#endif /* CONFIG_BT_HCI_VS_EXT */
 	case SDC_HCI_OPCODE_CMD_VS_READ_SUPPORTED_VS_COMMANDS:
 		*param_length_out += sizeof(sdc_hci_cmd_vs_read_supported_vs_commands_return_t);
 		vs_supported_commands((void *)event_out_params);

diff --git a/tests/bluetooth/iso/prj.conf b/tests/bluetooth/iso/prj.conf
@@ -33,7 +33,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 
 CONFIG_NCS_INCLUDE_RPMSG_CHILD_IMAGE=n
-CONFIG_BT_HCI_VS_EXT=n
+CONFIG_BT_HCI_VS=n
 CONFIG_MAIN_STACK_SIZE=4096
 
 CONFIG_SHELL=y