Merge pull request #55 from fpistm/CubeWB_v1.16.0

chore: update to STM32Cube_FW v1.16.0

Author: fpistm

src/utility/HCISharedMemTransport.cpp

@@ -658,7 +658,8 @@ int HCISharedMemTransportClass::stm32wb_start_ble(void)
     CFG_BLE_MAX_ADV_DATA_LEN,
     CFG_BLE_TX_PATH_COMPENS,
     CFG_BLE_RX_PATH_COMPENS,
-    CFG_BLE_CORE_VERSION
+    CFG_BLE_CORE_VERSION,
+    CFG_BLE_OPTIONS_EXT
   };
   /**
    * Starts the BLE Stack on CPU2

src/utility/STM32Cube_FW/README.md

@@ -1,6 +1,6 @@
 
 ## Source
 
-[STMicroelectronics/STM32CubeWB Release vv1.15.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/vv1.15.0)
-- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/vv1.15.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
+[STMicroelectronics/STM32CubeWB Release vvv1.16.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/vvv1.16.0)
+- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/vvv1.16.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
 

src/utility/STM32Cube_FW/app_conf_default.h

@@ -5,7 +5,7 @@
  *****************************************************************************
  * @attention
  *
- * Copyright (c) 2018-2022 STMicroelectronics.
+ * Copyright (c) 2018-2023 STMicroelectronics.
  * All rights reserved.
  *
  * This software is licensed under terms that can be found in the LICENSE file
@@ -86,11 +86,11 @@
  * BLE_FIXED_BUFFER_SIZE_BYTES:
  * A part of the RAM, is dynamically allocated by initializing all the pointers
  * defined in a global context variable "mem_alloc_ctx_p".
- * This initialization is made in the Dynamic_allocator functions, which 
+ * This initialization is made in the Dynamic_allocator functions, which
  * assign a portion of RAM given by the external application to the above
  * mentioned "global pointers".
  *
- * The size of this Dynamic RAM is made of 2 main components: 
+ * The size of this Dynamic RAM is made of 2 main components:
  * - a part that is parameters-dependent (num of links, GATT buffers, ...),
  *   and which value is made explicit by the following macro;
  * - a part, that may be considered "fixed", i.e. independent from the above
@@ -120,11 +120,11 @@
 #elif (LL_ONLY != 0)
 #define BLE_PER_LINK_SIZE_BYTES       244   /* LL only Full */
 #elif (SLAVE_ONLY != 0)
-#define BLE_PER_LINK_SIZE_BYTES       336   /* Peripheral only */
+#define BLE_PER_LINK_SIZE_BYTES       344   /* Peripheral only */
 #elif (BASIC_FEATURES != 0)
-#define BLE_PER_LINK_SIZE_BYTES       412   /* Basic Features */
+#define BLE_PER_LINK_SIZE_BYTES       420   /* Basic Features */
 #else
-#define BLE_PER_LINK_SIZE_BYTES       424   /* Full stack */
+#define BLE_PER_LINK_SIZE_BYTES       432   /* Full stack */
 #endif
 
 /*

src/utility/STM32Cube_FW/ble_bufsize.h

@@ -41,6 +41,8 @@ extern "C" {
    ******************************************************************************/
   void HW_IPCC_Enable( void );
   void HW_IPCC_Init( void );
+#define HW_IPCC_Rx_Handler IPCC_C1_RX_IRQHandler
+#define HW_IPCC_Tx_Handler IPCC_C1_TX_IRQHandler
 
   void HW_IPCC_BLE_Init( void );
   void HW_IPCC_BLE_SendCmd( void );
@@ -83,10 +85,27 @@ extern "C" {
   void HW_IPCC_BLE_LLD_ReceiveRsp( void );
   void HW_IPCC_BLE_LLD_SendRspAck( void );
 
-  
+
   void HW_IPCC_TRACES_Init( void );
   void HW_IPCC_TRACES_EvtNot( void );
 
+  void HW_IPCC_MAC_802_15_4_Init( void );
+  void HW_IPCC_MAC_802_15_4_SendCmd( void );
+  void HW_IPCC_MAC_802_15_4_SendAck( void );
+  void HW_IPCC_MAC_802_15_4_CmdEvtNot( void );
+  void HW_IPCC_MAC_802_15_4_EvtNot( void );
+
+  void HW_IPCC_ZIGBEE_Init( void );
+
+  void HW_IPCC_ZIGBEE_SendM4RequestToM0(void); /* M4 Request to M0 */
+  void HW_IPCC_ZIGBEE_RecvAppliAckFromM0(void); /* Request ACK from M0 */
+
+  void HW_IPCC_ZIGBEE_RecvM0NotifyToM4(void); /* M0 Notify to M4 */
+  void HW_IPCC_ZIGBEE_SendM4AckToM0Notify(void); /* Notify ACK from M4 */
+  void HW_IPCC_ZIGBEE_RecvM0RequestToM4(void); /* M0 Request to M4 */
+  void HW_IPCC_ZIGBEE_SendM4AckToM0Request(void); /* Request ACK from M4 */
+
+
 #ifdef __cplusplus
 }
 #endif

