Skip to content

Commit b0e78ca

Browse files
fpistmfpistm
committed
chore: rename STM32Cube_FW to STM32_WPAN
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 347ff92 commit b0e78ca

26 files changed

+347
-51
lines changed

‎.github/workflows/codespell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ jobs:
2424
check_hidden: true
2525
# In the event of a false positive, add the word in all lower case to this file:
2626
# ignore_words_file: ./extras/codespell-ignore-words-list.txt
27-
skip: src/utility/STM32Cube_FW
27+
skip: src/utility/STM32_WPAN
2828
path: src

‎extras/STM32Cube_FW/0001-chore-adapt-STM32Cube_FW-sources.patch‎ renamed to ‎extras/STM32_WPAN/0001-chore-adapt-STM32_WPAN-sources.patch‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
From 542e007fa5a1b53664d2efb5f01d67767123a357 Mon Sep 17 00:00:00 2001
22
From: Frederic Pillon <frederic.pillon@st.com>
33
Date: Thu, 13 Jul 2023 17:08:05 +0200
4-
Subject: [PATCH 1/4] chore: adapt STM32Cube_FW sources
4+
Subject: [PATCH 1/4] chore: adapt STM32_WPAN sources
55

66
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
77
---
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 ++-
12-
src/utility/STM32Cube_FW/shci.c | 3 +-
13-
src/utility/STM32Cube_FW/shci_tl.c | 18 +++++++-
14-
src/utility/STM32Cube_FW/stm_list.c | 7 +++-
15-
src/utility/STM32Cube_FW/tl_mbox.c | 7 +++-
8+
src/utility/STM32_WPAN/app_conf_default.h | 46 ++++++++++++++++-----
9+
src/utility/STM32_WPAN/ble_bufsize.h | 7 ++++
10+
src/utility/STM32_WPAN/hw.h | 13 +++++-
11+
src/utility/STM32_WPAN/hw_ipcc.c | 5 ++-
12+
src/utility/STM32_WPAN/shci.c | 3 +-
13+
src/utility/STM32_WPAN/shci_tl.c | 18 +++++++-
14+
src/utility/STM32_WPAN/stm_list.c | 7 +++-
15+
src/utility/STM32_WPAN/tl_mbox.c | 7 +++-
1616
8 files changed, 86 insertions(+), 20 deletions(-)
1717

18-
diff --git a/src/utility/STM32Cube_FW/app_conf_default.h b/src/utility/STM32Cube_FW/app_conf_default.h
18+
diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
1919
index 51bd33a..1c6dd91 100644
20-
--- a/src/utility/STM32Cube_FW/app_conf_default.h
21-
+++ b/src/utility/STM32Cube_FW/app_conf_default.h
20+
--- a/src/utility/STM32_WPAN/app_conf_default.h
21+
+++ b/src/utility/STM32_WPAN/app_conf_default.h
2222
@@ -1,9 +1,9 @@
2323
/* USER CODE BEGIN Header */
2424
/**
@@ -125,10 +125,10 @@ index 51bd33a..1c6dd91 100644
125125
-#endif /*APP_CONF_H */
126126
+#endif
127127
+#endif /*APP_CONF_DEFAULT_H */
128-
diff --git a/src/utility/STM32Cube_FW/ble_bufsize.h b/src/utility/STM32Cube_FW/ble_bufsize.h
128+
diff --git a/src/utility/STM32_WPAN/ble_bufsize.h b/src/utility/STM32_WPAN/ble_bufsize.h
129129
index b9935c0..d4d2890 100644
130-
--- a/src/utility/STM32Cube_FW/ble_bufsize.h
131-
+++ b/src/utility/STM32Cube_FW/ble_bufsize.h
130+
--- a/src/utility/STM32_WPAN/ble_bufsize.h
131+
+++ b/src/utility/STM32_WPAN/ble_bufsize.h
132132
@@ -75,6 +75,13 @@
133133
((pw) + MAX(BLE_MEM_BLOCK_X_MTU(mtu, n_link), \
134134
BLE_MBLOCKS_SECURE_CONNECTIONS))
@@ -143,10 +143,10 @@ index b9935c0..d4d2890 100644
143143
/*
144144
* BLE_FIXED_BUFFER_SIZE_BYTES:
145145
* A part of the RAM, is dynamically allocated by initializing all the pointers
146-
diff --git a/src/utility/STM32Cube_FW/hw.h b/src/utility/STM32Cube_FW/hw.h
146+
diff --git a/src/utility/STM32_WPAN/hw.h b/src/utility/STM32_WPAN/hw.h
147147
index 651e1f1..1472a5e 100644
148-
--- a/src/utility/STM32Cube_FW/hw.h
149-
+++ b/src/utility/STM32Cube_FW/hw.h
148+
--- a/src/utility/STM32_WPAN/hw.h
149+
+++ b/src/utility/STM32_WPAN/hw.h
150150
@@ -26,14 +26,23 @@ extern "C" {
151151
#endif
152152

@@ -173,10 +173,10 @@ index 651e1f1..1472a5e 100644
173173

174174
void HW_IPCC_BLE_Init( void );
175175
void HW_IPCC_BLE_SendCmd( void );
176-
diff --git a/src/utility/STM32Cube_FW/hw_ipcc.c b/src/utility/STM32Cube_FW/hw_ipcc.c
176+
diff --git a/src/utility/STM32_WPAN/hw_ipcc.c b/src/utility/STM32_WPAN/hw_ipcc.c
177177
index fd620b8..c730482 100644
178-
--- a/src/utility/STM32Cube_FW/hw_ipcc.c
179-
+++ b/src/utility/STM32Cube_FW/hw_ipcc.c
178+
--- a/src/utility/STM32_WPAN/hw_ipcc.c
179+
+++ b/src/utility/STM32_WPAN/hw_ipcc.c
180180
@@ -17,9 +17,9 @@
181181
******************************************************************************
182182
*/
@@ -194,10 +194,10 @@ index fd620b8..c730482 100644
194194

195195
__weak void HW_IPCC_TRACES_EvtNot( void ){};
196196
+#endif /* STM32WBxx */
197-
diff --git a/src/utility/STM32Cube_FW/shci.c b/src/utility/STM32Cube_FW/shci.c
197+
diff --git a/src/utility/STM32_WPAN/shci.c b/src/utility/STM32_WPAN/shci.c
198198
index eaa35d7..4525656 100644
199-
--- a/src/utility/STM32Cube_FW/shci.c
200-
+++ b/src/utility/STM32Cube_FW/shci.c
199+
--- a/src/utility/STM32_WPAN/shci.c
200+
+++ b/src/utility/STM32_WPAN/shci.c
201201
@@ -16,7 +16,7 @@
202202
******************************************************************************
203203
*/
@@ -212,10 +212,10 @@ index eaa35d7..4525656 100644
212212
return (SHCI_Success);
213213
}
214214
+#endif /* STM32WBxx */
215-
diff --git a/src/utility/STM32Cube_FW/shci_tl.c b/src/utility/STM32Cube_FW/shci_tl.c
215+
diff --git a/src/utility/STM32_WPAN/shci_tl.c b/src/utility/STM32_WPAN/shci_tl.c
216216
index 0f60430..e343809 100644
217-
--- a/src/utility/STM32Cube_FW/shci_tl.c
218-
+++ b/src/utility/STM32Cube_FW/shci_tl.c
217+
--- a/src/utility/STM32_WPAN/shci_tl.c
218+
+++ b/src/utility/STM32_WPAN/shci_tl.c
219219
@@ -16,12 +16,13 @@
220220
******************************************************************************
221221
*/
@@ -257,10 +257,10 @@ index 0f60430..e343809 100644
257257
return;
258258
}
259259
+#endif /* STM32WBxx */
260-
diff --git a/src/utility/STM32Cube_FW/stm_list.c b/src/utility/STM32Cube_FW/stm_list.c
260+
diff --git a/src/utility/STM32_WPAN/stm_list.c b/src/utility/STM32_WPAN/stm_list.c
261261
index 4c92864..4e8c364 100644
262-
--- a/src/utility/STM32Cube_FW/stm_list.c
263-
+++ b/src/utility/STM32Cube_FW/stm_list.c
262+
--- a/src/utility/STM32_WPAN/stm_list.c
263+
+++ b/src/utility/STM32_WPAN/stm_list.c
264264
@@ -16,11 +16,13 @@
265265
******************************************************************************
266266
*/
@@ -282,10 +282,10 @@ index 4c92864..4e8c364 100644
282282
__set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/
283283
}
284284
+#endif /* STM32WBxx */
285-
diff --git a/src/utility/STM32Cube_FW/tl_mbox.c b/src/utility/STM32Cube_FW/tl_mbox.c
285+
diff --git a/src/utility/STM32_WPAN/tl_mbox.c b/src/utility/STM32_WPAN/tl_mbox.c
286286
index 27a998a..1139316 100644
287-
--- a/src/utility/STM32Cube_FW/tl_mbox.c
288-
+++ b/src/utility/STM32Cube_FW/tl_mbox.c
287+
--- a/src/utility/STM32_WPAN/tl_mbox.c
288+
+++ b/src/utility/STM32_WPAN/tl_mbox.c
289289
@@ -16,6 +16,7 @@
290290
******************************************************************************
291291
*/

