lib/stm32wb: hci: Update lib to V1.7.0 Cube version (c8ee9417) · Commits · Wenxi XU / Hal Stm32

lib/stm32wb/hci/app_common.h

+27 −31

Original line number	Diff line number	Diff line
		/**
		******************************************************************************
		* @file app_common.h
		* @author MCD Application Team
		* @brief Common
		* File Name : app_common.h
		* Description : App Common application configuration file for STM32WPAN Middleware.
		*
		******************************************************************************
		* @attention
		*
		@@ -17,14 +17,12 @@
		******************************************************************************
		*/


		/* Define to prevent recursive inclusion -------------------------------------*/
		#ifndef __APP_COMMON_H
		#define __APP_COMMON_H
		#ifndef APP_COMMON_H
		#define APP_COMMON_H

		#ifdef __cplusplus
		extern "C"
		{
		extern "C"{
		#endif

		#include <stdint.h>
		@@ -79,9 +77,8 @@ extern "C"

		#define MODSUB( a, b, m ) MODADD( a, (m)-(b), m )


		#define PAUSE( t ) M_BEGIN \
		volatile int _i; \
		__IO int _i; \
		for ( _i = t; _i > 0; _i -- ); \
		M_END

		@@ -108,11 +105,10 @@ extern "C"
		#define ALIGN(n) __attribute__((aligned(n)))
		#endif


		#ifdef __cplusplus
		}
		} /* extern "C" */
		#endif

		#endif /__APP_COMMON_H /
		#endif /APP_COMMON_H /

		/********************** (C) COPYRIGHT STMicroelectronics *END OF FILE**/

lib/stm32wb/hci/app_conf.h