src/utility/STM32Cube_FW/hw.h

@@ -106,6 +106,12 @@ extern "C" {
     uint8_t   *m0cmd_buffer;
   } MB_BleLldTable_t;
 
+  typedef struct
+  {
+    uint8_t   *notifM0toM4_buffer;
+    uint8_t   *appliCmdM4toM0_buffer;
+    uint8_t   *requestM0toM4_buffer;
+  } MB_ZigbeeTable_t;
   /**
    * msg
    * [0:7]   = cmd/evt
@@ -133,6 +139,13 @@ extern "C" {
     uint8_t   *traces_queue;
   } MB_TracesTable_t;
 
+  typedef struct
+  {
+    uint8_t   *p_cmdrsp_buffer;
+    uint8_t   *p_notack_buffer;
+    uint8_t   *evt_queue;
+  } MB_Mac_802_15_4_t;
+
   typedef struct
   {
     MB_DeviceInfoTable_t    *p_device_info_table;
@@ -141,6 +154,8 @@ extern "C" {
     MB_SysTable_t           *p_sys_table;
     MB_MemManagerTable_t    *p_mem_manager_table;
     MB_TracesTable_t        *p_traces_table;
+    MB_Mac_802_15_4_t       *p_mac_802_15_4_table;
+    MB_ZigbeeTable_t        *p_zigbee_table;
     MB_LldTestsTable_t      *p_lld_tests_table;
     MB_BleLldTable_t        *p_ble_lld_table;
 } MB_RefTable_t;
@@ -184,6 +199,15 @@ typedef struct
  *   |                                                 |
  *   |<---HW_IPCC_SYSTEM_EVENT_CHANNEL-----------------|
  *   |                                                 |
+ *   |            (ZIGBEE)                             |
+ *   |----HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL------------>|
+ *   |                                                 |
+ *   |----HW_IPCC_ZIGBEE_CMD_CLI_CHANNEL-------------->|
+ *   |                                                 |
+ *   |<---HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL-------|
+ *   |                                                 |
+ *   |<---HW_IPCC_ZIGBEE_CLI_NOTIF_ACK_CHANNEL---------|
+ *   |                                                 |
  *   |             (THREAD)                            |
  *   |----HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL----------->|
  *   |                                                 |
@@ -207,6 +231,11 @@ typedef struct
  *   |                                                 |
  *   |<---HW_IPCC_BLE_LLD_M0_CMD_CHANNEL---------------|
  *   |                                                 |
+ *   |             (MAC)                               |
+ *   |----HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL-------->|
+ *   |                                                 |
+ *   |<---HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL|
+ *   |                                                 |
  *   |             (BUFFER)                            |
  *   |----HW_IPCC_MM_RELEASE_BUFFER_CHANNE------------>|
  *   |                                                 |
@@ -224,6 +253,8 @@ typedef struct
 #define HW_IPCC_BLE_CMD_CHANNEL                         LL_IPCC_CHANNEL_1
 #define HW_IPCC_SYSTEM_CMD_RSP_CHANNEL                  LL_IPCC_CHANNEL_2
 #define HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL               LL_IPCC_CHANNEL_3
+#define HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL                LL_IPCC_CHANNEL_3
+#define HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL            LL_IPCC_CHANNEL_3
 #define HW_IPCC_MM_RELEASE_BUFFER_CHANNEL               LL_IPCC_CHANNEL_4
 #define HW_IPCC_THREAD_CLI_CMD_CHANNEL                  LL_IPCC_CHANNEL_5
 #define HW_IPCC_LLDTESTS_CLI_CMD_CHANNEL                LL_IPCC_CHANNEL_5
@@ -235,12 +266,15 @@ typedef struct
 #define HW_IPCC_BLE_EVENT_CHANNEL                       LL_IPCC_CHANNEL_1
 #define HW_IPCC_SYSTEM_EVENT_CHANNEL                    LL_IPCC_CHANNEL_2
 #define HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL         LL_IPCC_CHANNEL_3
+#define HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL          LL_IPCC_CHANNEL_3
+#define HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL   LL_IPCC_CHANNEL_3
 #define HW_IPCC_LLDTESTS_M0_CMD_CHANNEL                 LL_IPCC_CHANNEL_3
 #define HW_IPCC_BLE_LLD_M0_CMD_CHANNEL                  LL_IPCC_CHANNEL_3
 #define HW_IPCC_TRACES_CHANNEL                          LL_IPCC_CHANNEL_4
 #define HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL     LL_IPCC_CHANNEL_5
 #define HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL                LL_IPCC_CHANNEL_5
 #define HW_IPCC_BLE_LLD_CLI_RSP_CHANNEL                 LL_IPCC_CHANNEL_5
 #define HW_IPCC_BLE_LLD_RSP_CHANNEL                     LL_IPCC_CHANNEL_5
+#define HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL               LL_IPCC_CHANNEL_5
 #endif /*__MBOX_H */
 

