From ef2495f6fa746df9f86f0db39fa00244d22feb3b Mon Sep 17 00:00:00 2001

From: Frederic Pillon <frederic.pillon@st.com>

Date: Wed, 5 Apr 2023 10:18:52 +0200

Subject: [PATCH 1/4] chore: adapt STM32Cube_FW sources

Compare to previous patch, do the minimum changes required

to ease further update.

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

src/utility/STM32Cube_FW/app_conf_default.h | 47 +++++++++++++++------

src/utility/STM32Cube_FW/ble_bufsize.h | 11 ++++-

src/utility/STM32Cube_FW/hw.h | 15 +++++--

src/utility/STM32Cube_FW/hw_ipcc.c | 4 +-

src/utility/STM32Cube_FW/shci.c | 3 +-

src/utility/STM32Cube_FW/shci_tl.c | 18 +++++++-

src/utility/STM32Cube_FW/stm_list.c | 7 ++-

src/utility/STM32Cube_FW/tl_mbox.c | 8 +++-

8 files changed, 90 insertions(+), 23 deletions(-)

index 51bd33a..e89df14 100644

/* USER CODE BEGIN Header */

/**

******************************************************************************

* @author MCD Application Team

******************************************************************************

* @attention

*

/* USER CODE END Header */

/* Define to prevent recursive inclusion -------------------------------------*/

#include "hw.h"

#include "hw_conf.h"

#include "hw_if.h"

#include "ble_bufsize.h"

/******************************************************************************

* Application Config

******************************************************************************/

/**

* Define Secure Connections Support

*/

#define CFG_FW_SUBVERSION (1)

#define CFG_FW_BRANCH (0)

#define CFG_FW_BUILD (0)

/******************************************************************************

* BLE Stack

******************************************************************************/

* Prepare Write List size in terms of number of packet

* This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set

*/

/**

* Number of allocated memory blocks

* This parameter is overwritten by the CPU2 with an hardcoded optimal value when the parameter CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set

*/

/**

* Enable or disable the Extended Packet length feature. Valid values are 0 or 1.

* 0: LE Power Class 2-3

* other bits: complete with Options_extension flag

*/

/**

* BLE stack Options_extension flags to be configured with:

#define CFG_BLE_CORE_VERSION (SHCI_C2_BLE_INIT_BLE_CORE_5_3)

/******************************************************************************

* Transport Layer

******************************************************************************/

@@ -657,5 +680,5 @@ typedef enum

#define CFG_OTP_BASE_ADDRESS OTP_AREA_BASE

#define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR

index 7b7c170..53cf59a 100644

((pw) + MAX(BLE_MEM_BLOCK_X_MTU(mtu, n_link), \

BLE_MBLOCKS_SECURE_CONNECTIONS))

/*

* 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".

* assign a portion of RAM given by the external application to the above

* mentioned "global pointers".

*

* - 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

index 503fa2c..1472a5e 100644

@@ -26,14 +26,23 @@ extern "C" {

#endif

/* Includes ------------------------------------------------------------------*/

/******************************************************************************

* HW IPCC

******************************************************************************/

void HW_IPCC_Enable( void );

void HW_IPCC_Init( void );

void HW_IPCC_BLE_Init( void );

void HW_IPCC_BLE_SendCmd( void );

@@ -76,7 +85,7 @@ 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 );

index fd620b8..3461cbe 100644

*/

/* USER CODE END Header */

/* Includes ------------------------------------------------------------------*/

#include "mbox_def.h"

/* Global variables ---------------------------------------------------------*/

@@ -667,3 +668,4 @@ static void HW_IPCC_TRACES_EvtHandler( void )

}

__weak void HW_IPCC_TRACES_EvtNot( void ){};

index 301db76..cb7d7bd 100644

******************************************************************************

*/

/* Includes ------------------------------------------------------------------*/

#include "stm32_wpan_common.h"

@@ -739,3 +739,4 @@ SHCI_CmdStatus_t SHCI_GetWirelessFwInfo( WirelessFwInfo_t* pWirelessInfo )

return (SHCI_Success);

}

index 2b387b1..a336aa6 100644

******************************************************************************

*/

/* Includes ------------------------------------------------------------------*/

#include "stm32_wpan_common.h"

#include "stm_list.h"

#include "shci_tl.h"

/* Private typedef -----------------------------------------------------------*/

typedef enum

@@ -168,6 +169,20 @@ void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payl

return;

}

/* Private functions ---------------------------------------------------------*/

static void TlInit( TL_CmdPacket_t * p_cmdbuffer )

{

@@ -251,3 +266,4 @@ __WEAK void shci_cmd_resp_release(uint32_t flag)

return;

}

index 4c92864..4e8c364 100644

******************************************************************************

*/

/******************************************************************************

* Include Files

******************************************************************************/

#include "stm_list.h"

@@ -204,3 +206,4 @@ void LST_get_prev_node (tListNode * ref_node, tListNode ** node)

__set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/

}

index 27a998a..ff219b9 100644

******************************************************************************

*/

/* Includes ------------------------------------------------------------------*/

#include "stm32_wpan_common.h"

#include "hw.h"

@@ -51,9 +52,10 @@ 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;

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;

/**< tables */

PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode FreeBufQueue;

PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode TracesEvtQueue;

@@ -97,8 +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;

TL_RefTable.p_mac_802_15_4_table = &TL_Mac_802_15_4_Table;

TL_RefTable.p_zigbee_table = &TL_Zigbee_Table;

HW_IPCC_Init();

return;

@@ -846,3 +851,4 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer)

return;

}

2.38.0.windows.1