Merge pull request #13103 from paul-szczepanek-arm/upgrade-cordio-20-05-ll

BLE: Upgrade cordio Link Layer to 20.05r

Author: pan-

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/include/ll_defs.h

@@ -45,6 +45,8 @@ extern "C" {
 #define LL_VER_BT_CORE_SPEC_5_2     0x0B    /*!< Bluetooth core specification 5.2 */
 #define LL_VER_BT_CORE_SPEC_SYDNEY  0x0C    /*!< Bluetooth core specification Sydney */
 
+#define LL_COMP_ID_ARM              0x005F  /*!< ARM Ltd. company ID. */
+
 /*** Common ***/
 
 #define LL_RSSI_MIN                 -127    /*!< Minimum RSSI value. */

features/FEATURE_BLE/targets/TARGET_CORDIO/stack_adaptation/pal_mbed_os_adaptation.cpp

@@ -19,6 +19,7 @@
 #include "stack/platform/include/pal_uart.h"
 #include "hal/ticker_api.h"
 #include "mbed_critical.h"
+#include "pal_codec.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -113,6 +114,21 @@ MBED_WEAK void PalSysSleep()
     MBED_ERROR(function_not_implemented, "Provide implementation of PalSysSleep");
 }
 
+MBED_WEAK void PalSysSetTrap(bool_t enable)
+{
+    (void)enable;
+}
+
+MBED_WEAK uint32_t PalSysGetAssertCount()
+{
+    return 0;
+}
+
+MBED_WEAK uint32_t PalSysGetStackUsage()
+{
+    return 0;
+}
+
 /* CS */
 
 MBED_WEAK void PalEnterCs(void)
@@ -124,6 +140,61 @@ MBED_WEAK void PalExitCs(void)
     core_util_critical_section_exit();
 }
 
+/* ISO channels */
+
+MBED_WEAK void PalCodecReadLocalSupportedCodecs(uint8_t *pNumStd, AudioStdCodecInfo_t stdCodecs[],
+                                                uint8_t *pNumVs, AudioVsCodecInfo_t vsCodecs[])
+{
+    MBED_ERROR(function_not_implemented, "Provide implementation of PalCodecReadLocalSupportedCodecs");
+}
+
+MBED_WEAK bool_t PalCodecReadLocalSupportedCodecCapabilities(
+    uint8_t codingFmt, uint16_t compId, uint16_t vsCodecId, PalAudioDir_t dir)
+{
+    MBED_ERROR(function_not_implemented, "Provide implementation of PalCodecReadLocalSupportedCodecCapabilities");
+    return 0;
+}
+
+MBED_WEAK bool_t PalCodecReadLocalSupportedControllerDelay(
+    uint8_t codingFmt, uint16_t compId, uint16_t vsCodecId, PalAudioDir_t dir, uint32_t *pMinDly, uint32_t *pMaxDly)
+{
+    MBED_ERROR(function_not_implemented, "Provide implementation of PalCodecReadLocalSupportedControllerDelay");
+    return 0;
+}
+MBED_WEAK bool_t PalCodecConfigureDataPath(PalAudioDir_t dir, uint8_t dataPathId)
+{
+    MBED_ERROR(function_not_implemented, "Provide implementation of PalCodecConfigureDataPath");
+    return 0;
+}
+
+MBED_WEAK void PalCodecDataInit(void)
+{
+    MBED_ERROR(function_not_implemented, "Provide implementation of PalCodecDataInit");
+}
+
+MBED_WEAK bool_t PalCodecDataStartStream(uint16_t id, PalCodecSreamParam_t *pParam)
+{
+    MBED_ERROR(function_not_implemented, "Provide implementation of PalCodecDataStartStream");
+    return 0;
+}
+
+MBED_WEAK void PalCodecDataStopStream(uint16_t id)
+{
+    MBED_ERROR(function_not_implemented, "Provide implementation of PalCodecDataStopStream");
+}
+
+MBED_WEAK uint16_t PalCodecDataStreamIn(uint16_t id, uint8_t *pBuf, uint16_t len, uint32_t *pPktCtr)
+{
+    MBED_ERROR(function_not_implemented, "Provide implementation of PalCodecDataStreamIn");
+    return 0;
+}
+
+MBED_WEAK void PalCodecDataStreamOut(uint16_t id, const uint8_t *pBuf, uint16_t len, uint32_t pktCtr)
+{
+    MBED_ERROR(function_not_implemented, "Provide implementation of PalCodecDataStreamOut");
+}
+
+
 #ifdef __cplusplus
 };
 #endif