src/utility/STM32Cube_FW/hw_ipcc.c

@@ -352,6 +352,24 @@ SHCI_CmdStatus_t SHCI_C2_BLE_LLD_Init( uint8_t param_size, uint8_t * p_param )
   return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
 }
 
+SHCI_CmdStatus_t SHCI_C2_ZIGBEE_Init( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_ZIGBEE_INIT,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
 SHCI_CmdStatus_t SHCI_C2_DEBUG_Init( SHCI_C2_DEBUG_Init_Cmd_Packet_t *pCmdPacket  )
 {
   /**
@@ -509,6 +527,24 @@ SHCI_CmdStatus_t SHCI_C2_RADIO_AllowLowPower( SHCI_C2_FLASH_Ip_t Ip,uint8_t  Fla
   return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
 }
 
+SHCI_CmdStatus_t SHCI_C2_MAC_802_15_4_Init( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_MAC_802_15_4_INIT,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
 SHCI_CmdStatus_t SHCI_C2_Reinit( void )
 {
   /**

src/utility/STM32Cube_FW/mbox_def.h

@@ -49,6 +49,7 @@ extern "C" {
      ERR_BLE_INIT = 0,                 /* This event is currently not reported by the CPU2                    */
      ERR_THREAD_LLD_FATAL_ERROR = 125, /* The LLD driver used on 802_15_4 detected a fatal error              */
      ERR_THREAD_UNKNOWN_CMD = 126,     /* The command send by the CPU1 to control the Thread stack is unknown */
+     ERR_ZIGBEE_UNKNOWN_CMD = 200,     /* The command send by the CPU1 to control the Zigbee stack is unknown */
    } SCHI_SystemErrCode_t;
 
 #define SHCI_EVTCODE                    ( 0xFF )
@@ -215,7 +216,9 @@ extern "C" {
     SHCI_OCF_C2_FLASH_STORE_DATA,
     SHCI_OCF_C2_FLASH_ERASE_DATA,
     SHCI_OCF_C2_RADIO_ALLOW_LOW_POWER,
+    SHCI_OCF_C2_MAC_802_15_4_INIT,
     SHCI_OCF_C2_REINIT,
+    SHCI_OCF_C2_ZIGBEE_INIT,
     SHCI_OCF_C2_LLD_TESTS_INIT,
     SHCI_OCF_C2_EXTPA_CONFIG,
     SHCI_OCF_C2_SET_FLASH_ACTIVITY_CONTROL,
@@ -433,7 +436,7 @@ extern "C" {
    * PrWriteListSize
    * NOTE: This parameter is ignored by the CPU2 when the parameter "Options" is set to "LL_only" ( see Options description in that structure )
    *
-   * Maximum number of supported "prepare write request"
+   * Maximum number of supported “prepare write request”
    *    - Min value: given by the macro DEFAULT_PREP_WRITE_LIST_SIZE
    *    - Max value: a value higher than the minimum required can be specified, but it is not recommended
    */
@@ -500,7 +503,7 @@ extern "C" {
    * MaxConnEventLength
    * This parameter determines the maximum duration of a slave connection event. When this duration is reached the slave closes
    * the current connections event (whatever is the CE_length parameter specified by the master in HCI_CREATE_CONNECTION HCI command),
-   * expressed in units of 625/256 µs (~2.44 µs)
+   * expressed in units of 625/256 µs (~2.44 µs)
    *    - Min value: 0 (if 0 is specified, the master and slave perform only a single TX-RX exchange per connection event)
    *    - Max value: 1638400 (4000 ms). A higher value can be specified (max 0xFFFFFFFF) but results in a maximum connection time
    *      of 4000 ms as specified. In this case the parameter is not applied, and the predicted CE length calculated on slave is not shortened
@@ -509,7 +512,7 @@ extern "C" {
 
   /**
    * HsStartupTime
-   * Startup time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 µs (~2.44 µs).
+   * Startup time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 µs (~2.44 µs).
    *    - Min value: 0
    *    - Max value:  820 (~2 ms). A higher value can be specified, but the value that implemented in stack is forced to ~2 ms
    */
@@ -533,9 +536,7 @@ extern "C" {
    * - bit 5:   1: Reduced GATT database in NVM     0: Full GATT database in NVM
    * - bit 6:   1: GATT caching is used             0: GATT caching is not used
    * - bit 7:   1: LE Power Class 1                 0: LE Power Classe 2-3
-   * - bit 8:   1: appearance Writable              0: appearance Read-Only
-   * - bit 9:   1: Enhanced ATT supported           0: Enhanced ATT not supported
-   * - other bits: reserved ( shall be set to 0)
+   * - other bits: complete with Options_extension flag
    */
   uint8_t Options;
 
@@ -601,6 +602,14 @@ extern "C" {
    */
   uint8_t ble_core_version;
 
+   /**
+   * Options flags extension
+   * - bit 0:   1: appearance Writable              0: appearance Read-Only
+   * - bit 1:   1: Enhanced ATT supported           0: Enhanced ATT not supported
+   * - other bits: reserved ( shall be set to 0)
+   */
+  uint8_t Options_extension;
+
       } SHCI_C2_Ble_Init_Cmd_Param_t;
 
   typedef PACKED_STRUCT{
@@ -637,11 +646,16 @@ extern "C" {
 #define SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1                        (1<<7)
 #define SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3                      (0<<7)
 
-#define SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_WRITABLE                  (1<<8)
-#define SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_READONLY                  (0<<8)
+  /**
+   * Options extension
+   * Each definition below may be added together to build the Options value
+   * WARNING : Only one definition per bit shall be added to build the Options value
+   */
+#define SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_WRITABLE                  (1<<0)
+#define SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_READONLY                  (0<<0)
 
-#define SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_SUPPORTED               (1<<9)
-#define SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_NOTSUPPORTED            (0<<9)
+#define SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_SUPPORTED               (1<<1)
+#define SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_NOTSUPPORTED            (0<<1)
 
     /**
    * RX models configuration
@@ -675,6 +689,8 @@ extern "C" {
     {
       uint8_t thread_config;
       uint8_t ble_config;
+      uint8_t mac_802_15_4_config;
+      uint8_t zigbee_config;
     } SHCI_C2_DEBUG_TracesConfig_t;
 
     typedef PACKED_STRUCT
@@ -738,6 +754,8 @@ extern "C" {
     {
       BLE_ENABLE,
       THREAD_ENABLE,
+      ZIGBEE_ENABLE,
+      MAC_ENABLE,
     } SHCI_C2_CONCURRENT_Mode_Param_t;
       /** No response parameters*/
 
@@ -760,13 +778,18 @@ extern "C" {
     {
       BLE_IP,
       THREAD_IP,
+      ZIGBEE_IP,
     } SHCI_C2_FLASH_Ip_t;
       /** No response parameters*/
 
 #define SHCI_OPCODE_C2_RADIO_ALLOW_LOW_POWER    (( SHCI_OGF << 10) + SHCI_OCF_C2_RADIO_ALLOW_LOW_POWER)
 
+#define SHCI_OPCODE_C2_MAC_802_15_4_INIT        (( SHCI_OGF << 10) + SHCI_OCF_C2_MAC_802_15_4_INIT)
+
 #define SHCI_OPCODE_C2_REINIT                   (( SHCI_OGF << 10) + SHCI_OCF_C2_REINIT)
 
+#define SHCI_OPCODE_C2_ZIGBEE_INIT              (( SHCI_OGF << 10) + SHCI_OCF_C2_ZIGBEE_INIT)
+
 #define SHCI_OPCODE_C2_LLD_TESTS_INIT           (( SHCI_OGF << 10) + SHCI_OCF_C2_LLD_TESTS_INIT)
 
 #define SHCI_OPCODE_C2_BLE_LLD_INIT             (( SHCI_OGF << 10) + SHCI_OCF_C2_BLE_LLD_INIT)
@@ -881,7 +904,7 @@ extern "C" {
 #define FUS_DEVICE_INFO_TABLE_VALIDITY_KEYWORD    (0xA94656B9)
 
 /*
-  *   At startup, the information relative to the wireless binary are stored in RAM through a structure defined by
+  *   At startup, the informations relative to the wireless binary are stored in RAM trough a structure defined by
   *   MB_WirelessFwInfoTable_t.This structure contains 4 fields (Version,MemorySize, Stack_info and a reserved part)
   *   each of those coded on 32 bits as shown on the table below:
   *
@@ -937,6 +960,9 @@ extern "C" {
 #define INFO_STACK_TYPE_BLE_HCI_EXT_ADV             0x07
 #define INFO_STACK_TYPE_THREAD_FTD                  0x10
 #define INFO_STACK_TYPE_THREAD_MTD                  0x11
+#define INFO_STACK_TYPE_ZIGBEE_FFD                  0x30
+#define INFO_STACK_TYPE_ZIGBEE_RFD                  0x31
+#define INFO_STACK_TYPE_MAC                         0x40
 #define INFO_STACK_TYPE_BLE_THREAD_FTD_STATIC       0x50
 #define INFO_STACK_TYPE_BLE_THREAD_FTD_DYAMIC       0x51
 #define INFO_STACK_TYPE_802154_LLD_TESTS            0x60
@@ -945,7 +971,12 @@ extern "C" {
 #define INFO_STACK_TYPE_BLE_LLD_TESTS               0x63
 #define INFO_STACK_TYPE_BLE_RLV                     0x64
 #define INFO_STACK_TYPE_802154_RLV                  0x65
+#define INFO_STACK_TYPE_BLE_ZIGBEE_FFD_STATIC       0x70
+#define INFO_STACK_TYPE_BLE_ZIGBEE_RFD_STATIC       0x71
+#define INFO_STACK_TYPE_BLE_ZIGBEE_FFD_DYNAMIC      0x78
+#define INFO_STACK_TYPE_BLE_ZIGBEE_RFD_DYNAMIC      0x79
 #define INFO_STACK_TYPE_RLV                         0x80
+#define INFO_STACK_TYPE_BLE_MAC_STATIC              0x90
 
 typedef struct {
 /**
@@ -1119,7 +1150,7 @@ typedef struct {
   * @brief Starts the LLD tests CLI
   *
   * @param  param_size : Nb of bytes
-  * @param  p_param : pointer with data to give from M4 to M0
+  * @param  p_param : pointeur with data to give from M4 to M0
   * @retval Status
   */
   SHCI_CmdStatus_t SHCI_C2_LLDTESTS_Init( uint8_t param_size, uint8_t * p_param );
@@ -1129,11 +1160,20 @@ typedef struct {
   * @brief Starts the LLD tests BLE
   *
   * @param  param_size : Nb of bytes
-  * @param  p_param : pointer with data to give from M4 to M0
+  * @param  p_param : pointeur with data to give from M4 to M0
   * @retval Status
   */
   SHCI_CmdStatus_t SHCI_C2_BLE_LLD_Init( uint8_t param_size, uint8_t * p_param );
 
+    /**
+  * SHCI_C2_ZIGBEE_Init
+  * @brief Starts the Zigbee Stack
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_ZIGBEE_Init( void );
+
   /**
   * SHCI_C2_DEBUG_Init
   * @brief Starts the Traces
@@ -1208,6 +1248,16 @@ typedef struct {
   */
   SHCI_CmdStatus_t SHCI_C2_RADIO_AllowLowPower( SHCI_C2_FLASH_Ip_t Ip,uint8_t  FlagRadioLowPowerOn);
 
+
+  /**
+  * SHCI_C2_MAC_802_15_4_Init
+  * @brief Starts the MAC 802.15.4 on M0
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_MAC_802_15_4_Init( void );
+
   /**
    * SHCI_GetWirelessFwInfo
    * @brief This function read back the informations relative to the wireless binary loaded.

src/utility/STM32Cube_FW/shci.c

@@ -72,6 +72,8 @@ void shci_init(void(* UserEvtRx)(void* pData), void* pConf)
   shci_register_io_bus (&shciContext.io);
 
   TlInit((TL_CmdPacket_t *)(((SHCI_TL_HciInitConf_t *)pConf)->p_cmdbuffer));
+
+  return;
 }
 
 void shci_user_evt_proc(void)
@@ -127,6 +129,8 @@ void shci_user_evt_proc(void)
     shci_notify_asynch_evt((void*) &SHciAsynchEventQueue);
   }
 
+
+  return;
 }
 
 void shci_resume_flow( void )
@@ -138,6 +142,8 @@ void shci_resume_flow( void )
    * be called
    */
   shci_notify_asynch_evt((void*) &SHciAsynchEventQueue);
+
+  return;
 }
 
 void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payload, TL_EvtPacket_t * p_rsp )
@@ -160,6 +166,8 @@ void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payl
   memcpy( &(p_rsp->evtserial), pCmdBuffer, ((TL_EvtSerial_t*)pCmdBuffer)->evt.plen + TL_EVT_HDR_SIZE );
 
   Cmd_SetStatus(SHCI_TL_CmdAvailable);
+
+  return;
 }
 
 void shci_notify_asynch_evt(void *pdata)
@@ -198,6 +206,8 @@ static void TlInit( TL_CmdPacket_t * p_cmdbuffer )
     Conf.IoBusCallBackUserEvt = TlUserEvtReceived;
     shciContext.io.Init(&Conf);
   }
+
+  return;
 }
 
 static void Cmd_SetStatus(SHCI_TL_CmdStatus_t shcicmdstatus)
@@ -218,18 +228,24 @@ static void Cmd_SetStatus(SHCI_TL_CmdStatus_t shcicmdstatus)
       StatusNotCallBackFunction( SHCI_TL_CmdAvailable );
     }
   }
+
+  return;
 }
 
 static void TlCmdEvtReceived(TL_EvtPacket_t *shcievt)
 {
   (void)(shcievt);
   shci_cmd_resp_release(0); /**< Notify the application the Cmd response has been received */
+
+  return;
 }
 
 static void TlUserEvtReceived(TL_EvtPacket_t *shcievt)
 {
   LST_insert_tail(&SHciAsynchEventQueue, (tListNode *)shcievt);
   shci_notify_asynch_evt((void*) &SHciAsynchEventQueue); /**< Notify the application a full HCI event has been received */
+
+  return;
 }
 
 /* Weak implementation ----------------------------------------------------------------*/
@@ -241,12 +257,15 @@ __WEAK void shci_cmd_resp_wait(uint32_t timeout)
       break;
     }
   }
+  return;
 }
 
 __WEAK void shci_cmd_resp_release(uint32_t flag)
 {
   (void)flag;
 
   CmdRspStatusFlag = SHCI_TL_CMD_RESP_RELEASE;
+
+  return;
 }
 #endif /* STM32WBxx */

