Skip to content

Commit

Permalink
Bluetooth: controller: Fix cond compile of DLU event generation
Browse files Browse the repository at this point in the history 
Fix the conditional compile of Data Length Update event
generation on PHY Update Procedure when Data Length
Extensions are not supported.

The regression was introduced in
commit 70a8987 ("Bluetooth: controller: Fix missing
data length update event")

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
  • Loading branch information
@cvinayak @carlescufi
cvinayak authored and carlescufi committed Jul 18, 2019
1 parent 2269339 commit 04f351a
Showing 1 changed file with 19 additions and 15 deletions.
34 changes: 19 additions & 15 deletions subsys/bluetooth/controller/ll_sw/ctrl.c
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8570,7 +8570,6 @@ static inline void event_phy_upd_ind_prep(struct connection *conn,
} else if (((event_counter - conn->llcp.phy_upd_ind.instant) & 0xFFFF) } else if (((event_counter - conn->llcp.phy_upd_ind.instant) & 0xFFFF)
<= 0x7FFF) { <= 0x7FFF) {
struct radio_pdu_node_rx *node_rx; struct radio_pdu_node_rx *node_rx;
u16_t eff_tx_time, eff_rx_time;
u8_t old_tx, old_rx; u8_t old_tx, old_rx;


/* procedure request acked */ /* procedure request acked */
Expand All @@ -8579,15 +8578,18 @@ static inline void event_phy_upd_ind_prep(struct connection *conn,
/* apply new phy */ /* apply new phy */
old_tx = conn->phy_tx; old_tx = conn->phy_tx;
old_rx = conn->phy_rx; old_rx = conn->phy_rx;
eff_tx_time = conn->max_tx_time;
eff_rx_time = conn->max_rx_time;
if (conn->llcp.phy_upd_ind.tx) {
u16_t tx_time;


#if defined(CONFIG_BT_CTLR_DATA_LENGTH)
u16_t eff_tx_time = conn->max_tx_time;
u16_t eff_rx_time = conn->max_rx_time;
#endif /* CONFIG_BT_CTLR_DATA_LENGTH */

if (conn->llcp.phy_upd_ind.tx) {
conn->phy_tx = conn->llcp.phy_upd_ind.tx; conn->phy_tx = conn->llcp.phy_upd_ind.tx;


tx_time = RADIO_PKT_TIME(conn->max_tx_octets, #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
conn->phy_tx); u16_t tx_time = RADIO_PKT_TIME(conn->max_tx_octets,
conn->phy_tx);
if (tx_time >= if (tx_time >=
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0)) { RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0)) {
eff_tx_time = MIN(tx_time, eff_tx_time = MIN(tx_time,
Expand All @@ -8602,14 +8604,15 @@ static inline void event_phy_upd_ind_prep(struct connection *conn,
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
0); 0);
} }
#endif /* CONFIG_BT_CTLR_DATA_LENGTH */
} }
if (conn->llcp.phy_upd_ind.rx) {
u16_t rx_time;


if (conn->llcp.phy_upd_ind.rx) {
conn->phy_rx = conn->llcp.phy_upd_ind.rx; conn->phy_rx = conn->llcp.phy_upd_ind.rx;


rx_time = RADIO_PKT_TIME(conn->max_rx_octets, #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
conn->phy_rx); u16_t rx_time = RADIO_PKT_TIME(conn->max_rx_octets,
conn->phy_rx);
if (rx_time >= if (rx_time >=
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0)) { RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0)) {
eff_rx_time = MIN(rx_time, eff_rx_time = MIN(rx_time,
Expand All @@ -8625,6 +8628,7 @@ static inline void event_phy_upd_ind_prep(struct connection *conn,
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
0); 0);
} }
#endif /* CONFIG_BT_CTLR_DATA_LENGTH */
} }
conn->phy_flags = conn->phy_pref_flags; conn->phy_flags = conn->phy_pref_flags;


Expand Down Expand Up @@ -8657,6 +8661,7 @@ static inline void event_phy_upd_ind_prep(struct connection *conn,
packet_rx_enqueue(); packet_rx_enqueue();
} }


#if defined(CONFIG_BT_CTLR_DATA_LENGTH)
/* Update max tx and/or max rx if changed */ /* Update max tx and/or max rx if changed */
if ((eff_tx_time == conn->max_tx_time) && if ((eff_tx_time == conn->max_tx_time) &&
(eff_rx_time == conn->max_rx_time)) { (eff_rx_time == conn->max_rx_time)) {
Expand All @@ -8665,10 +8670,6 @@ static inline void event_phy_upd_ind_prep(struct connection *conn,
conn->max_tx_time = eff_tx_time; conn->max_tx_time = eff_tx_time;
conn->max_rx_time = eff_rx_time; conn->max_rx_time = eff_rx_time;


/* flag an event length update*/
conn->evt_len_upd = 1U;

#if defined(CONFIG_BT_CTLR_DATA_LENGTH)
/* Prepare the rx packet structure */ /* Prepare the rx packet structure */
node_rx = packet_rx_reserve_get(2); node_rx = packet_rx_reserve_get(2);
LL_ASSERT(node_rx); LL_ASSERT(node_rx);
Expand Down Expand Up @@ -8703,6 +8704,9 @@ static inline void event_phy_upd_ind_prep(struct connection *conn,
packet_rx_enqueue(); packet_rx_enqueue();
} }
#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ #endif /* CONFIG_BT_CTLR_DATA_LENGTH */

/* flag an event length update*/
conn->evt_len_upd = 1U;
} }
} }
#endif /* CONFIG_BT_CTLR_PHY */ #endif /* CONFIG_BT_CTLR_PHY */
Expand Down

0 comments on commit 04f351a

Please sign in to comment.