Merge pull request #14626 from jeromecoutant/DEV_STM32WB_1_11_1

STM32WB update drivers version to CUBE V1.11.1

Author: 0xc0170

connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/ble_bufsize.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
  * @file    ble_bufsize.h
- * @author  MCD Application Team
+ * @author  MCD
  * @brief   Definition of BLE stack buffers size
  *****************************************************************************
   * @attention
@@ -25,11 +25,6 @@
  */
 #define BLE_DEFAULT_ATT_MTU                  23
 
-/*
- * BLE_DEFAULT_MAX_ATT_MTU: maximum supported ATT MTU size.
- */
-#define BLE_DEFAULT_MAX_ATT_MTU             158
-
 /*
  * BLE_DEFAULT_MAX_ATT_SIZE: maximum attribute size.
  */
@@ -81,13 +76,6 @@
           ((pw) + MAX(BLE_MEM_BLOCK_X_MTU(mtu, n_link), \
                       BLE_MBLOCKS_SECURE_CONNECTIONS))
 
-/*
- * BLE_DEFAULT_MBLOCKS_COUNT: default memory blocks count
- */
-#define BLE_DEFAULT_MBLOCKS_COUNT(n_link) \
-          BLE_MBLOCKS_CALC(BLE_DEFAULT_PREP_WRITE_LIST_SIZE, \
-                           BLE_DEFAULT_MAX_ATT_MTU, n_link)
-
 /*
  * BLE_FIXED_BUFFER_SIZE_BYTES:
  * A part of the RAM, is dinamically allocated by initilizing all the pointers 
@@ -102,31 +90,39 @@
  * - a part, that may be considered "fixed", i.e. independent from the above
  *   mentioned parameters.
 */
-#if (SLAVE_ONLY == 0) && (LL_ONLY == 0)
-#define BLE_FIXED_BUFFER_SIZE_BYTES  6960   /* Full stack */
-#elif SLAVE_ONLY == 0
-#define BLE_FIXED_BUFFER_SIZE_BYTES  6256   /* LL only */
+#if (BEACON_ONLY != 0)
+#define BLE_FIXED_BUFFER_SIZE_BYTES  6212   /* Beacon only */
+#elif (LL_ONLY != 0)
+#define BLE_FIXED_BUFFER_SIZE_BYTES  6272   /* LL only */
+#elif (SLAVE_ONLY != 0)
+#define BLE_FIXED_BUFFER_SIZE_BYTES  6712   /* Peripheral only */
+#elif (BASIC_FEATURES != 0)
+#define BLE_FIXED_BUFFER_SIZE_BYTES  6972   /* Basic Features */
 #else
-#define BLE_FIXED_BUFFER_SIZE_BYTES  6696   /* Slave only */
+#define BLE_FIXED_BUFFER_SIZE_BYTES  7240   /* Full stack */
 #endif
 
 /*
  * BLE_PER_LINK_SIZE_BYTES: additional memory size used per link
  */
-#if (SLAVE_ONLY == 0) && (LL_ONLY == 0)
-#define BLE_PER_LINK_SIZE_BYTES       380   /* Full stack */
-#elif SLAVE_ONLY == 0
+#if (BEACON_ONLY != 0)
+#define BLE_PER_LINK_SIZE_BYTES       148   /* Beacon only */
+#elif (LL_ONLY != 0)
 #define BLE_PER_LINK_SIZE_BYTES       196   /* LL only */
+#elif (SLAVE_ONLY != 0)
+#define BLE_PER_LINK_SIZE_BYTES       332   /* Peripheral only */
+#elif (BASIC_FEATURES != 0)
+#define BLE_PER_LINK_SIZE_BYTES       332   /* Basic Features */
 #else
