Merge pull request #9864 from paul-szczepanek-arm/cordio-host-upgrade

BLE: Cordio host upgrade

Author: Cruz Monrreal

features/FEATURE_BLE/targets/TARGET_CORDIO/mbed_lib.json

@@ -53,6 +53,11 @@
         "max-prepared-writes": {
             "help": "Number of queued prepare writes supported by server.",
             "value": 4
+        },
+        "cmac-calculation": {
+            "help": "Where the CBC MAC calculatio is performed. Valid values are 0 (host) and 1 (controller through HCI).",
+            "value": 1,
+            "macro_name": "SEC_CCM_CFG"
         }
     }
 }

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

@@ -41,6 +41,10 @@
 /*! WSF handler ID */
 wsfHandlerId_t stack_handler_id;
 
+/* WSF heap allocation */
+uint8_t *SystemHeapStart;
+uint32_t SystemHeapSize;
+
 /**
  * Weak definition of ble_cordio_get_hci_driver.
  * A runtime error is generated if the user does not define any
@@ -369,15 +373,19 @@ void BLE::stack_setup()
 
     buf_pool_desc_t buf_pool_desc = _hci_driver->get_buffer_pool_description();
 
+    // use the buffer for the WSF heap
+    SystemHeapStart = buf_pool_desc.buffer_memory;
+    SystemHeapSize = buf_pool_desc.buffer_size;
+
     // Initialize buffers with the ones provided by the HCI driver
-    uint16_t bytes_used = WsfBufInit(
-        buf_pool_desc.buffer_size, buf_pool_desc.buffer_memory,
-        buf_pool_desc.pool_count, buf_pool_desc.pool_description
-    );
+    uint16_t bytes_used = WsfBufInit(buf_pool_desc.pool_count, (wsfBufPoolDesc_t*)buf_pool_desc.pool_description);
 
     // Raise assert if not enough memory was allocated
     MBED_ASSERT(bytes_used != 0);
 
+    SystemHeapStart += bytes_used;
+    SystemHeapSize -= bytes_used;
+
     // This warning will be raised if we've allocated too much memory
     if(bytes_used < buf_pool_desc.buffer_size)
     {