Bluetooth: controller: Consistent use of internal BT_CTLR_ADV_SET
Consistently use the internal BT_CTLR_ADV_SET value in the controller's implementation. Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
parent
9003cc8a89
commit
73308a3333
5 changed files with 19 additions and 16 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2019 Nordic Semiconductor ASA
|
||||
* Copyright (c) 2018-2021 Nordic Semiconductor ASA
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
@ -35,6 +35,16 @@
|
|||
#define XON_BITMASK BIT(31) /* XTAL has been retained from previous prepare */
|
||||
#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
|
||||
|
||||
#if defined(CONFIG_BT_BROADCASTER)
|
||||
#if defined(CONFIG_BT_CTLR_ADV_SET)
|
||||
#define BT_CTLR_ADV_SET CONFIG_BT_CTLR_ADV_SET
|
||||
#else /* CONFIG_BT_CTLR_ADV_SET */
|
||||
#define BT_CTLR_ADV_SET 1
|
||||
#endif /* CONFIG_BT_CTLR_ADV_SET */
|
||||
#else /* !CONFIG_BT_BROADCASTER */
|
||||
#define BT_CTLR_ADV_SET 0
|
||||
#endif /* !CONFIG_BT_BROADCASTER */
|
||||
|
||||
#if defined(CONFIG_BT_OBSERVER)
|
||||
#if defined(CONFIG_BT_CTLR_ADV_EXT)
|
||||
#if defined(CONFIG_BT_CTLR_PHY_CODED)
|
||||
|
@ -54,8 +64,7 @@ enum {
|
|||
TICKER_ID_ADV_STOP,
|
||||
TICKER_ID_ADV_BASE,
|
||||
#if defined(CONFIG_BT_CTLR_ADV_EXT) || defined(CONFIG_BT_HCI_MESH_EXT)
|
||||
TICKER_ID_ADV_LAST = ((TICKER_ID_ADV_BASE) +
|
||||
(CONFIG_BT_CTLR_ADV_SET) - 1),
|
||||
TICKER_ID_ADV_LAST = ((TICKER_ID_ADV_BASE) + (BT_CTLR_ADV_SET) - 1),
|
||||
#if defined(CONFIG_BT_CTLR_ADV_EXT)
|
||||
#if (CONFIG_BT_CTLR_ADV_AUX_SET > 0)
|
||||
TICKER_ID_ADV_AUX_BASE,
|
||||
|
|
|
@ -1,15 +1,9 @@
|
|||
/*
|
||||
* Copyright (c) 2017-2019 Nordic Semiconductor ASA
|
||||
* Copyright (c) 2017-2021 Nordic Semiconductor ASA
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_BT_CTLR_ADV_SET)
|
||||
#define BT_CTLR_ADV_SET CONFIG_BT_CTLR_ADV_SET
|
||||
#else /* CONFIG_BT_CTLR_ADV_SET */
|
||||
#define BT_CTLR_ADV_SET 1
|
||||
#endif /* CONFIG_BT_CTLR_ADV_SET */
|
||||
|
||||
#include "lll_adv_pdu.h"
|
||||
|
||||
struct lll_adv_iso {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2017-2019 Nordic Semiconductor ASA
|
||||
* Copyright (c) 2017-2021 Nordic Semiconductor ASA
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
|
@ -326,7 +326,7 @@ uint16_t ll_adv_aux_max_data_length_get(void)
|
|||
|
||||
uint8_t ll_adv_aux_set_count_get(void)
|
||||
{
|
||||
return CONFIG_BT_CTLR_ADV_SET;
|
||||
return BT_CTLR_ADV_SET;
|
||||
}
|
||||
|
||||
uint8_t ll_adv_aux_set_remove(uint8_t handle)
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include "ull_adv_types.h"
|
||||
#include "ull_adv_internal.h"
|
||||
|
||||
static struct ll_adv_iso ll_adv_iso[CONFIG_BT_CTLR_ADV_SET];
|
||||
static struct ll_adv_iso ll_adv_iso[BT_CTLR_ADV_SET];
|
||||
static void *adv_iso_free;
|
||||
|
||||
static uint32_t ull_adv_iso_start(struct ll_adv_iso *adv_iso,
|
||||
|
@ -238,7 +238,7 @@ uint8_t ll_adv_iso_by_hci_handle_get(uint8_t hci_handle, uint8_t *handle)
|
|||
|
||||
adv_iso = &ll_adv_iso[0];
|
||||
|
||||
for (idx = 0U; idx < CONFIG_BT_CTLR_ADV_SET; idx++, adv_iso++) {
|
||||
for (idx = 0U; idx < BT_CTLR_ADV_SET; idx++, adv_iso++) {
|
||||
if (adv_iso->is_created &&
|
||||
(adv_iso->hci_handle == hci_handle)) {
|
||||
*handle = idx;
|
||||
|
@ -257,7 +257,7 @@ uint8_t ll_adv_iso_by_hci_handle_new(uint8_t hci_handle, uint8_t *handle)
|
|||
adv_iso = &ll_adv_iso[0];
|
||||
adv_iso_empty = NULL;
|
||||
|
||||
for (idx = 0U; idx < CONFIG_BT_CTLR_ADV_SET; idx++, adv_iso++) {
|
||||
for (idx = 0U; idx < BT_CTLR_ADV_SET; idx++, adv_iso++) {
|
||||
if (adv_iso->is_created) {
|
||||
if (adv_iso->hci_handle == hci_handle) {
|
||||
return BT_HCI_ERR_CMD_DISALLOWED;
|
||||
|
@ -330,7 +330,7 @@ static uint32_t ull_adv_iso_start(struct ll_adv_iso *adv_iso,
|
|||
|
||||
static inline struct ll_adv_iso *ull_adv_iso_get(uint8_t handle)
|
||||
{
|
||||
if (handle >= CONFIG_BT_CTLR_ADV_SET) {
|
||||
if (handle >= BT_CTLR_ADV_SET) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue