michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: define adv channel access address as macro in pdu.h

Browse source 
The new macro is PDU_AC_ACCESS_ADDR

Signed-off-by: Christopher Friedt <chrisfriedt@gmail.com>
This commit is contained in:
Christopher Friedt 2020-01-02 20:30:11 -05:00 • committed by Alberto Escolar
commit 5308a941a9
7 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -6603,7 +6603,7 @@ again:
* It shall not be a sequence that differs from the advertising channel * It shall not be a sequence that differs from the advertising channel
* packets Access Address by only one bit. * packets Access Address by only one bit.
*/ */
adv_aa_check = access_addr ^ 0x8e89bed6; adv_aa_check = access_addr ^ PDU_AC_ACCESS_ADDR;
if (util_ones_count_get((u8_t *)&adv_aa_check, if (util_ones_count_get((u8_t *)&adv_aa_check,
sizeof(adv_aa_check)) <= 1) { sizeof(adv_aa_check)) <= 1) {
goto again; goto again;
@ -6719,7 +6719,7 @@ static void event_adv(u32_t ticks_at_expire, u32_t remainder,
u16_t lazy, void *context) u16_t lazy, void *context)
{ {
u32_t remainder_us; u32_t remainder_us;
u32_t aa = 0x8e89bed6; u32_t aa = PDU_AC_ACCESS_ADDR;
ARG_UNUSED(remainder); ARG_UNUSED(remainder);
ARG_UNUSED(lazy); ARG_UNUSED(lazy);
@ -7151,7 +7151,7 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
{ {
u32_t remainder_us; u32_t remainder_us;
u32_t ret; u32_t ret;
u32_t aa = 0x8e89bed6; u32_t aa = PDU_AC_ACCESS_ADDR;
ARG_UNUSED(remainder); ARG_UNUSED(remainder);
ARG_UNUSED(lazy); ARG_UNUSED(lazy);

2
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
View file

@ -120,7 +120,7 @@ static int init_reset(void)
static int prepare_cb(struct lll_prepare_param *prepare_param) static int prepare_cb(struct lll_prepare_param *prepare_param)
{ {
struct lll_adv *lll = prepare_param->param; struct lll_adv *lll = prepare_param->param;
u32_t aa = sys_cpu_to_le32(0x8e89bed6); u32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
u32_t ticks_at_event, ticks_at_start; u32_t ticks_at_event, ticks_at_start;
struct evt_hdr *evt; struct evt_hdr *evt;
u32_t remainder_us; u32_t remainder_us;

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

@ -119,7 +119,7 @@ static int init_reset(void)
static int prepare_cb(struct lll_prepare_param *prepare_param) static int prepare_cb(struct lll_prepare_param *prepare_param)
{ {
struct lll_scan *lll = prepare_param->param; struct lll_scan *lll = prepare_param->param;
u32_t aa = sys_cpu_to_le32(0x8e89bed6); u32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
u32_t ticks_at_event, ticks_at_start; u32_t ticks_at_event, ticks_at_start;
struct node_rx_pdu *node_rx; struct node_rx_pdu *node_rx;
struct evt_hdr *evt; struct evt_hdr *evt;

2
subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c
View file

@ -118,7 +118,7 @@ static int init_reset(void)
static int prepare_cb(struct lll_prepare_param *prepare_param) static int prepare_cb(struct lll_prepare_param *prepare_param)
{ {
struct lll_adv *lll = prepare_param->param; struct lll_adv *lll = prepare_param->param;
u32_t aa = sys_cpu_to_le32(0x8e89bed6); u32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
u32_t ticks_at_event, ticks_at_start; u32_t ticks_at_event, ticks_at_start;
struct evt_hdr *evt; struct evt_hdr *evt;
u32_t remainder_us; u32_t remainder_us;

2
subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c
View file

@ -118,7 +118,7 @@ static int init_reset(void)
static int prepare_cb(struct lll_prepare_param *prepare_param) static int prepare_cb(struct lll_prepare_param *prepare_param)
{ {
struct lll_scan *lll = prepare_param->param; struct lll_scan *lll = prepare_param->param;
u32_t aa = sys_cpu_to_le32(0x8e89bed6); u32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
u32_t ticks_at_event, ticks_at_start; u32_t ticks_at_event, ticks_at_start;
struct node_rx_pdu *node_rx; struct node_rx_pdu *node_rx;
struct evt_hdr *evt; struct evt_hdr *evt;

2
subsys/bluetooth/controller/ll_sw/pdu.h
View file

@ -18,6 +18,8 @@
#define PDU_AC_LL_HEADER_SIZE (offsetof(struct pdu_adv, payload)) #define PDU_AC_LL_HEADER_SIZE (offsetof(struct pdu_adv, payload))
/* Advertisement channel maximum PDU size */ /* Advertisement channel maximum PDU size */
#define PDU_AC_SIZE_MAX (PDU_AC_LL_HEADER_SIZE + PDU_AC_PAYLOAD_SIZE_MAX) #define PDU_AC_SIZE_MAX (PDU_AC_LL_HEADER_SIZE + PDU_AC_PAYLOAD_SIZE_MAX)
/* Advertisement channel Access Address */
#define PDU_AC_ACCESS_ADDR 0x8e89bed6
#define ACCESS_ADDR_SIZE 4 #define ACCESS_ADDR_SIZE 4
#define ADVA_SIZE 6 #define ADVA_SIZE 6

2
subsys/bluetooth/controller/ll_sw/ull_master.c
View file

@ -824,7 +824,7 @@ again:
* It shall not be a sequence that differs from the advertising channel * It shall not be a sequence that differs from the advertising channel
* packets Access Address by only one bit. * packets Access Address by only one bit.
*/ */
adv_aa_check = aa ^ 0x8e89bed6; adv_aa_check = aa ^ PDU_AC_ACCESS_ADDR;
if (util_ones_count_get((u8_t *)&adv_aa_check, if (util_ones_count_get((u8_t *)&adv_aa_check,
sizeof(adv_aa_check)) <= 1) { sizeof(adv_aa_check)) <= 1) {
goto again; goto again;