+103 −54

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@


		/* Define to prevent recursive inclusion -------------------------------------*/
		#ifndef __APP_CONFIG_H
		#define __APP_CONFIG_H
		#ifndef __APP_CONF_H
		#define __APP_CONF_H

		#include "hw.h"
		/* hw_conf.h file is not used, remove the dependency */
		@@ -28,7 +28,7 @@
		#include "hw_if.h"

		/******************************************************************************
		* OTA Application Config
		* Data Throughput Application Config
		******************************************************************************/

		/< generic parameters ****************************************************/
		@@ -75,6 +75,27 @@

		#define CFG_MITM_PROTECTION CFG_MITM_PROTECTION_REQUIRED

		/**
		* Generic Access Appearance
		*/
		#define CFG_UNKNOWN_APPEARANCE (0)
		#define CFG_GAP_APPEARANCE (832)

		/**
		* Define PHY
		*/
		#define ALL_PHYS_PREFERENCE 0x00
		#define RX_2M_PREFERRED 0x02
		#define TX_2M_PREFERRED 0x02
		#define RX_1M_PREFERRED 0x01
		#define TX_1M_PREFERRED 0x01
		#define RX_ALL_PHY_PREFERRED 0x03
		#define TX_ALL_PHY_PREFERRED 0x03
		#define TX_1M 0x01
		#define TX_2M 0x02
		#define RX_1M 0x01
		#define RX_2M 0x02

		/**
		* Identity root key used to derive LTK and CSRK
		*/
		@@ -94,66 +115,81 @@
		#define CFG_USE_SMPS 1
		/* USER CODE END Generic_Parameters */


		/*< specific parameters /
		/*****************************************************/
		#ifdef LITTLE_DORY
		#define PUSH_BUTTON_SW1_EXTI_IRQHandler EXTI0_IRQHandler
		#else
		#define PUSH_BUTTON_SW1_EXTI_IRQHandler EXTI4_IRQHandler
		#endif

		/******************************************************************************
		* Information Table
		*
		* Version
		* [0:3] = Build - 0: Untracked - 15:Released - x: Tracked version
		* [4:7] = branch - 0: Mass Market - x: ...
		* [8:15] = Subversion
		* [16:23] = Version minor
		* [24:31] = Version major
		*
		******************************************************************************/
		#define CFG_FW_MAJOR_VERSION (0)
		#define CFG_FW_MINOR_VERSION (0)
		#define CFG_FW_SUBVERSION (1)
		#define CFG_FW_BRANCH (0)
		#define CFG_FW_BUILD (0)
		/< specific parameters ******************************************************/
		/**
		* Encryption enable when set to 1
		* Encryption disabe when set to 0
		*/
		#define CFG_ENCRYPTION_ENABLE 0

		/**
		* AD Element - DEV ID
		* Define the different role supported
		* In this application
		* When set to 1, the device is central
		* When set to 0, the device is peripheral
		*/
		#define CFG_DEV_ID_P2P_SERVER1 (0x83)
		#define CFG_DEV_ID_P2P_SERVER2 (0x84)
		#define CFG_DEV_ID_P2P_ROUTER (0x85)
		#define CFG_DEV_ID_OTA_FW_UPDATE (0x86)
		#define CFG_BLE_CENTRAL 1

		#define CFG_SERVER_ONLY 0
		/**
		* AD Element - Group B Feature
		* in this specific application, the device is either central
		* or peripheral but cannot be both
		*/
		/* LSB - Firt Byte */
		#define CFG_FEATURE_OTA_SW (0x08)
		#undef CFG_ADV_BD_ADDRESS
		#if (CFG_BLE_CENTRAL != 0 )
		#define CFG_BLE_PERIPHERAL 0
		#define CFG_ADV_BD_ADDRESS 0xFFEEDDCCBBAA
		#else
		#define CFG_ADV_BD_ADDRESS 0x222222333333
		#define CFG_BLE_PERIPHERAL 1
		#endif

		#define PUSH_BUTTON_SW1_EXTI_IRQHandler EXTI4_IRQHandler
		#define PUSH_BUTTON_SW2_EXTI_IRQHandler EXTI0_IRQHandler

		#define CONN_L(x) ((int)(((float)x)/0.625f))
		#define CONN_P(x) ((int)(((float)x)/1.25f))
		#define SCAN_P (0x320)
		#define SCAN_L (0x320)

		#define CFG_DEV_ID_PERIPH_SERVER (0x88)
		#define CFG_FEATURE_DT (0x70)

		#define UUID_128BIT_FORMAT 1

		#define MAX_HCI_CMD_EVENT_PAYLOAD_SIZE 255
		#define DATA_NOTIFICATION_MAX_PACKET_SIZE 240

		#define CFG_MAX_CONNECTION 1

		/**
		* Define the start address where the application shall be located
		* TX PHY configuration
		* It shall be set to
		* 0 if ignored
		* 1 if 1M
		* 2 if 2M
		* 4 if LE_CODED
		* or any combination of 1M \| 2M \| LE_CODED
		*/
		#define CFG_APP_START_SECTOR_INDEX (7)
		#define CFG_TX_PHY 1

		/**
		* Define list of reboot reason
		* RX PHY configuration
		* It shall be set to
		* 0 if ignored
		* 1 if 1M
		* 2 if 2M
		* 4 if LE_CODED
		* or any combination of 1M \| 2M \| LE_CODED
		*/
		#define CFG_REBOOT_ON_FW_APP (0x00)
		#define CFG_REBOOT_ON_BLE_OTA_APP (0x01)
		#define CFG_REBOOT_ON_CPU2_UPGRADE (0x02)
		#define CFG_RX_PHY 1

		/**
		* Define mapping of OTA messages in SRAM
		* ALL PHYS configuration
		*/
		#define CFG_OTA_REBOOT_VAL_MSG ((uint8_t)(SRAM1_BASE+0))
		#define CFG_OTA_START_SECTOR_IDX_VAL_MSG ((uint8_t)(SRAM1_BASE+1))
		#define CFG_OTA_NBR_OF_SECTOR_VAL_MSG ((uint8_t)(SRAM1_BASE+2))

		#define CFG_ALL_PHYS ((!CFG_TX_PHY) + ((!CFG_RX_PHY)*2))
		#define L2CAP_SLAVE_LATENCY 0x0000
		#define L2CAP_TIMEOUT_MULTIPLIER 0x1F4
		/******************************************************************************
		* BLE Stack
		******************************************************************************/
		@@ -181,7 +217,7 @@
		/**
		* Maximum supported ATT_MTU size
		*/
		#define CFG_BLE_MAX_ATT_MTU (156)
		#define CFG_BLE_MAX_ATT_MTU (250)

		/**
		* Size of the storage area for Attribute values
		@@ -298,6 +334,7 @@
		/**
		* Select UART interfaces
		*/
		#define CFG_UART_GUI
		#define CFG_DEBUG_TRACE_UART hw_uart1
		#define CFG_CONSOLE_MENU hw_lpuart1

		@@ -392,8 +429,8 @@
		#endif

		/** tick timer value in us */
		#define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE )

		#define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), HSE_VALUE/32 )
		//#define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE )
		typedef enum
		{
		CFG_TIM_PROC_ID_ISR,
		@@ -497,6 +534,16 @@ typedef enum
		/*< Add in that list all tasks that may send a ACI/HCI command /
		typedef enum
		{
		CFG_TASK_DATA_TRANSFER_UPDATE_ID,
		CFG_TASK_DATA_WRITE_ID,
		CFG_TASK_CONN_DEV_1_ID,
		CFG_TASK_BUTTON_ID,
		CFG_TASK_SW2_BUTTON_PUSHED_ID,
		CFG_TASK_START_ADV_ID,
		CFG_TASK_START_SCAN_ID,
		CFG_TASK_LINK_CONFIG_ID,
		CFG_TASK_APP_DATA_THROUGHPUT_ID,
		CFG_TASK_CONN_UPDATE_ID,
		CFG_TASK_HCI_ASYNCH_EVT_ID,

		CFG_LAST_TASK_ID_WITH_HCICMD, /*< Shall be LAST in the list /
		@@ -530,6 +577,8 @@ typedef enum
		{
		CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID,
		CFG_IDLEEVT_SYSTEM_HCI_CMD_EVT_RSP_ID,
		CFG_IDLEEVT_GAP_PROC_COMPLETE,
		CFG_IDLEEVT_GATT_PROC_COMPLETE,
		} CFG_IdleEvt_Id_t;

		/******************************************************************************
		@@ -555,6 +604,6 @@ typedef enum

		#define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR

		#endif /__APP_CONFIG_H /
		#endif /__APP_CONF_H /

		/********************** (C) COPYRIGHT STMicroelectronics *END OF FILE**/

lib/stm32wb/hci/hw_if.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -45,8 +45,12 @@ extern "C" {
		#include "stm32wbxx_usb_dongle.h"
		#endif
		#ifdef USE_STM32WBXX_NUCLEO
		#ifdef STM32WB35xx
		#include "nucleo_wb35ce.h"
		#else
		#include "stm32wbxx_nucleo.h"
		#endif
		#endif
		#ifdef USE_X_NUCLEO_EPD
		#include "x_nucleo_epd.h"
		#endif

lib/stm32wb/hci/hw_ipcc.c

+0 −256

Original line number	Diff line number	Diff line
		@@ -39,24 +39,6 @@ static void HW_IPCC_SYS_CmdEvtHandler( void );
		static void HW_IPCC_SYS_EvtHandler( void );
		static void HW_IPCC_TRACES_EvtHandler( void );

		#ifdef THREAD_WB
		static void HW_IPCC_OT_CmdEvtHandler( void );
		static void HW_IPCC_THREAD_NotEvtHandler( void );
		static void HW_IPCC_THREAD_CliNotEvtHandler( void );
		#endif

		#ifdef MAC_802_15_4_WB
		static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void );
		static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void );
		#endif

		#ifdef ZIGBEE_WB
		static void HW_IPCC_ZIGBEE_CmdEvtHandler( void );
		static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void );
		static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void );

		#endif

		/* Public function definition -----------------------------------------------*/

		/******************************************************************************
		@@ -68,32 +50,6 @@ void HW_IPCC_Rx_Handler( void )
		{
		HW_IPCC_SYS_EvtHandler();
		}
		#ifdef MAC_802_15_4_WB
		else if (HW_IPCC_RX_PENDING( HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ))
		{
		HW_IPCC_MAC_802_15_4_NotEvtHandler();
		}
		#endif /* MAC_802_15_4_WB */
		#ifdef THREAD_WB
		else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ))
		{
		HW_IPCC_THREAD_NotEvtHandler();
		}
		else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ))
		{
		HW_IPCC_THREAD_CliNotEvtHandler();
		}
		#endif /* THREAD_WB */
		#ifdef ZIGBEE_WB
		else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ))
		{
		HW_IPCC_ZIGBEE_StackNotifEvtHandler();
		}
		else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ))
		{
		HW_IPCC_ZIGBEE_StackM0RequestHandler();
		}
		#endif /* ZIGBEE_WB */
		else if (HW_IPCC_RX_PENDING( HW_IPCC_BLE_EVENT_CHANNEL ))
		{
		HW_IPCC_BLE_EvtHandler();
		@@ -112,24 +68,6 @@ void HW_IPCC_Tx_Handler( void )
		{
		HW_IPCC_SYS_CmdEvtHandler();
		}
		#ifdef MAC_802_15_4_WB
		else if (HW_IPCC_TX_PENDING( HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ))
		{
		HW_IPCC_MAC_802_15_4_CmdEvtHandler();
		}
		#endif /* MAC_802_15_4_WB */
		#ifdef THREAD_WB
		else if (HW_IPCC_TX_PENDING( HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ))
		{
		HW_IPCC_OT_CmdEvtHandler();
		}
		#endif /* THREAD_WB */
		#ifdef ZIGBEE_WB
		if (HW_IPCC_TX_PENDING( HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ))
		{
		HW_IPCC_ZIGBEE_CmdEvtHandler();
		}
		#endif /* ZIGBEE_WB */
		else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ))
		{
		HW_IPCC_SYS_CmdEvtHandler();
		@@ -270,200 +208,6 @@ static void HW_IPCC_SYS_EvtHandler( void )
		__weak void HW_IPCC_SYS_CmdEvtNot( void ){};
		__weak void HW_IPCC_SYS_EvtNot( void ){};

		/******************************************************************************
		* MAC 802.15.4
		******************************************************************************/
		#ifdef MAC_802_15_4_WB
		void HW_IPCC_MAC_802_15_4_Init( void )
		{
		LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL );

		return;
		}

		void HW_IPCC_MAC_802_15_4_SendCmd( void )
		{
		LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL );
		LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL );

		return;
		}

		void HW_IPCC_MAC_802_15_4_SendAck( void )
		{
		LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL );
		LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL );

		return;
		}

		static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void )
		{
		LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL );

		HW_IPCC_MAC_802_15_4_CmdEvtNot();

		return;
		}

		static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void )
		{
		LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL );

		HW_IPCC_MAC_802_15_4_EvtNot();

		return;
		}
		__weak void HW_IPCC_MAC_802_15_4_CmdEvtNot( void ){};
		__weak void HW_IPCC_MAC_802_15_4_EvtNot( void ){};
		#endif

		/******************************************************************************
		* THREAD
		******************************************************************************/
		#ifdef THREAD_WB
		void HW_IPCC_THREAD_Init( void )
		{
		LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL );
		LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL );

		return;
		}

		void HW_IPCC_OT_SendCmd( void )
		{
		LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL );
		LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL );

		return;
		}

		void HW_IPCC_CLI_SendCmd( void )
		{
		LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_CMD_CHANNEL );

		return;
		}

		void HW_IPCC_THREAD_SendAck( void )
		{
		LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL );
		LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL );

		return;
		}

		void HW_IPCC_THREAD_CliSendAck( void )
		{
		LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL );
		LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL );

		return;
		}

		static void HW_IPCC_OT_CmdEvtHandler( void )
		{
		LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL );

		HW_IPCC_OT_CmdEvtNot();

		return;
		}

		static void HW_IPCC_THREAD_NotEvtHandler( void )
		{
		LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL );

		HW_IPCC_THREAD_EvtNot();

		return;
		}

		static void HW_IPCC_THREAD_CliNotEvtHandler( void )
		{
		LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL );

		HW_IPCC_THREAD_CliEvtNot();

		return;
		}

		__weak void HW_IPCC_OT_CmdEvtNot( void ){};
		__weak void HW_IPCC_CLI_CmdEvtNot( void ){};
		__weak void HW_IPCC_THREAD_EvtNot( void ){};

		#endif /* THREAD_WB */

		/******************************************************************************
		* ZIGBEE
		******************************************************************************/
		#ifdef ZIGBEE_WB
		void HW_IPCC_ZIGBEE_Init( void )
		{
		LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL );
		LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL );

		return;
		}

		void HW_IPCC_ZIGBEE_SendM4RequestToM0( void )
		{
		LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL );
		LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL );

		return;
		}

		void HW_IPCC_ZIGBEE_SendM4AckToM0Notify( void )
		{
		LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL );
		LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL );

		return;
		}

		static void HW_IPCC_ZIGBEE_CmdEvtHandler( void )
		{
		LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL );

		HW_IPCC_ZIGBEE_RecvAppliAckFromM0();

		return;
		}

		static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void )
		{
		LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL );

		HW_IPCC_ZIGBEE_RecvM0NotifyToM4();

		return;
		}

		static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void )
		{
		LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL );

		HW_IPCC_ZIGBEE_RecvM0RequestToM4();

		return;
		}

		void HW_IPCC_ZIGBEE_SendM4AckToM0Request( void )
		{
		LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL );
		LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL );

		return;
		}


		__weak void HW_IPCC_ZIGBEE_RecvAppliAckFromM0( void ){};
		__weak void HW_IPCC_ZIGBEE_RecvM0NotifyToM4( void ){};
		__weak void HW_IPCC_ZIGBEE_RecvM0RequestToM4( void ){};
		#endif /* ZIGBEE_WB */


		/******************************************************************************
		* MEMORY MANAGER
		******************************************************************************/

Admin message