src/utility/STM32Cube_FW/shci.h

@@ -25,9 +25,19 @@
 extern "C" {
 #endif
 
-#define __ASM            __asm                                      /*!< asm keyword for GNU Compiler          */
-#define __INLINE         inline                                     /*!< inline keyword for GNU Compiler       */
-#define __STATIC_INLINE  static inline
+#if   defined ( __CC_ARM )||defined (__ARMCC_VERSION)
+ #define __ASM            __asm                                      /*!< asm keyword for ARM Compiler          */
+ #define __INLINE         __inline                                   /*!< inline keyword for ARM Compiler       */
+ #define __STATIC_INLINE  static __inline
+#elif defined ( __ICCARM__ )
+ #define __ASM            __asm                                      /*!< asm keyword for IAR Compiler          */
+ #define __INLINE         inline                                     /*!< inline keyword for IAR Compiler. Only available in High optimization mode! */
+ #define __STATIC_INLINE  static inline
+#elif defined ( __GNUC__ )
+ #define __ASM            __asm                                      /*!< asm keyword for GNU Compiler          */
+ #define __INLINE         inline                                     /*!< inline keyword for GNU Compiler       */
+ #define __STATIC_INLINE  static inline
+#endif
 
 #include <stdint.h>
 #include <string.h>
@@ -130,8 +140,29 @@ extern "C" {
 /* ----------------------------------- *
  *  Packed usage (compiler dependent)  *
  * ----------------------------------- */
+#undef PACKED__
 #undef PACKED_STRUCT
-#define PACKED_STRUCT struct __packed
+
+#if defined ( __CC_ARM )
+  #if defined ( __GNUC__ )
+    /* GNU extension */
+    #define PACKED__ __attribute__((packed))
+    #define PACKED_STRUCT struct PACKED__
+  #elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050U)
+    #define PACKED__ __attribute__((packed))
+    #define PACKED_STRUCT struct PACKED__
+  #else
+    #define PACKED__(TYPE) __packed TYPE
+    #define PACKED_STRUCT PACKED__(struct)
+  #endif
+#elif defined   ( __GNUC__ )
+  #define PACKED__ __attribute__((packed))
+  #define PACKED_STRUCT struct PACKED__
+#elif defined (__ICCARM__)
+  #define PACKED_STRUCT __packed struct
+#else
+  #define PACKED_STRUCT __packed struct
+#endif
 
 #ifdef __cplusplus
 }

src/utility/STM32Cube_FW/shci_tl.c

@@ -20,10 +20,12 @@
 /******************************************************************************
  * Include Files
  ******************************************************************************/
-#include "stm_list.h"
+#include "stdint.h"
 #include "cmsis_gcc.h"
 #include "stm32_wpan_common.h"
 
+#include "stm_list.h"
+
 /******************************************************************************
  * Function Definitions
  ******************************************************************************/
@@ -33,20 +35,20 @@ void LST_init_head (tListNode * listHead)
   listHead->prev = listHead;
 }
 
