michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix supervision timeout countdown

Browse source 
Add missing supervision timeout countdown initiation on CRC
error.

This fixes TP/CON/ADV/BI-01-C [Connection Supervision
Timeout during Fail Connection Setup] and TP/CON/INI/BI-02-C
[Slave Packets Invalid CRC] in LL.TS.5.0.0.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Ulrich Solli Myhre <ulmy@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2017-07-04 06:01:25 +02:00 • committed by Johan Hedberg
commit 2800961fe1
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2443,9 +2443,6 @@ isr_rx_conn_pkt(struct radio_pdu_node_rx *radio_pdu_node_rx,
u8_t terminate = 0; u8_t terminate = 0;
u8_t nack = 0; u8_t nack = 0;
/* Reset CRC expiry counter */
_radio.crc_expire = 0;
/* Ack for transmitted data */ /* Ack for transmitted data */
pdu_data_rx = (struct pdu_data *)radio_pdu_node_rx->pdu_data; pdu_data_rx = (struct pdu_data *)radio_pdu_node_rx->pdu_data;
if (pdu_data_rx->nesn != _radio.conn_curr->sn) { if (pdu_data_rx->nesn != _radio.conn_curr->sn) {
@ -2659,6 +2656,12 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done,
if (terminate) { if (terminate) {
goto isr_rx_conn_exit; goto isr_rx_conn_exit;
} }
/* Reset CRC expiry counter */
_radio.crc_expire = 0;
/* Reset supervision counter */
_radio.conn_curr->supervision_expire = 0;
} else { } else {
/* Start CRC error countdown, if not already started */ /* Start CRC error countdown, if not already started */
if (_radio.crc_expire == 0) { if (_radio.crc_expire == 0) {
@ -2668,6 +2671,12 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done,
/* Check crc error countdown expiry */ /* Check crc error countdown expiry */
_radio.crc_expire--; _radio.crc_expire--;
crc_close = (_radio.crc_expire == 0); crc_close = (_radio.crc_expire == 0);
/* Start supervision timeout, if not started already */
if (!_radio.conn_curr->supervision_expire) {
_radio.conn_curr->supervision_expire =
_radio.conn_curr->supervision_reload;
}
} }
/* prepare transmit packet */ /* prepare transmit packet */
@ -3079,9 +3088,6 @@ static inline void isr_close_conn(void)
/* Reset connection failed to establish procedure */ /* Reset connection failed to establish procedure */
_radio.conn_curr->connect_expire = 0; _radio.conn_curr->connect_expire = 0;
/* Reset supervision counter */
_radio.conn_curr->supervision_expire = 0;
} }
/* Remote Initiated terminate happened in previous event for Master */ /* Remote Initiated terminate happened in previous event for Master */
@ -3114,7 +3120,7 @@ static inline void isr_close_conn(void)
*/ */
else { else {
/* Start supervision timeout, if not started already */ /* Start supervision timeout, if not started already */
if (_radio.conn_curr->supervision_expire == 0) { if (!_radio.conn_curr->supervision_expire) {
_radio.conn_curr->supervision_expire = _radio.conn_curr->supervision_expire =
_radio.conn_curr->supervision_reload; _radio.conn_curr->supervision_reload;
} }
@ -3122,7 +3128,7 @@ static inline void isr_close_conn(void)
/* check supervision timeout */ /* check supervision timeout */
force = 0; force = 0;
if (_radio.conn_curr->supervision_expire != 0) { if (_radio.conn_curr->supervision_expire) {
if (_radio.conn_curr->supervision_expire > elapsed_event) { if (_radio.conn_curr->supervision_expire > elapsed_event) {
_radio.conn_curr->supervision_expire -= elapsed_event; _radio.conn_curr->supervision_expire -= elapsed_event;