michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Use uint8_t for scan handles

Browse source 
Use uint8_t for scan set handles.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-04-08 16:17:48 +05:30 • committed by Carles Cufí
commit 594e12139b
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.h
View file

@ -48,4 +48,4 @@ int lll_scan_reset(void);
void lll_scan_prepare(void *param); void lll_scan_prepare(void *param);
extern uint16_t ull_scan_lll_handle_get(struct lll_scan *lll); extern uint8_t ull_scan_lll_handle_get(struct lll_scan *lll);

22
subsys/bluetooth/controller/ll_sw/ull_scan.c
View file

@ -47,7 +47,7 @@
static int init_reset(void); static int init_reset(void);
static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy, static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
void *param); void *param);
static uint8_t disable(uint16_t handle); static uint8_t disable(uint8_t handle);
#define BT_CTLR_SCAN_MAX 1 #define BT_CTLR_SCAN_MAX 1
static struct ll_scan_set ll_scan[BT_CTLR_SCAN_MAX]; static struct ll_scan_set ll_scan[BT_CTLR_SCAN_MAX];
@ -121,7 +121,7 @@ int ull_scan_init(void)
int ull_scan_reset(void) int ull_scan_reset(void)
{ {
uint16_t handle; uint8_t handle;
int err; int err;
for (handle = 0U; handle < BT_CTLR_SCAN_MAX; handle++) { for (handle = 0U; handle < BT_CTLR_SCAN_MAX; handle++) {
@ -262,7 +262,7 @@ uint8_t ull_scan_enable(struct ll_scan_set *scan)
return 0; return 0;
} }
uint8_t ull_scan_disable(uint16_t handle, struct ll_scan_set *scan) uint8_t ull_scan_disable(uint8_t handle, struct ll_scan_set *scan)
{ {
volatile uint32_t ret_cb = TICKER_STATUS_BUSY; volatile uint32_t ret_cb = TICKER_STATUS_BUSY;
void *mark; void *mark;
@ -292,7 +292,7 @@ uint8_t ull_scan_disable(uint16_t handle, struct ll_scan_set *scan)
return 0; return 0;
} }
struct ll_scan_set *ull_scan_set_get(uint16_t handle) struct ll_scan_set *ull_scan_set_get(uint8_t handle)
{ {
if (handle >= BT_CTLR_SCAN_MAX) { if (handle >= BT_CTLR_SCAN_MAX) {
return NULL; return NULL;
@ -301,17 +301,17 @@ struct ll_scan_set *ull_scan_set_get(uint16_t handle)
return &ll_scan[handle]; return &ll_scan[handle];
} }
uint16_t ull_scan_handle_get(struct ll_scan_set *scan) uint8_t ull_scan_handle_get(struct ll_scan_set *scan)
{ {
return ((uint8_t *)scan - (uint8_t *)ll_scan) / sizeof(*scan); return ((uint8_t *)scan - (uint8_t *)ll_scan) / sizeof(*scan);
} }
uint16_t ull_scan_lll_handle_get(struct lll_scan *lll) uint8_t ull_scan_lll_handle_get(struct lll_scan *lll)
{ {
return ull_scan_handle_get((void *)lll->hdr.parent); return ull_scan_handle_get((void *)lll->hdr.parent);
} }
struct ll_scan_set *ull_scan_is_enabled_get(uint16_t handle) struct ll_scan_set *ull_scan_is_enabled_get(uint8_t handle)
{ {
struct ll_scan_set *scan; struct ll_scan_set *scan;
@ -323,7 +323,7 @@ struct ll_scan_set *ull_scan_is_enabled_get(uint16_t handle)
return scan; return scan;
} }
struct ll_scan_set *ull_scan_is_disabled_get(uint16_t handle) struct ll_scan_set *ull_scan_is_disabled_get(uint8_t handle)
{ {
struct ll_scan_set *scan; struct ll_scan_set *scan;
@ -335,7 +335,7 @@ struct ll_scan_set *ull_scan_is_disabled_get(uint16_t handle)
return scan; return scan;
} }
uint32_t ull_scan_is_enabled(uint16_t handle) uint32_t ull_scan_is_enabled(uint8_t handle)
{ {
struct ll_scan_set *scan; struct ll_scan_set *scan;
@ -355,7 +355,7 @@ uint32_t ull_scan_is_enabled(uint16_t handle)
0); 0);
} }
uint32_t ull_scan_filter_pol_get(uint16_t handle) uint32_t ull_scan_filter_pol_get(uint8_t handle)
{ {
struct ll_scan_set *scan; struct ll_scan_set *scan;
@ -403,7 +403,7 @@ static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t laz
DEBUG_RADIO_PREPARE_O(1); DEBUG_RADIO_PREPARE_O(1);
} }
static uint8_t disable(uint16_t handle) static uint8_t disable(uint8_t handle)
{ {
struct ll_scan_set *scan; struct ll_scan_set *scan;
uint8_t ret; uint8_t ret;

14
subsys/bluetooth/controller/ll_sw/ull_scan_internal.h
View file

@ -17,22 +17,22 @@ void ull_scan_params_set(struct lll_scan *lll, uint8_t type, uint16_t interval,
uint8_t ull_scan_enable(struct ll_scan_set *scan); uint8_t ull_scan_enable(struct ll_scan_set *scan);
/* Disable scanning/initiating role */ /* Disable scanning/initiating role */
uint8_t ull_scan_disable(uint16_t handle, struct ll_scan_set *scan); uint8_t ull_scan_disable(uint8_t handle, struct ll_scan_set *scan);
/* Return ll_scan_set context (unconditional) */ /* Return ll_scan_set context (unconditional) */
struct ll_scan_set *ull_scan_set_get(uint16_t handle); struct ll_scan_set *ull_scan_set_get(uint8_t handle);
/* Return the scan set handle given the scan set instance */ /* Return the scan set handle given the scan set instance */
uint16_t ull_scan_handle_get(struct ll_scan_set *scan); uint8_t ull_scan_handle_get(struct ll_scan_set *scan);
/* Return ll_scan_set context if enabled */ /* Return ll_scan_set context if enabled */
struct ll_scan_set *ull_scan_is_enabled_get(uint16_t handle); struct ll_scan_set *ull_scan_is_enabled_get(uint8_t handle);
/* Return ll_scan_set contesst if disabled */ /* Return ll_scan_set contesst if disabled */
struct ll_scan_set *ull_scan_is_disabled_get(uint16_t handle); struct ll_scan_set *ull_scan_is_disabled_get(uint8_t handle);
/* Return flags if enabled */ /* Return flags if enabled */
uint32_t ull_scan_is_enabled(uint16_t handle); uint32_t ull_scan_is_enabled(uint8_t handle);
/* Return filter policy used */ /* Return filter policy used */
uint32_t ull_scan_filter_pol_get(uint16_t handle); uint32_t ull_scan_filter_pol_get(uint8_t handle);