features/FEATURE_BLE/targets/TARGET_CORDIO_LL/mbed_lib.json

@@ -50,6 +50,11 @@
             "help": "Does the board have a UART HCI. Valid values are 0 and 1 (must provide UART through PAL).",
             "value": 0,
             "macro_name": "CHCI_TR_UART"
+        },
+        "custom-hci-transport": {
+            "help": "This enables transport through port provided functions, do not disable unless you wish you use uart-hci.",
+            "value": 1,
+            "macro_name": "CHCI_TR_CUSTOM"
         }
     }
 }

features/FEATURE_BLE/targets/TARGET_CORDIO_LL/stack/controller/include/ble/bb_ble_api.h

@@ -1,23 +1,24 @@
-/* Copyright (c) 2019 Arm Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 /*************************************************************************************************/
 /*!
- * \file
- * \brief BLE baseband interface file.
+ *  \file
+ *
+ *  \brief      BLE baseband interface file.
+ *
+ *  Copyright (c) 2013-2019 Arm Ltd. All Rights Reserved.
+ *
+ *  Copyright (c) 2019-2020 Packetcraft, Inc.
+ *  
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 /*************************************************************************************************/
 
@@ -167,8 +168,6 @@ typedef struct
 /*!
  *  \brief      Initialize the BLE BB.
  *
- *  \return     None.
- *
  *  Initialize baseband resources.
  */
 /*************************************************************************************************/
@@ -178,8 +177,6 @@ void BbBleInit(void);
 /*!
  *  \brief      Initialize for scanning master operations.
  *
- *  \return     None.
- *
  *  Update the operation table with scanning master operations routines.
  */
 /*************************************************************************************************/
@@ -189,8 +186,6 @@ void BbBleScanMasterInit(void);
 /*!
  *  \brief      Initialize for auxiliary scanning master operations.
  *
- *  \return     None.
- *
  *  Update the operation table with auxiliary scanning master operations routines.
  */
 /*************************************************************************************************/
@@ -200,8 +195,6 @@ void BbBleAuxScanMasterInit(void);
 /*!
  *  \brief      Initialize for periodic scanning master operations.
  *
- *  \return     None.
- *
  *  Update the operation table with periodic scanning master operations routines.
  */
 /*************************************************************************************************/
@@ -211,8 +204,6 @@ void BbBlePerScanMasterInit(void);
 /*!
  *  \brief      Initialize for connectable master operations.
  *
- *  \return     None.
- *
  *  Update the operation table with connectable master operations routines.
  */
 /*************************************************************************************************/
@@ -222,8 +213,6 @@ void BbBleConnMasterInit(void);
 /*!
  *  \brief      Initialize for advertising slave operations.
  *
- *  \return     None.
- *
  *  Update the operation table with advertising slave operations routines.
  */
 /*************************************************************************************************/
@@ -233,8 +222,6 @@ void BbBleAdvSlaveInit(void);
 /*!
  *  \brief      Initialize for auxiliary advertising slave operations.
  *
- *  \return     None.
- *
  *  Update the operation table with auxiliary advertising slave operations routines.
  */
 /*************************************************************************************************/
@@ -244,8 +231,6 @@ void BbBleAuxAdvSlaveInit(void);
 /*!
  *  \brief      Initialize for connectable slave operations.
  *
- *  \return     None.
- *
  *  Update the operation table with connectable slave operations routines.
  */
 /*************************************************************************************************/
@@ -255,8 +240,6 @@ void BbBleConnSlaveInit(void);
 /*!
  *  \brief      Initialize for test operations.
  *
- *  \return     None.
- *
  *  Update the operation table with test operations routines.
  */
 /*************************************************************************************************/
