From b07e7f2b5acb712cfec95f8ce3dad6654d434f1a Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Tue, 4 Jul 2017 09:49:00 +0200 Subject: [PATCH] Bluetooth: controller: Fix T_Terminate and other timeout calc. Fix calculation of T_Terminate and other procedure timers by using ceil on calculated connection interval units. This fixes TP/CON/MAS/BI-02-C [Master T_Terminate Timer] and TP/CON/SLA/BI-02-C [Slave T_Terminate Timer] in LL.TS.5.0.0. Signed-off-by: Vinayak Kariappa Chettimada Signed-off-by: Ulrich Solli Myhre --- subsys/bluetooth/controller/ll_sw/ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c index 17c12119b13..cfe5c3d17c5 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.c +++ b/subsys/bluetooth/controller/ll_sw/ctrl.c @@ -39,7 +39,7 @@ #include "common/log.h" #define RADIO_TIFS 150 -#define RADIO_CONN_EVENTS(x, y) ((u16_t)((x) / (y))) +#define RADIO_CONN_EVENTS(x, y) ((u16_t)(((x) + (y) - 1) / (y))) #define RADIO_TICKER_JITTER_US 16 #define RADIO_TICKER_START_PART_US 300 @@ -6632,7 +6632,7 @@ static void event_connection_prepare(u32_t ticks_at_expire, /* Terminate Procedure timeout is started, will * replace any other timeout running */ - conn->procedure_expire = conn->procedure_reload; + conn->procedure_expire = conn->supervision_reload; } }