lib: stm32wba: Update Link Layer and LE integration on STM32WBA

Update Link Layer and LE porting header files to be aligned
on STM32Cube_FW_WBA Release 1.6.0

Signed-off-by: Vincent Tardy <[email protected]>

Author: vtardy-st

lib/stm32wba/Common/WPAN/Modules/scm.h

@@ -1,4 +1,3 @@
-/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    scm.h
@@ -16,7 +15,6 @@
   *
   ******************************************************************************
   */
-/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef SCM_H
@@ -56,9 +54,6 @@ typedef enum {
   SCM_USER_APP,
   SCM_USER_LL_FW,
   SCM_USER_LL_HW_RCO_CLBR,
-  /* USER CODE BEGIN SCM_USER */
-
-  /* USER CODE END SCM_USER */
   TOTAL_CLIENT_NUM, /* To be at the end of the enum */
 } scm_user_id_t;
 

lib/stm32wba/Common/WPAN/Modules/stm_list.h

@@ -1,4 +1,3 @@
-/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm_list.h
@@ -16,7 +15,6 @@
   *
   ******************************************************************************
   */
-/* USER CODE END Header */
 
 #ifndef STM_LIST_H
 #define STM_LIST_H

lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/config/ble_full/ll_fw_config.h

@@ -8,22 +8,21 @@
  * Synopsys MIT License:
  * Copyright (c) 2020-Present Synopsys, Inc
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of the software and
- * associated documentation files (the “Software”), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all copies or substantial
- * portions of the Software.
- * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * the Software), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
  * THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING, BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE
- * ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
+ * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE ARISING FROM,
+ * OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * */
 #ifndef INCLUDE_LL_FW_CONFIG_H

lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/_40nm_reg_files/DWC_ble154combo.h

@@ -9,22 +9,21 @@
  * Synopsys MIT License:
  * Copyright (c) 2020-Present Synopsys, Inc
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of the software and
- * associated documentation files (the “Software”), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all copies or substantial
- * portions of the Software.
- * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * the Software), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
  * THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING, BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE
- * ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
+ * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE ARISING FROM,
+ * OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * */
 

lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/bsp.h

@@ -1,4 +1,4 @@
-/*$Id: //dwh/bluetooth/DWC_ble154combo/firmware/rel/1.32a-lca02/firmware/public_inc/bsp.h#2 $*/
+/*$Id: //dwh/bluetooth/DWC_ble154combo/firmware/rel/2.00a-lca01/firmware/public_inc/bsp.h#1 $*/
 
 /**
  ********************************************************************************
@@ -9,22 +9,21 @@
  * Synopsys MIT License:
  * Copyright (c) 2020-Present Synopsys, Inc
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of the software and
- * associated documentation files (the “Software”), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all copies or substantial
- * portions of the Software.
- * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * the Software), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
  * THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING, BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE
- * ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
+ * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE ARISING FROM,
+ * OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * */
 
@@ -39,7 +38,7 @@
 #define PRIORITY_LEVEL_MASK 0x0F
 
 /**
- * This macros specify the different combinations that can be used to enable or disable
+ * This macros specify the different combinations that can be used to enable or disable 
  * a specific ISR
  */
 
