Bluetooth: Kconfig: Get rid of BT_HCI_VS_EVT
Enabling vendor-specific extensions also implies support for vendor events, so a separate Kconfig option for that is unnecessary. One small additional thing this requires is the use of the __maybe_unused annotation, since there's no-longer a single Kconfig option that the controller hci.c can use to know that the vendor event helper symbols are needed. Signed-off-by: Johan Hedberg <johan.hedberg@gmail.com>
This commit is contained in:
parent
18c23daee3
commit
35897ee66c
6 changed files with 7 additions and 19 deletions
|
@ -190,13 +190,6 @@ config BT_HCI_VS
|
|||
Host and/or Controller. This enables Set Version Information,
|
||||
Supported Commands, Supported Features vendor commands.
|
||||
|
||||
config BT_HCI_VS_EVT
|
||||
bool "Zephyr HCI Vendor-Specific Events"
|
||||
depends on BT_HCI_VS
|
||||
help
|
||||
Enable support for the Zephyr HCI Vendor-Specific Events in the
|
||||
Host and/or Controller.
|
||||
|
||||
config BT_HCI_VS_FATAL_ERROR
|
||||
bool "Allow vendor specific HCI event Zephyr Fatal Error"
|
||||
depends on BT_HCI_VS
|
||||
|
|
|
@ -1008,7 +1008,6 @@ config BT_CTLR_ASSERT_HANDLER
|
|||
config BT_CTLR_VS_SCAN_REQ_RX
|
||||
bool "Use scan request reporting"
|
||||
depends on BT_HCI_VS && !BT_CTLR_ADV_EXT
|
||||
select BT_HCI_VS_EVT
|
||||
select BT_CTLR_SCAN_REQ_NOTIFY
|
||||
help
|
||||
Enables usage of VS Scan Request Reports Command and Scan Request Received Event
|
||||
|
|
|
@ -313,7 +313,6 @@ endchoice
|
|||
config BT_CTLR_DF_VS_CL_IQ_REPORT_16_BITS_IQ_SAMPLES
|
||||
bool "Use 16 bits signed integer IQ samples in connectionless IQ reports"
|
||||
depends on BT_CTLR_DF_SCAN_CTE_RX && BT_HCI_VS
|
||||
select BT_HCI_VS_EVT
|
||||
help
|
||||
Direction Finging connectionless IQ reports provide a set of IQ samples collected during
|
||||
sampling of CTE. Bluetooth 5.3 Core Specification defines IQ samples to be 8 bits signed
|
||||
|
@ -324,7 +323,6 @@ config BT_CTLR_DF_VS_CL_IQ_REPORT_16_BITS_IQ_SAMPLES
|
|||
config BT_CTLR_DF_VS_CONN_IQ_REPORT_16_BITS_IQ_SAMPLES
|
||||
bool "Use 16 bits signed integer IQ samples in connection IQ reports"
|
||||
depends on BT_CTLR_DF_CONN_CTE_RX && BT_HCI_VS
|
||||
select BT_HCI_VS_EVT
|
||||
help
|
||||
Direction Finging connection IQ reports provide a set of IQ samples collected during
|
||||
sampling of CTE. Bluetooth 5.3 Core Specification defines IQ samples to be 8 bits signed
|
||||
|
|
|
@ -211,9 +211,9 @@ static uint32_t cis_pending_count;
|
|||
static uint64_t event_mask = DEFAULT_EVENT_MASK;
|
||||
static uint64_t event_mask_page_2 = DEFAULT_EVENT_MASK_PAGE_2;
|
||||
static uint64_t le_event_mask = DEFAULT_LE_EVENT_MASK;
|
||||
#if defined(CONFIG_BT_HCI_VS_EVT)
|
||||
static uint64_t vs_events_mask = DEFAULT_VS_EVT_MASK;
|
||||
#endif /* CONFIG_BT_HCI_VS_EVT */
|
||||
#if defined(CONFIG_BT_HCI_VS)
|
||||
__maybe_unused static uint64_t vs_events_mask = DEFAULT_VS_EVT_MASK;
|
||||
#endif /* CONFIG_BT_HCI_VS */
|
||||
|
||||
static struct net_buf *cmd_complete_status(uint8_t status);
|
||||
|
||||
|
@ -339,8 +339,8 @@ static void *meta_evt(struct net_buf *buf, uint8_t subevt, uint8_t melen)
|
|||
return net_buf_add(buf, melen);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_BT_HCI_VS_EVT)
|
||||
static void *vs_event(struct net_buf *buf, uint8_t subevt, uint8_t evt_len)
|
||||
#if defined(CONFIG_BT_HCI_VS)
|
||||
__maybe_unused static void *vs_event(struct net_buf *buf, uint8_t subevt, uint8_t evt_len)
|
||||
{
|
||||
struct bt_hci_evt_vs *evt;
|
||||
|
||||
|
@ -350,7 +350,7 @@ static void *vs_event(struct net_buf *buf, uint8_t subevt, uint8_t evt_len)
|
|||
|
||||
return net_buf_add(buf, evt_len);
|
||||
}
|
||||
#endif /* CONFIG_BT_HCI_VS_EVT */
|
||||
#endif /* CONFIG_BT_HCI_VS */
|
||||
|
||||
#if defined(CONFIG_BT_HCI_MESH_EXT)
|
||||
static void *mesh_evt(struct net_buf *buf, uint8_t subevt, uint8_t melen)
|
||||
|
|
|
@ -882,7 +882,6 @@ config BT_DF_CTE_TX_AOD
|
|||
config BT_DF_VS_CL_IQ_REPORT_16_BITS_IQ_SAMPLES
|
||||
bool "Use 16 bits signed integer IQ samples in connectionless IQ reports"
|
||||
depends on BT_DF_CONNECTIONLESS_CTE_RX && BT_HCI_VS
|
||||
select BT_HCI_VS_EVT
|
||||
help
|
||||
Direction Finging connectionless IQ reports provide a set of IQ samples collected during
|
||||
sampling of CTE. Bluetooth 5.3 Core Specification defines IQ samples to be 8 bits signed
|
||||
|
@ -893,7 +892,6 @@ config BT_DF_VS_CL_IQ_REPORT_16_BITS_IQ_SAMPLES
|
|||
config BT_DF_VS_CONN_IQ_REPORT_16_BITS_IQ_SAMPLES
|
||||
bool "Use 16 bits signed integer IQ samples in connection IQ reports"
|
||||
depends on BT_DF_CONNECTION_CTE_RX && BT_HCI_VS
|
||||
select BT_HCI_VS_EVT
|
||||
help
|
||||
Direction Finging connection IQ reports provide a set of IQ samples collected during
|
||||
sampling of CTE. Bluetooth 5.3 Core Specification defines IQ samples to be 8 bits signed
|
||||
|
|
|
@ -2526,7 +2526,7 @@ static void hci_vendor_event(struct net_buf *buf)
|
|||
}
|
||||
#endif /* CONFIG_BT_HCI_VS_EVT_USER */
|
||||
|
||||
if (IS_ENABLED(CONFIG_BT_HCI_VS_EVT) && !handled) {
|
||||
if (IS_ENABLED(CONFIG_BT_HCI_VS) && !handled) {
|
||||
struct bt_hci_evt_vs *evt;
|
||||
|
||||
evt = net_buf_pull_mem(buf, sizeof(*evt));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue