1- From ef2495f6fa746df9f86f0db39fa00244d22feb3b Mon Sep 17 00:00:00 2001
1+ From fd17a2302d60208768610cb4723eb403c52ff2b1 Mon Sep 17 00:00:00 2001
22From: Frederic Pillon <frederic.pillon@st.com>
3- Date: Wed, 5 Apr 2023 10:18:52 +0200
4- Subject: [PATCH 1/4] chore: adapt STM32Cube_FW sources
5-
6- Compare to previous patch, do the minimum changes required
7- to ease further update.
3+ Date: Thu, 13 Jul 2023 17:08:05 +0200
4+ Subject: [PATCH 1/3] chore: adapt STM32Cube_FW sources
85
96Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
107---
11- src/utility/STM32Cube_FW/app_conf_default.h | 47 +++++++++++++++- -----
12- src/utility/STM32Cube_FW/ble_bufsize.h | 11 ++++-
13- src/utility/STM32Cube_FW/hw.h | 15 +++++- -
14- src/utility/STM32Cube_FW/hw_ipcc.c | 4 +-
8+ src/utility/STM32Cube_FW/app_conf_default.h | 46 ++++++++++++++++ -----
9+ src/utility/STM32Cube_FW/ble_bufsize.h | 7 ++++
10+ src/utility/STM32Cube_FW/hw.h | 13 +++++-
11+ src/utility/STM32Cube_FW/hw_ipcc.c | 5 + +-
1512 src/utility/STM32Cube_FW/shci.c | 3 +-
1613 src/utility/STM32Cube_FW/shci_tl.c | 18 +++++++-
17- src/utility/STM32Cube_FW/stm_list.c | 7 ++-
18- src/utility/STM32Cube_FW/tl_mbox.c | 8 +++-
19- 8 files changed, 90 insertions(+), 23 deletions(-)
14+ src/utility/STM32Cube_FW/stm_list.c | 7 +++ -
15+ src/utility/STM32Cube_FW/tl_mbox.c | 7 +++-
16+ 8 files changed, 86 insertions(+), 20 deletions(-)
2017
2118diff --git a/src/utility/STM32Cube_FW/app_conf_default.h b/src/utility/STM32Cube_FW/app_conf_default.h
22- index 51bd33a..e89df14 100644
19+ index 51bd33a..1c6dd91 100644
2320--- a/src/utility/STM32Cube_FW/app_conf_default.h
2421+++ b/src/utility/STM32Cube_FW/app_conf_default.h
2522@@ -1,9 +1,9 @@
@@ -121,19 +118,18 @@ index 51bd33a..e89df14 100644
121118 /******************************************************************************
122119 * Transport Layer
123120 ******************************************************************************/
124- @@ -657,5 +680,5 @@ typedef enum
125- #define CFG_OTP_BASE_ADDRESS OTP_AREA_BASE
121+ @@ -658,4 +681,5 @@ typedef enum
126122
127123 #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR
128- -
124+
129125- #endif /*APP_CONF_H */
130126+ #endif
131127+ #endif /*APP_CONF_DEFAULT_H */
132128diff --git a/src/utility/STM32Cube_FW/ble_bufsize.h b/src/utility/STM32Cube_FW/ble_bufsize.h
133- index 7b7c170..53cf59a 100644
129+ index b9935c0..d4d2890 100644
134130--- a/src/utility/STM32Cube_FW/ble_bufsize.h
135131+++ b/src/utility/STM32Cube_FW/ble_bufsize.h
136- @@ -75,15 +75,22 @@
132+ @@ -75,6 +75,13 @@
137133 ((pw) + MAX(BLE_MEM_BLOCK_X_MTU(mtu, n_link), \
138134 BLE_MBLOCKS_SECURE_CONNECTIONS))
139135
@@ -147,19 +143,8 @@ index 7b7c170..53cf59a 100644
147143 /*
148144 * BLE_FIXED_BUFFER_SIZE_BYTES:
149145 * A part of the RAM, is dynamically allocated by initializing all the pointers
150- * defined in a global context variable "mem_alloc_ctx_p".
151- - * This initialization is made in the Dynamic_allocator functions, which
152- + * This initialization is made in the Dynamic_allocator functions, which
153- * assign a portion of RAM given by the external application to the above
154- * mentioned "global pointers".
155- *
156- - * The size of this Dynamic RAM is made of 2 main components:
157- + * The size of this Dynamic RAM is made of 2 main components:
158- * - a part that is parameters-dependent (num of links, GATT buffers, ...),
159- * and which value is made explicit by the following macro;
160- * - a part, that may be considered "fixed", i.e. independent from the above
161146diff --git a/src/utility/STM32Cube_FW/hw.h b/src/utility/STM32Cube_FW/hw.h
162- index 503fa2c ..1472a5e 100644
147+ index 651e1f1 ..1472a5e 100644
163148--- a/src/utility/STM32Cube_FW/hw.h
164149+++ b/src/utility/STM32Cube_FW/hw.h
165150@@ -26,14 +26,23 @@ extern "C" {
@@ -188,37 +173,29 @@ index 503fa2c..1472a5e 100644
188173
189174 void HW_IPCC_BLE_Init( void );
190175 void HW_IPCC_BLE_SendCmd( void );
191- @@ -76,7 +85,7 @@ extern "C" {
192- void HW_IPCC_BLE_LLD_ReceiveRsp( void );
193- void HW_IPCC_BLE_LLD_SendRspAck( void );
194-
195- -
196- +
197- void HW_IPCC_TRACES_Init( void );
198- void HW_IPCC_TRACES_EvtNot( void );
199-
200176diff --git a/src/utility/STM32Cube_FW/hw_ipcc.c b/src/utility/STM32Cube_FW/hw_ipcc.c
201- index fd620b8..3461cbe 100644
177+ index fd620b8..c730482 100644
202178--- a/src/utility/STM32Cube_FW/hw_ipcc.c
203179+++ b/src/utility/STM32Cube_FW/hw_ipcc.c
204- @@ -18,8 +18,9 @@
180+ @@ -17,9 +17,9 @@
181+ ******************************************************************************
205182 */
206183 /* USER CODE END Header */
207-
184+ -
208185+ #if defined(STM32WBxx)
209186 /* Includes ------------------------------------------------------------------*/
210187- #include "app_common.h"
211188+ #include "hw.h"
212189 #include "mbox_def.h"
213190
214191 /* Global variables ---------------------------------------------------------*/
215- @@ -667,3 +668 ,4 @@ static void HW_IPCC_TRACES_EvtHandler( void )
192+ @@ -667,3 +667 ,4 @@ static void HW_IPCC_TRACES_EvtHandler( void )
216193 }
217194
218195 __weak void HW_IPCC_TRACES_EvtNot( void ){};
219196+ #endif /* STM32WBxx */
220197diff --git a/src/utility/STM32Cube_FW/shci.c b/src/utility/STM32Cube_FW/shci.c
221- index 301db76..cb7d7bd 100644
198+ index eaa35d7..4525656 100644
222199--- a/src/utility/STM32Cube_FW/shci.c
223200+++ b/src/utility/STM32Cube_FW/shci.c
224201@@ -16,7 +16,7 @@
@@ -236,7 +213,7 @@ index 301db76..cb7d7bd 100644
236213 }
237214+ #endif /* STM32WBxx */
238215diff --git a/src/utility/STM32Cube_FW/shci_tl.c b/src/utility/STM32Cube_FW/shci_tl.c
239- index 2b387b1..a336aa6 100644
216+ index 0f60430..e343809 100644
240217--- a/src/utility/STM32Cube_FW/shci_tl.c
241218+++ b/src/utility/STM32Cube_FW/shci_tl.c
242219@@ -16,12 +16,13 @@
@@ -275,7 +252,7 @@ index 2b387b1..a336aa6 100644
275252 /* Private functions ---------------------------------------------------------*/
276253 static void TlInit( TL_CmdPacket_t * p_cmdbuffer )
277254 {
278- @@ -251 ,3 +266 ,4 @@ __WEAK void shci_cmd_resp_release(uint32_t flag)
255+ @@ -250 ,3 +265 ,4 @@ __WEAK void shci_cmd_resp_release(uint32_t flag)
279256
280257 return;
281258 }
@@ -306,7 +283,7 @@ index 4c92864..4e8c364 100644
306283 }
307284+ #endif /* STM32WBxx */
308285diff --git a/src/utility/STM32Cube_FW/tl_mbox.c b/src/utility/STM32Cube_FW/tl_mbox.c
309- index 27a998a..ff219b9 100644
286+ index 27a998a..1139316 100644
310287--- a/src/utility/STM32Cube_FW/tl_mbox.c
311288+++ b/src/utility/STM32Cube_FW/tl_mbox.c
312289@@ -16,6 +16,7 @@
@@ -329,19 +306,18 @@ index 27a998a..ff219b9 100644
329306 /**< tables */
330307 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode FreeBufQueue;
331308 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode TracesEvtQueue;
332- @@ -97,8 +99,11 @@ void TL_Init( void )
309+ @@ -97,8 +99,10 @@ void TL_Init( void )
333310 TL_RefTable.p_sys_table = &TL_SysTable;
334311 TL_RefTable.p_mem_manager_table = &TL_MemManagerTable;
335312 TL_RefTable.p_traces_table = &TL_TracesTable;
336- +
337313+ #if 0
338314 TL_RefTable.p_mac_802_15_4_table = &TL_Mac_802_15_4_Table;
339315 TL_RefTable.p_zigbee_table = &TL_Zigbee_Table;
340316+ #endif
341317 HW_IPCC_Init();
342318
343319 return;
344- @@ -846,3 +851 ,4 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer)
320+ @@ -846,3 +850 ,4 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer)
345321
346322 return;
347323 }
0 commit comments