Skip to content

Commit cfb99d6

Browse files
author
Marcus Chang
committed
Fix inconsistent SWI configuration in NRF52 series
All SWI channels except SWI0 is being used by the SoftDevice and not only SWI1.
1 parent 01135e3 commit cfb99d6

File tree

6 files changed

+22
-18
lines changed

6 files changed

+22
-18
lines changed

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/config/sdk_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1795,7 +1795,7 @@
17951795

17961796

17971797
#ifndef EGU_ENABLED
1798-
#define EGU_ENABLED 0
1798+
#define EGU_ENABLED 1
17991799
#endif
18001800

18011801
// <e> GPIOTE_ENABLED - nrf_drv_gpiote - GPIOTE peripheral driver

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/config/sdk_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1795,7 +1795,7 @@
17951795

17961796

17971797
#ifndef EGU_ENABLED
1798-
#define EGU_ENABLED 0
1798+
#define EGU_ENABLED 1
17991799
#endif
18001800

18011801
// <e> GPIOTE_ENABLED - nrf_drv_gpiote - GPIOTE peripheral driver

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S132_FULL/mbed_lib.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
"NRF_SDH_BLE_STACK_OBSERVER_PRIO=0",
2929
"NRF_SDH_SOC_STACK_OBSERVER_PRIO=0",
3030
"FDS_BACKEND=2",
31-
"SWI_DISABLE1=1"
31+
"SWI_DISABLE1",
32+
"SWI_DISABLE2",
33+
"SWI_DISABLE3",
34+
"SWI_DISABLE4",
35+
"SWI_DISABLE5"
3236
],
3337
"target_overrides": {
3438
"*": {

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S132_OTA/mbed_lib.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,7 @@
1212
"NRF_SDH_ENABLED=1",
1313
"NRF_SDH_BLE_ENABLED=1",
1414
"PEER_MANAGER_ENABLED=1",
15-
"NRF_SDH_BLE_PERIPHERAL_LINK_COUNT=3",
16-
"NRF_SDH_BLE_CENTRAL_LINK_COUNT=1",
17-
"NRF_SDH_BLE_TOTAL_LINK_COUNT=4",
18-
"NRF_SDH_BLE_SERVICE_CHANGED=1",
1915
"NRF_SDH_BLE_GATT_MAX_MTU_SIZE=23",
20-
"NRF_SDH_BLE_GATTS_ATTR_TAB_SIZE=0x600",
21-
"NRF_SDH_BLE_VS_UUID_COUNT=4",
2216
"NRF_SDH_BLE_OBSERVER_PRIO_LEVELS=4",
2317
"NRF_SDH_BLE_GAP_EVENT_LENGTH=3",
2418
"BLE_ADV_BLE_OBSERVER_PRIO=1",
@@ -34,7 +28,11 @@
3428
"NRF_SDH_BLE_STACK_OBSERVER_PRIO=0",
3529
"NRF_SDH_SOC_STACK_OBSERVER_PRIO=0",
3630
"FDS_BACKEND=2",
37-
"SWI_DISABLE1=1"
31+
"SWI_DISABLE1",
32+
"SWI_DISABLE2",
33+
"SWI_DISABLE3",
34+
"SWI_DISABLE4",
35+
"SWI_DISABLE5"
3836
],
3937
"target_overrides": {
4038
"*": {

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S140_FULL/mbed_lib.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
"NRF_SDH_BLE_STACK_OBSERVER_PRIO=0",
2929
"NRF_SDH_SOC_STACK_OBSERVER_PRIO=0",
3030
"FDS_BACKEND=2",
31-
"SWI_DISABLE1=1"
31+
"SWI_DISABLE1",
32+
"SWI_DISABLE2",
33+
"SWI_DISABLE3",
34+
"SWI_DISABLE4",
35+
"SWI_DISABLE5"
3236
],
3337
"target_overrides": {
3438
"*": {

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S140_OTA/mbed_lib.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,7 @@
1212
"NRF_SDH_ENABLED=1",
1313
"NRF_SDH_BLE_ENABLED=1",
1414
"PEER_MANAGER_ENABLED=1",
15-
"NRF_SDH_BLE_PERIPHERAL_LINK_COUNT=3",
16-
"NRF_SDH_BLE_CENTRAL_LINK_COUNT=1",
17-
"NRF_SDH_BLE_TOTAL_LINK_COUNT=4",
18-
"NRF_SDH_BLE_SERVICE_CHANGED=1",
1915
"NRF_SDH_BLE_GATT_MAX_MTU_SIZE=23",
20-
"NRF_SDH_BLE_GATTS_ATTR_TAB_SIZE=0x600",
21-
"NRF_SDH_BLE_VS_UUID_COUNT=4",
2216
"NRF_SDH_BLE_OBSERVER_PRIO_LEVELS=4",
2317
"NRF_SDH_BLE_GAP_EVENT_LENGTH=3",
2418
"BLE_ADV_BLE_OBSERVER_PRIO=1",
@@ -34,7 +28,11 @@
3428
"NRF_SDH_BLE_STACK_OBSERVER_PRIO=0",
3529
"NRF_SDH_SOC_STACK_OBSERVER_PRIO=0",
3630
"FDS_BACKEND=2",
37-
"SWI_DISABLE1=1"
31+
"SWI_DISABLE1",
32+
"SWI_DISABLE2",
33+
"SWI_DISABLE3",
34+
"SWI_DISABLE4",
35+
"SWI_DISABLE5"
3836
],
3937
"target_overrides": {
4038
"*": {

0 commit comments

Comments
 (0)