@@ -280,6 +279,7 @@ typedef enum Debug_GPIO_e{
 	DBG_IO_ED_TMR_HNDL                                          ,
 	DBG_IO_OS_TMR_EVNT_CBK                                      ,
 	DBG_IO_PROFILE_MARKER_PHY_WAKEUP_TIME                       ,
+	DBG_IO_PROFILE_MARKER_BLOCKING_PHY_WAKEUP_TIME              ,
 	DBG_IO_PROFILE_END_DRIFT_TIME                               ,
 	DBG_IO_PROC_RADIO_RCV										,
 	DBG_IO_EVNT_TIME_UPDT										,
@@ -513,7 +513,7 @@ void bsp_mcu_slp(void);
  * @retval None.
  */
 
-void bsp_gpio_clear(uint8_t gpio_num);
+void bsp_gpio_clear(uint8_t gpio_num);   
 
 
 /**
@@ -523,7 +523,7 @@ void bsp_gpio_clear(uint8_t gpio_num);
  *
  * @retval None.
  */
-void bsp_gpio_set(uint8_t gpio_num);
+void bsp_gpio_set(uint8_t gpio_num);   
 
 
 /**
@@ -591,7 +591,7 @@ void bsp_switch_to_lw_isr(uint8_t priority);
 void bsp_wait_for_busclkrdy(void);
 /**
  * @brief used to start temperature calculations
- * if the upper layer has informed the link layer by the existence of temperature sensor through @ref ll_intf_set_temperature_sensor_stat() or llhwc_cmn_set_temperature_sensor_stat()  .
+ * if the upper layer has informed the link layer by the existence of temperature sensor through @ref ll_intf_set_temperature_sensor_stat() or llhwc_cmn_set_temperature_sensor_stat()  . 
  * New temperature will be requested in the following cases:
  * 1- at initialization when the @ref ll_intf_set_temperature_sensor_state or llhwc_cmn_set_temperature_sensor_stat is called
  * 2- before any radio event

lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/common_types.h

@@ -1,4 +1,4 @@
-/*$Id: //dwh/bluetooth/DWC_ble154combo/firmware/rel/1.32a-lca02/firmware/public_inc/common_types.h#3 $*/
+/*$Id: //dwh/bluetooth/DWC_ble154combo/firmware/rel/2.00a-lca01/firmware/public_inc/common_types.h#1 $*/
 /**
  ********************************************************************************
  * @file    common_types.h
@@ -8,22 +8,21 @@
  * Synopsys MIT License:
  * Copyright (c) 2020-Present Synopsys, Inc
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of the software and
- * associated documentation files (the “Software”), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all copies or substantial
- * portions of the Software.
- * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * the Software), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
  * THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING, BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE
- * ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
+ * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE ARISING FROM,
+ * OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * */
 
@@ -101,10 +100,6 @@
 /****************** User configuration **********************************/
 #define CS_TESTING TRUE
 
-#ifndef SUPPORT_GNRC_SCHDLR_IF
-#define SUPPORT_GNRC_SCHDLR_IF                      1 /* Enable\Disable event EXTRNL_GNRC in Ble event manager. Enable:1 - Disable:0 */
-#endif /* SUPPORT_GNRC_SCHDLR_IF */
-
 /********************* Macros **********************************/
 
 #ifndef SUCCESS
@@ -192,6 +187,10 @@ typedef enum {
 	LE_2M 					= 0x02,
 	LE_CODED_S8				= 0x03,
 	LE_CODED 				= 0x04,
+/*===============  Channel Sounding  ===============*/
+#if (SUPPORT_CHANNEL_SOUNDING &&( SUPPORT_MASTER_CONNECTION || SUPPORT_SLAVE_CONNECTION))
+	LE_2M_2BT				= 0x08,
+#endif /*SUPPORT_CHANNEL_SOUNDING &&( SUPPORT_MASTER_CONNECTION || SUPPORT_SLAVE_CONNECTION)*/
 #if (SUPPORT_LE_POWER_CONTROL)
 	LE_PHY_UNDEFINED		= 0xFC,
 	NEW_PHY_CODED_S2		= 0xFD,
@@ -216,6 +215,7 @@ typedef struct time_st {
 	uint16_t time_stamp_fine;
 	uint8_t  overflow_flag;
 } ble_time_t, *ble_time_p;
+
 typedef enum dpslp_state {
 	DEEP_SLEEP_ENABLE  = 0x01,
 	DEEP_SLEEP_DISABLE = 0x00
@@ -309,8 +309,8 @@ typedef enum ant_intrv_type_enum {
  * @brief structure that hold antenna diversity parameters information.
  */
 typedef struct _antenna_diversity_st{
-	ant_intrv_type_enum_t ant_intrv_type;                /* antenna interval type: FIXED_TIME(us) or PACKETS_NUMBER(n) */
-	uint32_t ant_intrv_value;                            /* antenna interval value based on type; us for FIXED_TIME, n for PACKETS_NUMBER */
+	ant_intrv_type_enum_t ant_intrv_type;                /* antenna interval type: FIXED_TIME(us) or PACKETS_NUMBER(n) */ 
+	uint32_t ant_intrv_value;                            /* antenna interval value based on type; us for FIXED_TIME, n for PACKETS_NUMBER */ 
 	uint16_t wntd_coord_shrt_addr;	                     /* wanted coordinator/router short address */
 	uint8_t wntd_coord_ext_addr[EXT_ADDRESS_LENGTH];	 /* wanted coordinator/router extended address */
 	uint8_t max_rx_ack_retries;                          /* max number of retries to receive ack in case of ack error reception*/
@@ -391,7 +391,7 @@ typedef enum {
 	HCI_ACL_DATA_PCKT = 0x02,
 	HCI_EVNT_PCKT = 0x04,
 	HCI_ISO_DATA_PCKT = 0x05,
-
+	
 
 #if (SUPPORT_MAC && SUPPORT_MAC_HCI_UART)
 	HCI_MAC_REQ = 0x0A,
@@ -445,7 +445,9 @@ typedef enum {
 /**
  * The default PHY periodic calibration period in second. this Macro can be set to any value , Zero means that phy periodic calibration is disabled
  */
+#ifndef DEFAULT_PHY_CALIBRATION_PERIOD
 #define DEFAULT_PHY_CALIBRATION_PERIOD        		10	/* Time period for PHY calibration = 10s */
+#endif /* DEFAULT_PHY_CALIBRATION_PERIOD */
 
 #if defined(PHY_40nm_3_00_a) || defined(PHY_40nm_3_40_a)
 #define SUPPORT_MAC_PHY_CONT_TESTING_CMDS 1
@@ -459,8 +461,9 @@ typedef enum {
 #ifndef EXTERNAL_CUSTOM_CMDS
 #define EXTERNAL_CUSTOM_CMDS						0	/* Indicates that an external custom HCI commands module exists */
 #endif /* EXTERNAL_CUSTOM_CMDS */
+#ifndef SUPPORT_ZIGBEE_PHY_CERTIFICATION
 #define SUPPORT_ZIGBEE_PHY_CERTIFICATION   0  /* 0 disable , 1 enable .. used to enable support of hci command required to implement zigbee phy Test cases*/
-
+#endif /* SUPPORT_ZIGBEE_PHY_CERTIFICATION */
 
 #if (!USE_HCI_TRANSPORT) && (SUPPORT_BLE)						  /* SUPPORT_HCI_EVENT_ONLY cannot be supported with default HCI_transport */
 /* if this marco is enabled it will enable  the below features
@@ -476,7 +479,9 @@ typedef enum {
 #define SUPPORT_HCI_EVENT_ONLY_TESTING				0
 #endif /* SUPPORT_HCI_EVENT_ONLY_TESTING */
 
+#ifndef SUPPORT_HW_AUDIO_SYNC_SIGNAL
 #define SUPPORT_HW_AUDIO_SYNC_SIGNAL       0
+#endif /* SUPPORT_HW_AUDIO_SYNC_SIGNAL */
 
 #if SUPPORT_LE_PAWR_SYNC_ROLE
 #define SUPPORT_PAWR_CUSTOM_SYNC			1
@@ -491,9 +496,13 @@ typedef enum {
 
 
 
+#ifndef SUPPORT_TIM_UPDT
 #define SUPPORT_TIM_UPDT					1
+#endif /* SUPPORT_TIM_UPDT */
 
+#ifndef SUPPORT_RX_DTP_CONTROL
 #define SUPPORT_RX_DTP_CONTROL				1 /* Enable\Disable ACL Rx data throughput feature */
+#endif /* SUPPORT_RX_DTP_CONTROL */
 
 #ifndef SUPPORT_CUSTOM_ADV_SCAN_TESTING
 #define SUPPORT_CUSTOM_ADV_SCAN_TESTING		0
@@ -508,4 +517,67 @@ typedef enum {
 #endif /* SUPPORT_EXT_FEATURE_SET */
 
 
+#ifndef SUPPORT_CONFIGURABLE_GAIN_FIX
+#define SUPPORT_CONFIGURABLE_GAIN_FIX				0 /* Enable\Disable configurable gain fix support */
+#endif /* SUPPORT_CONFIGURABLE_GAIN_FIX */
+
+#if SUPPORT_CONFIGURABLE_GAIN_FIX
+#define PREEMPH_GAIN_COEFF_STEP_SIZE				10 			/* percentage margin of single step */
+#define GAIN_FIX_WAKEUP_TIME_OVERHEAD				4 			/* in sleep timer units, the added time overhead from patching all pre-emphasis coefficients */
+#else
+#define GAIN_FIX_WAKEUP_TIME_OVERHEAD				0
+#endif /* SUPPORT_CONFIGURABLE_GAIN_FIX */
+
+#ifndef SUPPORT_PHY_SHUTDOWN_MODE
+#if defined(PHY_40nm_3_60_a_tc) || defined(PHY_40nm_3_00_a) || defined(PHY_40nm_3_40_a)
+#define SUPPORT_PHY_SHUTDOWN_MODE					1 /* Enable\Disable phpy shutdown mode support */
+#else
+#define SUPPORT_PHY_SHUTDOWN_MODE					0
+#endif /* defined(PHY_40nm_3_60_a_tc) || defined(PHY_40nm_3_00_a) || defined(PHY_40nm_3_40_a) */
+#endif /* SUPPORT_PHY_SHUTDOWN_MODE */
+
+#if SUPPORT_PHY_SHUTDOWN_MODE
+#define PHY_SHUTDOWN_WAKEUP_TIME_OVERHEAD			2 			/* in sleep timer units, the added time overhead from executing override seqeuences needed in phy shutdown mode */
+#else
+#define PHY_SHUTDOWN_WAKEUP_TIME_OVERHEAD			0
+#endif /* SUPPORT_PHY_SHUTDOWN_MODE */
+
+#ifndef SUPPORT_GNRC_SCHDLR_IF
+#define SUPPORT_GNRC_SCHDLR_IF				1
+#endif
+#ifndef NEAR_AUX_AFTER_EXT_SLEEP_TIMER_SCHEDULING
+#define NEAR_AUX_AFTER_EXT_SLEEP_TIMER_SCHEDULING 	0
+#endif /* NEAR_AUX_AFTER_EXT_SLEEP_TIMER_SCHEDULING */
+
+#if (SUPPORT_CHANNEL_SOUNDING &&( SUPPORT_MASTER_CONNECTION || SUPPORT_SLAVE_CONNECTION))
+/**
+ * @brief holds the possible values for cs roles
+ */
+typedef enum _cs_role_e
+{
+	CS_ROLE_INITIATOR,
+	CS_ROLE_REFLECTOR
+} cs_role_e;
+
+/**
+ * @brief holds the possible values for cs step mode types
+ */
+typedef enum _cs_step_mode_type_e
+{
+	CS_STEP_MODE_0,
+	CS_STEP_MODE_1,
+	CS_STEP_MODE_2,
+	CS_STEP_MODE_3,
+	CS_STEP_MODE_NONE = 0xFF
+} cs_step_mode_type_e;
+
+/**
+ * @brief cs host buffer structure
+ */
+typedef struct _cs_host_buffer {
+	uint8_t buffer[257]; /*CS_HOST_BUFFER_DATA_MAX (255) + HCI_EVENT_HEADER_LEN(2)*/
+}cs_host_buffer;
+
+#endif /*SUPPORT_CHANNEL_SOUNDING &&( SUPPORT_MASTER_CONNECTION || SUPPORT_SLAVE_CONNECTION)*/
+
 #endif /*COMMON_TYPES_H_*/