michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Fix SCHED_ADVANCED cond, compilation

Browse source 
Code under SCHED_ADVANCED macro in ctrl.c is used to
disable advanced radio time space scheduling calculations
used for placing non-overlapping observer and master roles;
to populate connection parameter request/response PDU
fields, and autonomous generation of slave initiated
connection parameter requests.

This macro shall always be enabled for optimal and correct
operation of the controller, It shall only be disabled to
debug failures in other part of the controller, to rule out
this code's influence, if any, on the failure being
debugged.

Change-id: I04e5f837ef0a5658361bd3668f583f1e13504570
Signed-off-by: Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
This commit is contained in:
Vinayak Chettimada 2016-09-26 19:21:21 +02:00 • committed by Johan Hedberg
commit 54164b1350
1 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
drivers/bluetooth/controller/ll/ctrl.c
View file

@ -2739,11 +2739,13 @@ static void work_xtal_stop_calc(void *params)
work_xtal_retain(1);
if (ticker_id >= RADIO_TICKER_ID_ADV) {
#if SCHED_ADVANCED
uint8_t ticker_id_current = ((uint32_t)params & 0xff);
struct connection *conn_curr = NULL;
#endif
uint32_t ticks_prepare_to_start;
struct connection *conn = NULL;
struct shdr *hdr = NULL;
uint32_t ticks_prepare_to_start;
/* Select the role's scheduling header */
if (ticker_id >= RADIO_TICKER_ID_FIRST_CONNECTION) {
@ -4059,6 +4061,10 @@ static inline void event_conn_update_st_init(struct connection *conn,
retval = work_schedule(work_sched_offset, 1);
BT_ASSERT(!retval);
}
#else
ARG_UNUSED(ticks_at_expire);
ARG_UNUSED(work_sched_offset);
ARG_UNUSED(fp_work_select_or_use);
#endif
}
@ -4124,6 +4130,9 @@ static inline void event_conn_update_st_req(struct connection *conn,
retval = work_schedule(work_sched_offset, 1);
BT_ASSERT(!retval);
}
#else
ARG_UNUSED(ticks_at_expire);
ARG_UNUSED(work_sched_offset);
#endif
}
@ -4209,7 +4218,9 @@ static inline uint32_t event_conn_update_prep(struct connection *conn,
pdu_ctrl_tx = (struct pdu_data *)node_tx->pdu_data;
#if SCHED_ADVANCED
fp_work_select_or_use = work_sched_win_offset_use;
#endif
state = conn->llcp.connection_update.state;
if ((state == LLCP_CONN_STATE_RSP) &&
(conn->role.master.role == 0)) {
@ -4223,22 +4234,39 @@ static inline uint32_t event_conn_update_prep(struct connection *conn,
switch (state) {
case LLCP_CONN_STATE_INITIATE:
if (conn->role.master.role == 0) {
#if SCHED_ADVANCED
event_conn_update_st_init(conn,
event_counter,
pdu_ctrl_tx,
ticks_at_expire,
&gs_work_sched_offset,
fp_work_select_or_use);
#else
event_conn_update_st_init(conn,
event_counter,
pdu_ctrl_tx,
ticks_at_expire,
NULL,
NULL);
#endif
break;
}
/* fall thru if slave */
case LLCP_CONN_STATE_REQ:
#if SCHED_ADVANCED
event_conn_update_st_req(conn,
event_counter,
pdu_ctrl_tx,
ticks_at_expire,
&gs_work_sched_offset);
#else
event_conn_update_st_req(conn,
event_counter,
pdu_ctrl_tx,
ticks_at_expire,
NULL);
#endif
break;
case LLCP_CONN_STATE_RSP: