Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bluetooth: Controller: Only show one prompt for experimental configs #42319

Merged
merged 2 commits into from
Mar 31, 2022
Merged

Bluetooth: Controller: Only show one prompt for experimental configs #42319

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b9ff8e
Bluetooth: Controller: Only show one prompt for experimental configs
rugeGerritsen Feb 18, 2022
3b5d83c
Bluetooth: Controller: Enhance experimental SW_SPLIT Kconfigs names
rugeGerritsen Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions subsys/bluetooth/controller/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,9 +481,15 @@ config BT_CTLR_ADV_EXT
Controller.

config BT_CTLR_ADV_EXT
prompt "LE Advertising Extensions [EXPERIMENTAL]" if BT_LL_SW_SPLIT
prompt "LE Advertising Extensions (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
select EXPERIMENTAL if BT_LL_SW_SPLIT

config PROMPT_ADJUSTMENT_WORKAROUND
bool
help
Unused and hidden Kconfig symbol to allow prompt adjustment.
Work around for https://github.com/ulfalizer/Kconfiglib/issues/117

if BT_CTLR_ADV_EXT

config BT_CTLR_ADV_SET
Expand Down Expand Up @@ -525,9 +531,12 @@ config BT_CTLR_ADV_PERIODIC
Controller.

config BT_CTLR_ADV_PERIODIC
bool "LE Periodic Advertising in Advertising State [EXPERIMENTAL]" if BT_LL_SW_SPLIT
bool "LE Periodic Advertising in Advertising State (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
Copy link
Collaborator

@tejlmand tejlmand Feb 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment not directly related to this line, but cannot comment below.

Why was this removed in last update ?
https://github.com/zephyrproject-rtos/zephyr/blob/65a659e7f7e2ad76a2406f8d6db57bca99ee25b3/subsys/bluetooth/controller/Kconfig#L537-L538

Only the help text was supposed to be remove if you read this comment #42319 (comment).

This code part still suffers the double prompt issue, as there are two config BT_CTLR_ADV_PERIODIC after one another, and then a depends on BT_CTLR_ADV_PERIODIC here:
https://github.com/zephyrproject-rtos/zephyr/blob/e4e8b78f93a7871c4494bf6b2e5596e97fcf7c12/subsys/bluetooth/controller/Kconfig#L524-L539

Especially pay attention to this line:
https://github.com/zephyrproject-rtos/zephyr/blob/e4e8b78f93a7871c4494bf6b2e5596e97fcf7c12/subsys/bluetooth/controller/Kconfig#L539

So you still need

config PROMPT_ADJUSTMENT_WORKAROUND
	bool

just no help text.

select EXPERIMENTAL if BT_LL_SW_SPLIT

config PROMPT_ADJUSTMENT_WORKAROUND
bool

config BT_CTLR_ADV_PERIODIC_ADI_SUPPORT
bool "Periodic Advertising ADI support"
depends on BT_CTLR_ADV_PERIODIC
Expand All @@ -545,9 +554,12 @@ config BT_CTLR_SYNC_PERIODIC
Synchronization state in the Controller.

config BT_CTLR_SYNC_PERIODIC
bool "LE Periodic Advertising in Synchronization State [EXPERIMENTAL]" if BT_LL_SW_SPLIT
bool "LE Periodic Advertising in Synchronization State (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here. not related to this line, but below.

You still need:
https://github.com/zephyrproject-rtos/zephyr/blob/65a659e7f7e2ad76a2406f8d6db57bca99ee25b3/subsys/bluetooth/controller/Kconfig#L563-L564

just without the help text.

Notice the two config BT_CTLR_SYNC_PERIODIC after one another, and then a depends on BT_CTLR_SYNC_PERIODIC here:
https://github.com/zephyrproject-rtos/zephyr/blob/e4e8b78f93a7871c4494bf6b2e5596e97fcf7c12/subsys/bluetooth/controller/Kconfig#L544-L559

select EXPERIMENTAL if BT_LL_SW_SPLIT

config PROMPT_ADJUSTMENT_WORKAROUND
bool

config BT_CTLR_SYNC_PERIODIC_ADV_LIST
bool "LE Periodic Advertiser List support"
depends on BT_CTLR_SYNC_PERIODIC
Expand Down Expand Up @@ -596,7 +608,7 @@ config BT_CTLR_ADV_ISO
Controller.

config BT_CTLR_ADV_ISO
bool "LE Broadcast Isochronous Channel advertising [EXPERIMENTAL]" if BT_LL_SW_SPLIT
bool "LE Broadcast Isochronous Channel advertising (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
select EXPERIMENTAL if BT_LL_SW_SPLIT

config BT_CTLR_SYNC_ISO
Expand All @@ -609,7 +621,7 @@ config BT_CTLR_SYNC_ISO
the Controller.

config BT_CTLR_SYNC_ISO
bool "LE Broadcast Isochronous Channel advertising sync [EXPERIMENTAL]" if BT_LL_SW_SPLIT
bool "LE Broadcast Isochronous Channel advertising sync (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
select EXPERIMENTAL if BT_LL_SW_SPLIT

config BT_CTLR_BROADCAST_ISO
Expand Down Expand Up @@ -687,7 +699,7 @@ config BT_CTLR_CENTRAL_ISO
Central role in the Controller.

config BT_CTLR_CENTRAL_ISO
bool "LE Connected Isochronous Stream Central [EXPERIMENTAL]" if BT_LL_SW_SPLIT
bool "LE Connected Isochronous Stream Central (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
select BT_CTLR_SET_HOST_FEATURE
select EXPERIMENTAL if BT_LL_SW_SPLIT

Expand All @@ -699,7 +711,7 @@ config BT_CTLR_PERIPHERAL_ISO
Peripheral role in the Controller.

config BT_CTLR_PERIPHERAL_ISO
bool "LE Connected Isochronous Stream Peripheral [EXPERIMENTAL]" if BT_LL_SW_SPLIT
bool "LE Connected Isochronous Stream Peripheral (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
select BT_CTLR_SET_HOST_FEATURE
select EXPERIMENTAL if BT_LL_SW_SPLIT

Expand Down