Skip to content

Commit 2d55528

Browse files
ericmechinericmechin
committed
Revert "drivers: stm32wb: fix extended advertising error #51430"
This reverts commit 8b42452. Revert to initial version. Signed-off-by: Eric Mechin <[email protected]>
1 parent 43d2664 commit 2d55528

File tree

2 files changed

+3
-122
lines changed

2 files changed

+3
-122
lines changed

‎lib/stm32wb/CMakeLists.txt‎

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -2,118 +2,6 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY "1 << 0")
6-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_LL_HOST "0 << 0")
7-
8-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC "1 << 1")
9-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC "0 << 1")
10-
11-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO "1 << 2")
12-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW "0 << 2")
13-
14-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV "1 << 3")
15-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV "0 << 3")
16-
17-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 "1 << 4")
18-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 "0 << 4")
19-
20-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_REDUC_GATTDB_NVM "1 << 5")
21-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM "0 << 5")
22-
23-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_USED "1 << 6")
24-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED "0 << 6")
25-
26-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 "1 << 7")
27-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 "0 << 7")
28-
29-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_WRITABLE "1 << 0")
30-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_READONLY "0 << 0")
31-
32-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_SUPPORTED "1 << 1")
33-
MATH(EXPR SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_NOTSUPPORTED "0 << 1")
34-
35-
if(CONFIG_BT_DEVICE_NAME_GATT_WRITABLE)
36-
message(STATUS "CONFIG_BT_DEVICE_NAME_GATT_WRITABLE: ${CONFIG_BT_DEVICE_NAME_GATT_WRITABLE}")
37-
set(CFG_DEVICE_NAME ${SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW})
38-
else()
39-
message(STATUS "CONFIG_BT_DEVICE_NAME_GATT_WRITABLE: UNDEFINED")
40-
set(CFG_DEVICE_NAME ${SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO})
41-
endif()
42-
43-
if(CONFIG_BT_EXT_ADV)
44-
message(STATUS "CONFIG_BT_EXT_ADV: ${CONFIG_BT_EXT_ADV}")
45-
MATH(EXPR CFG_EXT_ADV "${SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV} | ${SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2}")
46-
else()
47-
message(STATUS "CONFIG_BT_EXT_ADV: UNDEFINED")
48-
MATH(EXPR CFG_EXT_ADV "${SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV} | ${SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2}")
49-
endif()
50-
51-
if(CONFIG_BT_GATT_CACHING)
52-
message(STATUS "CONFIG_BT_GATT_CACHING: ${CONFIG_BT_GATT_CACHING}")
53-
set(CFG_GATT_CACHING ${SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_USED})
54-
else()
55-
message(STATUS "CONFIG_BT_GATT_CACHING: UNDEFINED")
56-
set(CFG_GATT_CACHING ${SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED})
57-
endif()
58-
59-
MATH(EXPR CFG_BLE_OPTIONS "${SHCI_C2_BLE_INIT_OPTIONS_LL_HOST} | ${SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC} | ${CFG_DEVICE_NAME} | ${CFG_EXT_ADV} | ${SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM} | ${CFG_GATT_CACHING} | ${SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3}" OUTPUT_FORMAT HEXADECIMAL)
60-
61-
if(CONFIG_BT_DEVICE_APPEARANCE_GATT_WRITABLE)
62-
message(STATUS "CONFIG_BT_DEVICE_APPEARANCE_GATT_WRITABLE: ${CONFIG_BT_DEVICE_APPEARANCE_GATT_WRITABLE}")
63-
set(CFG_DEVICE_APPEARANCE ${SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_WRITABLE})
64-
else()
65-
message(STATUS "CONFIG_BT_DEVICE_APPEARANCE_GATT_WRITABLE: UNDEFINED")
66-
set(CFG_DEVICE_APPEARANCE ${SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_READONLY})
67-
endif()
68-
69-
if(CONFIG_BT_EATT)
70-
message(STATUS "CONFIG_BT_EATT: ${CONFIG_BT_EATT}")
71-
set(CFG_EATT ${SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_SUPPORTED})
72-
else()
73-
message(STATUS "CONFIG_BT_EATT: UNDEFINED")
74-
set(CFG_EATT ${SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_NOTSUPPORTED})
75-
endif()
76-
77-
set(CFG_BLE_OPTIONS_EXT ${CFG_DEVICE_APPEARANCE} | ${CFG_EATT})
78-
MATH(EXPR CFG_BLE_OPTIONS_EXT "${CFG_DEVICE_APPEARANCE} | ${CFG_EATT}" OUTPUT_FORMAT HEXADECIMAL)
79-
80-
if(CONFIG_BT_EXT_ADV_MAX_ADV_SET)
81-
message(STATUS "CONFIG_BT_EXT_ADV_MAX_ADV_SET: ${CONFIG_BT_EXT_ADV_MAX_ADV_SET}")
82-
if(CONFIG_BT_EXT_ADV_MAX_ADV_SET GREATER 8)
83-
set(CFG_BLE_MAX_ADV_SET_NBR 1)
84-
else()
85-
set(CFG_BLE_MAX_ADV_SET_NBR ${CONFIG_BT_EXT_ADV_MAX_ADV_SET})
86-
endif()
87-
else()
88-
message(STATUS "CONFIG_BT_EXT_ADV_MAX_ADV_SET: UNDEFINED")
89-
set(CFG_BLE_MAX_ADV_SET_NBR 1)
90-
endif()
91-
92-
if(CFG_BLE_MAX_ADV_SET_NBR LESS 4)
93-
set(CFG_BLE_MAX_ADV_DATA_LEN 1650)
94-
elseif(CFG_BLE_MAX_ADV_SET_NBR EQUAL 4)
95-
set(CFG_BLE_MAX_ADV_DATA_LEN 1035)
96-
elseif(CFG_BLE_MAX_ADV_SET_NBR EQUAL 5)
97-
set(CFG_BLE_MAX_ADV_DATA_LEN 621)
98-
elseif(CFG_BLE_MAX_ADV_SET_NBR EQUAL 6)
99-
set(CFG_BLE_MAX_ADV_DATA_LEN 414)
100-
elseif(CFG_BLE_MAX_ADV_SET_NBR GREATER 6)
101-
set(CFG_BLE_MAX_ADV_DATA_LEN 207)
102-
endif()
103-
104-
message(STATUS "BLE Stack modularity configuration:")
105-
message(STATUS "CFG_BLE_OPTIONS: ${CFG_BLE_OPTIONS}")
106-
message(STATUS "CFG_BLE_OPTIONS_EXT: ${CFG_BLE_OPTIONS_EXT}")
107-
message(STATUS "CFG_BLE_MAX_ADV_SET_NBR: ${CFG_BLE_MAX_ADV_SET_NBR}")
108-
message(STATUS "CFG_BLE_MAX_ADV_DATA_LEN: ${CFG_BLE_MAX_ADV_DATA_LEN}")
109-
110-
zephyr_compile_definitions(
111-
-DCFG_BLE_OPTIONS=${CFG_BLE_OPTIONS}
112-
-DCFG_BLE_OPTIONS_EXT=${CFG_BLE_OPTIONS_EXT}
113-
-DCFG_BLE_MAX_ADV_SET_NBR=${CFG_BLE_MAX_ADV_SET_NBR}
114-
-DCFG_BLE_MAX_ADV_DATA_LEN=${CFG_BLE_MAX_ADV_DATA_LEN}
115-
)
116-
1175
zephyr_include_directories(hci)
1186

