michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Move Company ID config out of ctlr

Browse source 
The Company ID concept is not restricted to the controller, and should
be part of the wider Bluetooth scope, so it can be used on a
controller-less device. It's used in multiple host level modules, most
notably the Bluetooth Mesh and Device Information Service.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
This commit is contained in:
Trond Einar Snekvik 2019-11-07 15:33:55 +01:00 • committed by Carles Cufí
commit c704495807
2 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
subsys/bluetooth/Kconfig
View file

@ -157,6 +157,19 @@ source "subsys/bluetooth/shell/Kconfig"
endif # BT_HCI endif # BT_HCI
config BT_COMPANY_ID
hex "Company Id"
default 0x05F1
range 0x0000 0xFFFF
help
Set the Bluetooth Company Identifier for this device. The Linux
Foundation's Company Identifier (0x05F1) is the default value for
this option although silicon vendors and hardware manufacturers
can set their own. Note that the controller's Company Identifier is
controlled by BT_CTLR_COMPANY_ID. The full list of Bluetooth
Company Identifiers can be found here:
https://www.bluetooth.com/specifications/assigned-numbers/company-identifiers
source "subsys/bluetooth/mesh/Kconfig" source "subsys/bluetooth/mesh/Kconfig"
endif # BT endif # BT

16
subsys/bluetooth/controller/Kconfig
View file

@ -298,19 +298,19 @@ config BT_CTLR_VERSION_SETTINGS
bool "Version Settings" bool "Version Settings"
depends on BT_CTLR_SETTINGS depends on BT_CTLR_SETTINGS
help help
Make Company Id and Subversion Number configurable through Make the controller's Company Id and Subversion Number configurable
settings system. through settings system.
config BT_CTLR_COMPANY_ID config BT_CTLR_COMPANY_ID
hex "Company Id" hex "Controller Company Id"
default 0x05F1 default BT_COMPANY_ID
range 0x0000 0xFFFF range 0x0000 0xFFFF
help help
Set the Bluetooth Company Identifier that will be used in Set the Bluetooth Company Identifier that will be used in
the VERSION_IND PDU. The Linux Foundation's Company Identifier the VERSION_IND PDU. Uses BT_COMPANY_ID by default, although
(0x05F1) is the default value for this option although silicon vendors silicon vendors and hardware manufacturers can set their own
and hardware manufacturers can set their own. The full list of Company Identifier for the controller. The full list of Bluetooth
Bluetooth Company Identifiers can be found here: Company Identifiers can be found here:
https://www.bluetooth.com/specifications/assigned-numbers/company-identifiers https://www.bluetooth.com/specifications/assigned-numbers/company-identifiers
config BT_CTLR_SUBVERSION_NUMBER config BT_CTLR_SUBVERSION_NUMBER