@@ -318,8 +301,6 @@ uint16_t BbBleInitPeriodicList(uint8_t numEntries, uint8_t *pFreeMem, uint32_t f
  *  \brief      Get advertising packet statistics.
  *
  *  \param      pStats      Advertising statistics.
- *
- *  \return     None.
  */
 /*************************************************************************************************/
 void BbBleGetAdvStats(BbBleAdvPktStats_t *pStats);
@@ -329,8 +310,6 @@ void BbBleGetAdvStats(BbBleAdvPktStats_t *pStats);
  *  \brief      Get scan packet statistics.
  *
  *  \param      pStats      Scan statistics.
- *
- *  \return     None.
  */
 /*************************************************************************************************/
 void BbBleGetScanStats(BbBleScanPktStats_t *pStats);
@@ -340,8 +319,6 @@ void BbBleGetScanStats(BbBleScanPktStats_t *pStats);
  *  \brief      Get auxiliary advertising packet statistics.
  *
  *  \param      pStats      Auxiliary advertising statistics.
- *
- *  \return     None.
  */
 /*************************************************************************************************/
 void BbBleGetAuxAdvStats(BbBleAuxAdvPktStats_t *pStats);
@@ -351,8 +328,6 @@ void BbBleGetAuxAdvStats(BbBleAuxAdvPktStats_t *pStats);
  *  \brief      Get auxiliary scan packet statistics.
  *
  *  \param      pStats      Auxiliary scan statistics.
- *
- *  \return     None.
  */
 /*************************************************************************************************/
 void BbBleGetAuxScanStats(BbBleAuxScanPktStats_t *pStats);
@@ -362,8 +337,6 @@ void BbBleGetAuxScanStats(BbBleAuxScanPktStats_t *pStats);
  *  \brief      Get periodic scan packet statistics.
  *
  *  \param      pStats      Periodic scan statistics.
- *
- *  \return     None.
  */
 /*************************************************************************************************/
 void BbBleGetPerScanStats(BbBlePerScanPktStats_t *pStats);
@@ -373,8 +346,6 @@ void BbBleGetPerScanStats(BbBlePerScanPktStats_t *pStats);
  *  \brief      Get connection packet statistics.
  *
  *  \param      pStats      Connection data statistics.
- *
- *  \return     None.
  */
 /*************************************************************************************************/
 void BbBleGetConnStats(BbBleDataPktStats_t *pStats);
@@ -384,8 +355,6 @@ void BbBleGetConnStats(BbBleDataPktStats_t *pStats);
  *  \brief      Get test mode packet statistics.
  *
  *  \param      pStats      Test data statistics.
- *
- *  \return     None.
  */
 /*************************************************************************************************/
 void BbBleGetTestStats(BbBleDataPktStats_t *pStats);
@@ -395,8 +364,6 @@ void BbBleGetTestStats(BbBleDataPktStats_t *pStats);
  *  \brief      Get PDU filter statistics.
  *
  *  \param      pStats      PDU filter statistics.
- *
- *  \return     None.
  */
 /*************************************************************************************************/
 void BbBleGetPduFiltStats(BbBlePduFiltStats_t *pStats);
@@ -405,8 +372,6 @@ void BbBleGetPduFiltStats(BbBlePduFiltStats_t *pStats);
 /*!
  *  \brief      Initialize for connected isochronous stream master operations.
  *
- *  \return     None.
- *
  *  Update the operation table with CIS master operations routines.
  */
 /*************************************************************************************************/
@@ -416,20 +381,34 @@ void BbBleCisMasterInit(void);
 /*!
  *  \brief      Initialize for connected isochronous stream slave operations.
  *
- *  \return     None.
- *
  *  Update the operation table with CIS slave operations routines.
  */
 /*************************************************************************************************/
 void BbBleCisSlaveInit(void);
 
+/*************************************************************************************************/
+/*!
+ *  \brief      Initialize for Broadcast isochronous stream master operations.
+ *
+ *  Update the operation table with CIS master operations routines.
+ */
+/*************************************************************************************************/
+void BbBleBisMasterInit(void);
+
+/*************************************************************************************************/
+/*!
+ *  \brief      Initialize for Broadcast isochronous stream slave operations.
+ *
+ *  Update the operation table with CIS slave operations routines.
+ */
+/*************************************************************************************************/
+void BbBleBisSlaveInit(void);
+
 /*************************************************************************************************/
 /*!
  *  \brief      Get CIS packet statistics.
  *
  *  \param      pStats      CIS data statistics.
- *
- *  \return     None.
  */
 /*************************************************************************************************/
 void BbBleGetCisStats(BbBleDataPktStats_t *pStats);