1197
zephyr_sources(hci/hw_ipcc.c)

‎lib/stm32wb/hci/app_conf.h‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,7 @@
304304
* other bits: complete with Options_extension flag
305305
*/
306306
/* Z-WB-3 */
307-
#ifndef __ZEPHYR__
308307
#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM | SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3)
309-
#endif
310308

311309
/**
312310
* BLE stack Options_extension flags to be configured with:
@@ -321,9 +319,7 @@
321319
* 0: Enhanced ATT not supported
322320
* other bits: reserved (shall be set to 0)
323321
*/
324-
#ifndef __ZEPHYR__
325322
#define CFG_BLE_OPTIONS_EXT (SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_READONLY | SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_NOTSUPPORTED)
326-
#endif
327323

328324
#define CFG_BLE_MAX_COC_INITIATOR_NBR (32)
329325

@@ -336,9 +332,8 @@
336332
* in addition to the number of links
337333
* - Range: 0 .. 4
338334
*/
339-
#ifndef __ZEPHYR__
340335
#define CFG_BLE_MAX_ADD_EATT_BEARERS (4)
341-
#endif
336+
342337

343338
/**
344339
* BLE Rx model configuration flags to be configured with:
@@ -358,19 +353,17 @@
358353
* on Max Extended advertising configuration supported.
359354
* This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
360355
*/
361-
#ifndef __ZEPHYR__
356+
362357
#define CFG_BLE_MAX_ADV_SET_NBR (3)
363-
#endif
364358

365359
/* Maximum advertising data length (in bytes)
366360
* Range: 31 .. 1650 with limitation:
367361
* This parameter is linked to CFG_BLE_MAX_ADV_SET_NBR such as both compliant with allocated Total memory computed with BLE_EXT_ADV_BUFFER_SIZE based
368362
* on Max Extended advertising configuration supported.
369363
* This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
370364
*/
371-
#ifndef __ZEPHYR__
365+
372366
#define CFG_BLE_MAX_ADV_DATA_LEN (1650)
373-
#endif
374367

375368
/* RF TX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
376369
* Range: -1280 .. 1280

0 commit comments

Comments
 (0)