Commit 4fe004c5 authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Carles Cufi
Browse files

Bluetooth: Controller: Use defines for channel map count and hop range 



Use defines for channel map count and hop range.

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent e72d8639

subsys/bluetooth/controller/ll_sw/pdu.h

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ 
#define EVENT_INSTANT_MAX         0xffff

#define EVENT_INSTANT_LATENCY_MAX 0x7fff



/* Channel Map Unused channels count minimum */

#define CHM_USED_COUNT_MIN     2U



/* Channel Map hop count minimum and maximum */

#define CHM_HOP_COUNT_MIN      5U

#define CHM_HOP_COUNT_MAX      16U



/* Offset Units field encoding */

#define OFFS_UNIT_BITS         13

#define OFFS_UNIT_30_US        30

subsys/bluetooth/controller/ll_sw/ull_peripheral.c

+4 −2
Original line number Diff line number Diff line
@@ -149,8 +149,10 @@ void ull_periph_setup(struct node_rx_hdr *rx, struct node_rx_ftr *ftr, 
			       sizeof(lll->data_chan_map));

	lll->data_chan_hop = pdu_adv->connect_ind.hop;

	lll->interval = sys_le16_to_cpu(pdu_adv->connect_ind.interval);

	if ((lll->data_chan_count < 2) || (lll->data_chan_hop < 5) ||

	    (lll->data_chan_hop > 16) || !lll->interval) {

	if ((lll->data_chan_count < CHM_USED_COUNT_MIN) ||

	    (lll->data_chan_hop < CHM_HOP_COUNT_MIN) ||

	    (lll->data_chan_hop > CHM_HOP_COUNT_MAX) ||

	    !lll->interval) {

		invalid_release(&adv->ull, lll, link, rx);



		return;

subsys/bluetooth/controller/ll_sw/ull_sync.c

+2 −2
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ void ull_sync_setup(struct ll_scan_set *scan, struct ll_scan_aux_set *aux, 
	lll->chm[chm_last].data_chan_count =

		util_ones_count_get(data_chan_map,

				    sizeof(lll->chm[chm_last].data_chan_map));

	if (lll->chm[chm_last].data_chan_count < 2) {

	if (lll->chm[chm_last].data_chan_count < CHM_USED_COUNT_MIN) {

		/* Ignore sync setup, invalid available channel count */

		return;

	}
@@ -953,7 +953,7 @@ void ull_sync_chm_update(uint8_t sync_handle, uint8_t *acad, uint8_t acad_len) 
	lll->chm[chm_last].data_chan_count =

		util_ones_count_get(lll->chm[chm_last].data_chan_map,

				    sizeof(lll->chm[chm_last].data_chan_map));

	if (lll->chm[chm_last].data_chan_count < 2) {

	if (lll->chm[chm_last].data_chan_count < CHM_USED_COUNT_MIN) {

		/* Ignore channel map, invalid available channel count */

		return;

	}

subsys/bluetooth/controller/ll_sw/ull_sync_iso.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ void ull_sync_iso_setup(struct ll_sync_iso_set *sync_iso, 
	lll->data_chan_map[4] &= ~0xE0;

	lll->data_chan_count = util_ones_count_get(&lll->data_chan_map[0],

						   sizeof(lll->data_chan_map));

	if (lll->data_chan_count < 2) {

	if (lll->data_chan_count < CHM_USED_COUNT_MIN) {

		return;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE