From ca2efcdd110d31940c32afd810309929bacf032b Mon Sep 17 00:00:00 2001
From: Steve Cartmell <steve.cartmell@arm.com>
Date: Mon, 26 Nov 2018 11:58:36 +0000
Subject: [PATCH] fix(pan-cordio): Reset timer after updating to reduce chance
 of overflow

---
 .../targets/TARGET_CORDIO/CordioBLE.h          |  1 +
 .../targets/TARGET_CORDIO/source/CordioBLE.cpp | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioBLE.h b/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioBLE.h
index 8a4428bef8..a8083c3bbe 100644
--- a/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioBLE.h
+++ b/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioBLE.h
@@ -155,6 +155,7 @@ private:
     ::BLE::InstanceID_t instanceID;
     mutable SimpleEventQueue _event_queue;
     mbed::Timer _timer;
+    uint64_t _last_update_us;
 
     class SigningEventMonitorProxy : public pal::SigningEventMonitor {
     public:
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp
index e314b5c328..6295055eb1 100644
--- a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp
@@ -96,7 +96,8 @@ namespace cordio {
 BLE::BLE(CordioHCIDriver& hci_driver) :
     initialization_status(NOT_INITIALIZED),
     instanceID(::BLE::DEFAULT_INSTANCE),
-    _event_queue()
+    _event_queue(),
+    _last_update_us(0)
 {
     _hci_driver = &hci_driver;
 
@@ -401,17 +402,16 @@ void BLE::callDispatcher()
     // process the external event queue
     _event_queue.process();
 
-    // follow by stack events
-    static us_timestamp_t last_time_us = _timer.read_high_resolution_us();
+    _last_update_us += (uint64_t)_timer.read_high_resolution_us();
+    _timer.reset();
 
-    // Update the current cordio time
-    us_timestamp_t curr_time_us = _timer.read_high_resolution_us();
-    uint64_t delta_time_ms = ((curr_time_us - last_time_us) / 1000);
+    uint64_t last_update_ms   = (_last_update_us / 1000);
+    wsfTimerTicks_t wsf_ticks = (last_update_ms / WSF_MS_PER_TICK);
 
-    if (delta_time_ms > 0) {
-        WsfTimerUpdate(delta_time_ms / WSF_MS_PER_TICK);
+    if (wsf_ticks > 0) {
+        WsfTimerUpdate(wsf_ticks);
 
-        last_time_us += (delta_time_ms * 1000);
+        _last_update_us -= (last_update_ms * 1000);
     }
 
     wsfOsDispatcher();