‎extras/STM32Cube_FW/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch‎ renamed to ‎extras/STM32_WPAN/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ Subject: [PATCH 2/4] fix: include a timeout when waiting for the cmd_resp
55

66
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
77
---
8-
src/utility/STM32Cube_FW/shci_tl.c | 10 ++++++----
8+
src/utility/STM32_WPAN/shci_tl.c | 10 ++++++----
99
1 file changed, 6 insertions(+), 4 deletions(-)
1010

11-
diff --git a/src/utility/STM32Cube_FW/shci_tl.c b/src/utility/STM32Cube_FW/shci_tl.c
11+
diff --git a/src/utility/STM32_WPAN/shci_tl.c b/src/utility/STM32_WPAN/shci_tl.c
1212
index e343809..6038025 100644
13-
--- a/src/utility/STM32Cube_FW/shci_tl.c
14-
+++ b/src/utility/STM32Cube_FW/shci_tl.c
13+
--- a/src/utility/STM32_WPAN/shci_tl.c
14+
+++ b/src/utility/STM32_WPAN/shci_tl.c
1515
@@ -23,6 +23,7 @@
1616
#include "stm_list.h"
1717
#include "shci_tl.h"

‎extras/STM32Cube_FW/0003-chore-add-support-for-customize-app_conf_default.h.patch‎ renamed to ‎extras/STM32_WPAN/0003-chore-add-support-for-customize-app_conf_default.h.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ Subject: [PATCH 3/4] chore: add support for customize app_conf_default.h
55

66
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
77
---
8-
src/utility/STM32Cube_FW/app_conf_default.h | 86 ++++++++++++++++-----
8+
src/utility/STM32_WPAN/app_conf_default.h | 86 ++++++++++++++++-----
99
1 file changed, 68 insertions(+), 18 deletions(-)
1010

11-
diff --git a/src/utility/STM32Cube_FW/app_conf_default.h b/src/utility/STM32Cube_FW/app_conf_default.h
11+
diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
1212
index 1c6dd91..d39492e 100644
13-
--- a/src/utility/STM32Cube_FW/app_conf_default.h
14-
+++ b/src/utility/STM32Cube_FW/app_conf_default.h
13+
--- a/src/utility/STM32_WPAN/app_conf_default.h
14+
+++ b/src/utility/STM32_WPAN/app_conf_default.h
1515
@@ -48,7 +48,9 @@
1616
/**
1717
* Define Tx Power

‎extras/STM32Cube_FW/0004-fix-TL_Evt_t-payload-size-for-reset.patch‎ renamed to ‎extras/STM32_WPAN/0004-fix-TL_Evt_t-payload-size-for-reset.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ which require 4 bytes.
99

1010
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1111
---
12-
src/utility/STM32Cube_FW/tl.h | 2 +-
12+
src/utility/STM32_WPAN/tl.h | 2 +-
1313
1 file changed, 1 insertion(+), 1 deletion(-)
1414

15-
diff --git a/src/utility/STM32Cube_FW/tl.h b/src/utility/STM32Cube_FW/tl.h
15+
diff --git a/src/utility/STM32_WPAN/tl.h b/src/utility/STM32_WPAN/tl.h
1616
index 8e8c6cb..7452087 100644
17-
--- a/src/utility/STM32Cube_FW/tl.h
18-
+++ b/src/utility/STM32Cube_FW/tl.h
17+
--- a/src/utility/STM32_WPAN/tl.h
18+
+++ b/src/utility/STM32_WPAN/tl.h
1919
@@ -108,7 +108,7 @@ typedef PACKED_STRUCT
2020
{
2121
uint8_t evtcode;

0 commit comments

Comments
 (0)