Bluetooth: define BT_COMPANY_ID_NORDIC

Also set BT_COMPANY_ID to BT_COMPANY_ID_NORDIC. Making a kconfig option makes it also usable outside sdk-nrf. Signed-off-by: Jonathan Rico <jonathan.rico@nordicsemi.no>
nrfconnect · Nov 23, 2023 · f56190f · f56190f
1 parent 528b8f5
commit f56190f
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 15 deletions.
diff --git a/include/bluetooth/mesh/vnd/dm_common.h b/include/bluetooth/mesh/vnd/dm_common.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#define BT_MESH_VENDOR_COMPANY_ID 0x0059
+#define BT_MESH_VENDOR_COMPANY_ID CONFIG_BT_COMPANY_ID_NORDIC
 #define BT_MESH_MODEL_ID_DM_SRV 0x000B
 #define BT_MESH_MODEL_ID_DM_CLI 0x000C
 

diff --git a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/prj.conf b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/prj.conf
@@ -23,7 +23,6 @@ CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=y
 
 # Bluetooth configuration
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="Mesh and Peripheral Coex"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 CONFIG_BT_OBSERVER=y

diff --git a/samples/bluetooth/mesh/chat/include/chat_cli.h b/samples/bluetooth/mesh/chat/include/chat_cli.h
@@ -23,7 +23,7 @@ extern "C" {
 
 /* .. include_startingpoint_chat_cli_rst_1 */
 /** Company ID of the Bluetooth Mesh Chat Client model. */
-#define BT_MESH_CHAT_CLI_VENDOR_COMPANY_ID    0x0059
+#define BT_MESH_CHAT_CLI_VENDOR_COMPANY_ID    CONFIG_BT_COMPANY_ID_NORDIC
 
 /** Model ID of the Bluetooth Mesh Chat Client model. */
 #define BT_MESH_CHAT_CLI_VENDOR_MODEL_ID      0x000A

diff --git a/samples/bluetooth/mesh/chat/prj.conf b/samples/bluetooth/mesh/chat/prj.conf
@@ -23,7 +23,6 @@ CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=y
 
 # Bluetooth configuration
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="Mesh Chat"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 CONFIG_BT_OBSERVER=y

diff --git a/samples/bluetooth/mesh/dfu/distributor/prj.conf b/samples/bluetooth/mesh/dfu/distributor/prj.conf
@@ -20,7 +20,6 @@ CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="1.0.0+0"
 
 # Bluetooth configuration
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="Mesh DFU Distributor"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 CONFIG_BT_OBSERVER=y

diff --git a/samples/bluetooth/mesh/dfu/target/prj.conf b/samples/bluetooth/mesh/dfu/target/prj.conf
@@ -25,7 +25,6 @@ CONFIG_REBOOT=y
 
 # Bluetooth configuration
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="Mesh DFU Target"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 CONFIG_BT_OBSERVER=y

diff --git a/samples/bluetooth/mesh/light/prj.conf b/samples/bluetooth/mesh/light/prj.conf
@@ -23,7 +23,6 @@ CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=y
 
 # Bluetooth configuration
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="Mesh Light"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 

diff --git a/samples/bluetooth/mesh/light_ctrl/prj.conf b/samples/bluetooth/mesh/light_ctrl/prj.conf
@@ -26,7 +26,6 @@ CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=y
 
 # Bluetooth configuration
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="Mesh Light Fixture"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 CONFIG_BT_OBSERVER=y

diff --git a/samples/bluetooth/mesh/light_dimmer/prj.conf b/samples/bluetooth/mesh/light_dimmer/prj.conf
@@ -23,7 +23,6 @@ CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=y
 
 # Bluetooth configuration
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="Mesh Light Dimmer"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 CONFIG_BT_OBSERVER=y

diff --git a/samples/bluetooth/mesh/light_switch/prj.conf b/samples/bluetooth/mesh/light_switch/prj.conf
@@ -23,7 +23,6 @@ CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=y
 
 # Bluetooth configuration
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="Mesh Light Switch"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 CONFIG_BT_OBSERVER=y

diff --git a/samples/bluetooth/mesh/sensor_client/prj.conf b/samples/bluetooth/mesh/sensor_client/prj.conf
@@ -27,7 +27,6 @@ CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=y
 
 # Bluetooth configuration
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="Mesh Sensor Observer"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 CONFIG_BT_OBSERVER=y

diff --git a/samples/bluetooth/mesh/sensor_server/prj.conf b/samples/bluetooth/mesh/sensor_server/prj.conf
@@ -29,7 +29,6 @@ CONFIG_TEMP_NRF5=y
 
 # Bluetooth configuration
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="Mesh Sensor"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=8
 CONFIG_BT_OBSERVER=y

diff --git a/samples/bluetooth/nrf_dm/src/main.c b/samples/bluetooth/nrf_dm/src/main.c
@@ -30,7 +30,6 @@
 #define CON_STATUS_LED          DK_LED3
 #define RUN_LED_BLINK_INTERVAL  1000
 
-#define COMPANY_CODE            0x0059
 #define SUPPORT_DM_CODE         0xFF55AA5A
 
 struct adv_mfg_data {
@@ -316,7 +315,7 @@ static int bt_sync_init(void)
 
 	printk("DM Bluetooth LE Synchronization initialization\n");
 
-	mfg_data.company_code = sys_cpu_to_le16(COMPANY_CODE);
+	mfg_data.company_code = sys_cpu_to_le16(CONFIG_BT_COMPANY_ID_NORDIC);
 	mfg_data.support_dm_code = sys_cpu_to_le32(SUPPORT_DM_CODE);
 	mfg_data.rng_seed = sys_cpu_to_le32(peer_rng_seed_prepare());
 

diff --git a/samples/cellular/modem_shell/overlay-bt.conf b/samples/cellular/modem_shell/overlay-bt.conf
@@ -12,7 +12,6 @@ CONFIG_UART_2_NRF_HW_ASYNC=y
 CONFIG_UART_2_NRF_HW_ASYNC_TIMER=2
 
 CONFIG_BT=y
-CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_DEVICE_NAME="mosh"
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y
 

diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
@@ -8,6 +8,15 @@ menu "Bluetooth Low Energy"
 
 if BT
 
+config BT_COMPANY_ID_NORDIC
+	hex
+	# Will never change
+	default 0x0059
+
+config BT_COMPANY_ID
+	hex
+	default BT_COMPANY_ID_NORDIC
+
 # BT_MAX_CONN is declared in Zephyr, here we add the range and default for
 # BT_LL_SOFTDEVICE which is tested with 20 connections.
 # When both connection roles are enabled there has to be one for each role.