-#define BLE_PER_LINK_SIZE_BYTES       332   /* Slave only */
+#define BLE_PER_LINK_SIZE_BYTES       384   /* Full stack */
 #endif
 
 /*
  * BLE_TOTAL_BUFFER_SIZE: this macro returns the amount of memory, in bytes,
  * needed for the storage of data structures (except GATT database elements)
  * whose size depends on the number of supported connections.
  *
- * @param num_links: Maximum number of simultaneous connections that the device
+ * @param n_link: Maximum number of simultaneous connections that the device
  * will support. Valid values are from 1 to 8.
  *
  * @param mblocks_count: Number of memory blocks allocated for packets.
@@ -158,4 +154,4 @@
            (40 * (num_gatt_attributes)) + (48 * (num_gatt_services)))
 
 
-#endif /* ! BLE_BUFSIZE_H__ */
+#endif /* BLE_BUFSIZE_H__ */

connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/mbox_def.h

@@ -104,7 +104,7 @@ extern "C" {
   {
     uint8_t   *cmdrsp_buffer;
     uint8_t   *m0cmd_buffer;
-  } MB_LldBleTable_t;
+  } MB_BleLldTable_t;
 
   typedef struct
   {
@@ -157,9 +157,32 @@ extern "C" {
     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_LldBleTable_t        *p_lld_ble_table;
+    MB_BleLldTable_t        *p_ble_lld_table;
 } MB_RefTable_t;
 
+/**
+ * This table shall be used only in the case the CPU2 runs the FUS.
+ * It is used by the command SHCI_GetWirelessFwInfo()
+ */
+typedef struct
+{
+  uint32_t  DeviceInfoTableState;
+  uint8_t   Reserved1;
+  uint8_t   LastFusActiveState;
+  uint8_t   LastWirelessStackState;
+  uint8_t   CurrentWirelessStackType;
+  uint32_t  SafeBootVersion;
+  uint32_t  FusVersion;
+  uint32_t  FusMemorySize;
+  uint32_t  WirelessStackVersion;
+  uint32_t  WirelessStackMemorySize;
+  uint32_t  WirelessFirmwareBleInfo;
+  uint32_t  WirelessFirmwareThreadInfo;
+  uint32_t  Reserved2;
+  uint64_t  UID64;
+  uint16_t  DeviceId;
+} MB_FUS_DeviceInfoTable_t ;
+
 #ifdef __cplusplus
 }
 #endif
@@ -201,12 +224,12 @@ extern "C" {
  *   |                                                 |
  *   |<---HW_IPCC_BLE_EVENT_CHANNEL--------------------|
  *   |                                                 |
- *   |             (LLD BLE)                           |
- *   |----HW_IPCC_LLD_BLE_CMD_CHANNEL----------------->|
+ *   |             (BLE LLD)                           |
+ *   |----HW_IPCC_BLE_LLD_CMD_CHANNEL----------------->|
  *   |                                                 |
- *   |<---HW_IPCC_LLD_BLE_RSP_CHANNEL------------------|
+ *   |<---HW_IPCC_BLE_LLD_RSP_CHANNEL------------------|
  *   |                                                 |
- *   |<---HW_IPCC_LLD_BLE_M0_CMD_CHANNEL---------------|
+ *   |<---HW_IPCC_BLE_LLD_M0_CMD_CHANNEL---------------|
  *   |                                                 |
  *   |             (MAC)                               |
  *   |----HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL-------->|
@@ -235,8 +258,8 @@ extern "C" {
 #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
-#define HW_IPCC_LLD_BLE_CLI_CMD_CHANNEL                 LL_IPCC_CHANNEL_5
-#define HW_IPCC_LLD_BLE_CMD_CHANNEL                     LL_IPCC_CHANNEL_5
+#define HW_IPCC_BLE_LLD_CLI_CMD_CHANNEL                 LL_IPCC_CHANNEL_5
+#define HW_IPCC_BLE_LLD_CMD_CHANNEL                     LL_IPCC_CHANNEL_5
 #define HW_IPCC_HCI_ACL_DATA_CHANNEL                    LL_IPCC_CHANNEL_6
 
 /** CPU2 */
@@ -246,12 +269,12 @@ extern "C" {
 #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_LLD_BLE_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_LLD_BLE_CLI_RSP_CHANNEL                 LL_IPCC_CHANNEL_5
-#define HW_IPCC_LLD_BLE_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 */