Merge pull request #8876 from donatieng/public_pr_cordio_nordic_ll

Add support for Cordio to NRF52 Devices

Author: 0xc0170

features/FEATURE_BLE/ble/pal/GapEvents.h

@@ -306,7 +306,7 @@ struct GapAdvertisingReportEvent : public GapEvent {
     struct advertising_t {
         received_advertising_type_t type;
         connection_peer_address_type_t address_type;
-        const address_t& address;
+        address_t address;
         ArrayView<const uint8_t> data;
         int8_t rssi;
     };

features/FEATURE_BLE/targets/TARGET_CORDIO/CordioBLE.h

@@ -31,6 +31,7 @@
 #include "ble/generic/GenericGap.h"
 #include "ble/generic/GenericSecurityManager.h"
 #include "SimpleEventQueue.h"
+#include "Timer.h"
 
 namespace ble {
 namespace vendor {
@@ -153,6 +154,8 @@ class BLE : public ::BLEInstanceBase {
 
     ::BLE::InstanceID_t instanceID;
     mutable SimpleEventQueue _event_queue;
+    mbed::Timer _timer;
+    uint64_t _last_update_us;
 
     class SigningEventMonitorProxy : public pal::SigningEventMonitor {
     public:

features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp

@@ -17,6 +17,7 @@
 #include "mbed.h"
 #include "us_ticker_api.h"
 #include "BLE.h"
+#include "CriticalSectionLock.h"
 #include "wsf_types.h"
 #include "wsf_msg.h"
 #include "wsf_os.h"
@@ -95,10 +96,11 @@ 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;
-    stack_setup();
+
 }
 
 BLE::~BLE() { }
@@ -120,6 +122,8 @@ ble_error_t BLE::init(
 {
     switch (initialization_status) {
         case NOT_INITIALIZED:
+            _timer.reset();
+            _timer.start();
             _event_queue.initialize(this, instanceID);
             _init_callback = initCallback;
             start_stack_reset();
@@ -389,6 +393,7 @@ void BLE::stack_setup()
 void BLE::start_stack_reset()
 {
     _hci_driver->initialize();
+    stack_setup();
     DmDevReset();
 }
 
@@ -397,20 +402,22 @@ void BLE::callDispatcher()
     // process the external event queue
     _event_queue.process();
 
-    // follow by stack events
-    static uint32_t lastTimeUs = us_ticker_read();
-    uint32_t currTimeUs, deltaTimeMs;
+    _last_update_us += (uint64_t)_timer.read_high_resolution_us();
+    _timer.reset();
 
-    // Update the current cordio time
-    currTimeUs = us_ticker_read();
-    deltaTimeMs = (currTimeUs - lastTimeUs) / 1000;
-    if (deltaTimeMs > 0) {
-        WsfTimerUpdate(deltaTimeMs / WSF_MS_PER_TICK);
-        lastTimeUs += deltaTimeMs * 1000;
+    uint64_t last_update_ms   = (_last_update_us / 1000);
+    wsfTimerTicks_t wsf_ticks = (last_update_ms / WSF_MS_PER_TICK);
+
+    if (wsf_ticks > 0) {
+        WsfTimerUpdate(wsf_ticks);
+
+        _last_update_us -= (last_update_ms * 1000);
     }
 
     wsfOsDispatcher();
 
+    CriticalSectionLock critical_section;
+
     if (wsfOsReadyToSleep()) {
         static Timeout nextTimeout;
         // setup an mbed timer for the next Cordio timeout

features/FEATURE_BLE/targets/TARGET_CORDIO_LL/cordio_stack/LICENSE

@@ -0,0 +1,49 @@
+Permissive Binary License
+
+Version 1.0, September 2015
+
+Redistribution.  Redistribution and use in binary form, without
+modification, are permitted provided that the following conditions are
+met:
+
+1) Redistributions must reproduce the above copyright notice and the
+   following disclaimer in the documentation and/or other materials
+   provided with the distribution.
+
+2) Unless to the extent explicitly permitted by law, no reverse
+   engineering, decompilation, or disassembly of this software is
+   permitted.
+
+3) Redistribution as part of a software development kit must include the
+   accompanying file named “DEPENDENCIES” and any dependencies listed in
+   that file.
+
+4) Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+Limited patent license. The copyright holders (and contributors) grant a
+worldwide, non-exclusive, no-charge, royalty-free patent license to
+make, have made, use, offer to sell, sell, import, and otherwise
+transfer this software, where such license applies only to those patent
+claims licensable by the copyright holders (and contributors) that are
+necessarily infringed by this software. This patent license shall not
+apply to any combinations that include this software.  No hardware is
+licensed hereunder.
+
+If you institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the software
+itself infringes your patent(s), then your rights granted under this
+license shall terminate as of the date such litigation is filed.
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS." ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

features/FEATURE_BLE/targets/TARGET_CORDIO_LL/cordio_stack/README.md

@@ -0,0 +1,25 @@
+# BLE API Cordio Link Layer Implementation
+
+The BLE API Cordio link layer implementation allows Cordio licensee to easily
+deliver a complete and up to date implementation of mbed BLE to their customers
+using mbed OS.
+
+The library a consists of the controller HCI, Bluetooth 5 compliant link layer
+protocol core, scheduler, baseband porting layer and a portable software
+foundation.
+
+To deliver a BLE port, vendors simply have to provide an HCI driver tailored
+for the BLE module present on the board they want to support.
+
+## Source Organization
+
+The root contains the binary distribution `libcordio_stack.a` of the library and
+the folders contain the public headers to interface with it.
+
+* `controller`: HCI Controller headers
+* `platform`: Platform headers
+
+
+## Library information
+
+Compiled with: GNU Arm Embedded Toolchain 6-2017-q2-update