-bool LST_is_empty (tListNode * listHead)
+uint8_t LST_is_empty (tListNode * listHead)
 {
   uint32_t primask_bit;
-  bool return_value;
+  uint8_t return_value;
 
   primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
   __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
   if(listHead->next == listHead)
   {
-    return_value = true;
+    return_value = TRUE;
   }
   else
   {
-    return_value = false;
+    return_value = FALSE;
   }
   __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
 

src/utility/STM32Cube_FW/stm32_wpan_common.h

@@ -21,8 +21,6 @@
 #define _STM_LIST_H_
 
 /* Includes ------------------------------------------------------------------*/
-#include "stdint.h"
-#include "stdbool.h"
 #include "stm32_wpan_common.h"
 
 typedef PACKED_STRUCT _tListNode {
@@ -32,7 +30,7 @@ typedef PACKED_STRUCT _tListNode {
 
 void LST_init_head (tListNode * listHead);
 
-bool LST_is_empty (tListNode * listHead);
+uint8_t LST_is_empty (tListNode * listHead);
 
 void LST_insert_head (tListNode * listHead, tListNode * node);
 

src/utility/STM32Cube_FW/stm_list.c

@@ -205,6 +205,19 @@ typedef struct
   uint8_t *p_BleLldM0CmdBuffer;
 } TL_BLE_LLD_Config_t;
 
+typedef struct
+{
+  uint8_t *p_Mac_802_15_4_CmdRspBuffer;
+  uint8_t *p_Mac_802_15_4_NotAckBuffer;
+} TL_MAC_802_15_4_Config_t;
+
+typedef struct
+{
+  uint8_t *p_ZigbeeOtCmdRspBuffer;
+  uint8_t *p_ZigbeeNotAckBuffer;
+  uint8_t *p_ZigbeeNotifRequestBuffer;
+} TL_ZIGBEE_Config_t;
+
 /**
  * @brief Contain the BLE HCI Init Configuration
  * @{
@@ -228,6 +241,43 @@ typedef struct
   uint8_t *p_cmdbuffer;
 } TL_SYS_InitConf_t;
 
+/*****************************************************************************************
+ * Event type copied from ble_legacy.h
+ */
+
+typedef PACKED_STRUCT
+{
+  uint8_t type;
+  uint8_t data[1];
+} hci_uart_pckt;
+
+typedef PACKED_STRUCT
+{
+  uint8_t         evt;
+  uint8_t         plen;
+  uint8_t         data[1];
+} hci_event_pckt;
+
+typedef PACKED_STRUCT
+{
+  uint8_t         subevent;
+  uint8_t         data[1];
+} evt_le_meta_event;
+
+/**
+ * Vendor specific event for BLE core.
+ */
+typedef PACKED_STRUCT
+{
+  uint16_t ecode; /**< One of the BLE core event codes. */
+  uint8_t  data[1];
+} evt_blecore_aci;
+
+/* Bluetooth 48 bit address (in little-endian order).
+ */
+typedef	uint8_t	tBDAddr[6];
+
+
 /* Exported constants --------------------------------------------------------*/
 /* External variables --------------------------------------------------------*/
 /* Exported macros -----------------------------------------------------------*/
@@ -298,6 +348,26 @@ void TL_MM_EvtDone( TL_EvtPacket_t * hcievt );
 void TL_TRACES_Init( void );
 void TL_TRACES_EvtReceived( TL_EvtPacket_t * hcievt );
 
+/******************************************************************************
+ * MAC 802.15.4
+ ******************************************************************************/
+void TL_MAC_802_15_4_Init( TL_MAC_802_15_4_Config_t *p_Config );
+void TL_MAC_802_15_4_SendCmd( void );
+void TL_MAC_802_15_4_CmdEvtReceived( TL_EvtPacket_t * Otbuffer );
+void TL_MAC_802_15_4_NotReceived( TL_EvtPacket_t * Notbuffer );
+void TL_MAC_802_15_4_SendAck ( void );
+
+/******************************************************************************
+ * ZIGBEE
+ ******************************************************************************/
+void TL_ZIGBEE_Init( TL_ZIGBEE_Config_t *p_Config );
+void TL_ZIGBEE_SendM4RequestToM0( void );
+void TL_ZIGBEE_SendM4AckToM0Notify ( void );
+void TL_ZIGBEE_NotReceived( TL_EvtPacket_t * Notbuffer );
+void TL_ZIGBEE_CmdEvtReceived( TL_EvtPacket_t * Otbuffer );
+void TL_ZIGBEE_M0RequestReceived(TL_EvtPacket_t * Otbuffer );
+void TL_ZIGBEE_SendM4AckToM0Request(void);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

src/utility/STM32Cube_FW/stm_list.h

@@ -52,13 +52,16 @@ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_BleLldTable_t TL_BleLldTable;
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_SysTable_t TL_SysTable;
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_MemManagerTable_t TL_MemManagerTable;
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_TracesTable_t TL_TracesTable;
-
+#if 0
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_Mac_802_15_4_t TL_Mac_802_15_4_Table;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_ZigbeeTable_t TL_Zigbee_Table;
+#endif
 /**< tables */
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  FreeBufQueue;
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  TracesEvtQueue;
 PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t    CsBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + sizeof(TL_CsEvt_t)];
-PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static tListNode  EvtQueue;
-PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static tListNode  SystemEvtQueue;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  EvtQueue;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  SystemEvtQueue;
 
 
 static tListNode  LocalFreeBufQueue;
@@ -76,7 +79,7 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer);
 /* Public Functions Definition ------------------------------------------------------*/
 
 /******************************************************************************
- * GENERAL
+ * GENERAL - refer to AN5289 for functions description.
  ******************************************************************************/
 void TL_Enable( void )
 {
@@ -96,6 +99,11 @@ void TL_Init( void )
   TL_RefTable.p_sys_table = &TL_SysTable;
   TL_RefTable.p_mem_manager_table = &TL_MemManagerTable;
   TL_RefTable.p_traces_table = &TL_TracesTable;
+
+#if 0
+  TL_RefTable.p_mac_802_15_4_table = &TL_Mac_802_15_4_Table;
+  TL_RefTable.p_zigbee_table = &TL_Zigbee_Table;
+#endif
   HW_IPCC_Init();
 
   return;
@@ -449,6 +457,139 @@ void TL_BLE_LLD_SendRspAck( void )
 }
 #endif /* BLE_LLD_WB */
 
+#ifdef MAC_802_15_4_WB
+/******************************************************************************
+ * MAC 802.15.4
+ ******************************************************************************/
+void TL_MAC_802_15_4_Init( TL_MAC_802_15_4_Config_t *p_Config )
+{
+  MB_Mac_802_15_4_t  * p_mac_802_15_4_table;
+
+  p_mac_802_15_4_table = TL_RefTable.p_mac_802_15_4_table;
+
+  p_mac_802_15_4_table->p_cmdrsp_buffer = p_Config->p_Mac_802_15_4_CmdRspBuffer;
+  p_mac_802_15_4_table->p_notack_buffer = p_Config->p_Mac_802_15_4_NotAckBuffer;
+
+  HW_IPCC_MAC_802_15_4_Init();
+
+  return;
+}
+
+void TL_MAC_802_15_4_SendCmd( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_mac_802_15_4_table->p_cmdrsp_buffer))->cmdserial.type = TL_OTCMD_PKT_TYPE;
+
+  HW_IPCC_MAC_802_15_4_SendCmd();
+
+  return;
+}
+
+void TL_MAC_802_15_4_SendAck ( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_mac_802_15_4_table->p_notack_buffer))->cmdserial.type = TL_OTACK_PKT_TYPE;
+
+  HW_IPCC_MAC_802_15_4_SendAck();
+
+  return;
+}
+
+void HW_IPCC_MAC_802_15_4_CmdEvtNot(void)
+{
+  TL_MAC_802_15_4_CmdEvtReceived( (TL_EvtPacket_t*)(TL_RefTable.p_mac_802_15_4_table->p_cmdrsp_buffer) );
+
+  return;
+}
+
+void HW_IPCC_MAC_802_15_4_EvtNot( void )
+{
+  TL_MAC_802_15_4_NotReceived( (TL_EvtPacket_t*)(TL_RefTable.p_mac_802_15_4_table->p_notack_buffer) );
+
+  return;
+}
+
+__WEAK void TL_MAC_802_15_4_CmdEvtReceived( TL_EvtPacket_t * Otbuffer  ){};
+__WEAK void TL_MAC_802_15_4_NotReceived( TL_EvtPacket_t * Notbuffer ){};
+#endif
+
+#ifdef ZIGBEE_WB
+/******************************************************************************
+ * ZIGBEE
+ ******************************************************************************/
+void TL_ZIGBEE_Init( TL_ZIGBEE_Config_t *p_Config )
+{
+  MB_ZigbeeTable_t  * p_zigbee_table;
+
+  p_zigbee_table = TL_RefTable.p_zigbee_table;
+  p_zigbee_table->appliCmdM4toM0_buffer = p_Config->p_ZigbeeOtCmdRspBuffer;
+  p_zigbee_table->notifM0toM4_buffer = p_Config->p_ZigbeeNotAckBuffer;
+  p_zigbee_table->requestM0toM4_buffer = p_Config->p_ZigbeeNotifRequestBuffer;
+
+  HW_IPCC_ZIGBEE_Init();
+
+  return;
+}
+
+/* Zigbee M4 to M0 Request */
+void TL_ZIGBEE_SendM4RequestToM0( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_zigbee_table->appliCmdM4toM0_buffer))->cmdserial.type = TL_OTCMD_PKT_TYPE;
+
+  HW_IPCC_ZIGBEE_SendM4RequestToM0();
+
+  return;
+}
+
+/* Used to receive an ACK from the M0 */
+void HW_IPCC_ZIGBEE_RecvAppliAckFromM0(void)
+{
+  TL_ZIGBEE_CmdEvtReceived( (TL_EvtPacket_t*)(TL_RefTable.p_zigbee_table->appliCmdM4toM0_buffer) );
+
+  return;
+}
+
+/* Zigbee notification from M0 to M4 */
+void HW_IPCC_ZIGBEE_RecvM0NotifyToM4( void )
+{
+  TL_ZIGBEE_NotReceived( (TL_EvtPacket_t*)(TL_RefTable.p_zigbee_table->notifM0toM4_buffer) );
+
+  return;
+}
+
+/* Send an ACK to the M0 for a Notification */
+void TL_ZIGBEE_SendM4AckToM0Notify ( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_zigbee_table->notifM0toM4_buffer))->cmdserial.type = TL_OTACK_PKT_TYPE;
+
+  HW_IPCC_ZIGBEE_SendM4AckToM0Notify();
+
+  return;
+}
+
+/* Zigbee M0 to M4 Request */
+void HW_IPCC_ZIGBEE_RecvM0RequestToM4( void )
+{
+  TL_ZIGBEE_M0RequestReceived( (TL_EvtPacket_t*)(TL_RefTable.p_zigbee_table->requestM0toM4_buffer) );
+
+  return;
+}
+
+/* Send an ACK to the M0 for a Request */
+void TL_ZIGBEE_SendM4AckToM0Request(void)
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_zigbee_table->requestM0toM4_buffer))->cmdserial.type = TL_OTACK_PKT_TYPE;
+
+  HW_IPCC_ZIGBEE_SendM4AckToM0Request();
+
+  return;
+}
+
+
+__WEAK void TL_ZIGBEE_CmdEvtReceived( TL_EvtPacket_t * Otbuffer  ){};
+__WEAK void TL_ZIGBEE_NotReceived( TL_EvtPacket_t * Notbuffer ){};
+#endif
+
+
+
 /******************************************************************************
  * MEMORY MANAGER
  ******************************************************************************/