Skip to content

sdh: simplifications and improvements #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

sdh: simplifications and improvements #388

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2b9ee6a
doc: add an entry for sdh
lemrey Oct 3, 2025
1e893a9
sdh: remove NRF_SDH_BLE
lemrey Sep 22, 2025
28089a4
sdh: soc: split seeding SoftDevice random in a separate file
lemrey Sep 18, 2025
a767014
sdh: introduce observer priorities (high, lowest, etc.)
lemrey Sep 18, 2025
c200b77
sdh: ble: add GATTS and GATTC event strings to the table
lemrey Sep 22, 2025
4229682
sdh: add a menu for clock configuration
lemrey Sep 22, 2025
307d8e5
sdh: add a menu for BLE configuration
lemrey Sep 22, 2025
c8c251d
sdh: ble: export nrf_sdh_ble_evt_tostr() and nrf_sdh_soc_evt_tostr()
lemrey Sep 22, 2025
ab5e941
sdh: update the assert message in the polling loop
lemrey Sep 23, 2025
822882b
sdh: merge request/state observers
lemrey Sep 23, 2025
565a9cf
sdh: update the doxygen for _enable_request() and _disable_request()
lemrey Sep 23, 2025
093c9f1
sdh: remove nrf_sdh_ble_app_ram_start_get()
lemrey Sep 22, 2025
9431dee
sdh: remove nrf_sdh_request_continue()
lemrey Sep 23, 2025
a0bd9e2
sdh: remove nrf_sdh_is_enabled()
lemrey Sep 23, 2025
39652c2
sdh: let nrf_sdh_is_suspended() only check for sdh state
lemrey Sep 23, 2025
e07d39b
sdh: rename variable
lemrey Sep 23, 2025
381bff5
sdh: remove semicolons at the end of observer macros
lemrey Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 50 additions & 2 deletions subsys/softdevice_handler/nrf_sdh_ble.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@

LOG_MODULE_DECLARE(nrf_sdh, CONFIG_NRF_SDH_LOG_LEVEL);

const char *gap_evt_tostr(int evt)
const char *ble_evt_tostr(int evt)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const char *ble_evt_tostr(int evt)
const char *ble_evt_to_str(int evt)

{
switch (evt) {
/* GAP */
case BLE_GAP_EVT_CONNECTED:
return "BLE_GAP_EVT_CONNECTED";
Comment on lines 29 to 30
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could do #define RETURN_STRINGIFIED_EVENT(_evt) case _evt: return #_evt and then

Suggested change
case BLE_GAP_EVT_CONNECTED:
return "BLE_GAP_EVT_CONNECTED";
RETURN_STRINGIFIED_EVENT(BLE_GAP_EVT_CONNECTED);

to save some lines. But I guess returning from inside a macro is considered bad practice. Better to be explicit.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I prefer the current implementation. Otherwise we start devolving into too much macro magic.

case BLE_GAP_EVT_DISCONNECTED:
Expand Down Expand Up @@ -70,6 +71,53 @@ const char *gap_evt_tostr(int evt)
#endif
case BLE_GAP_EVT_ADV_SET_TERMINATED:
return "BLE_GAP_EVT_ADV_SET_TERMINATED";

/* GATTS */
case BLE_GATTS_EVT_WRITE:
return "BLE_GATTS_EVT_WRITE";
case BLE_GATTS_EVT_RW_AUTHORIZE_REQUEST:
return "BLE_GATTS_EVT_RW_AUTHORIZE_REQUEST";
case BLE_GATTS_EVT_SYS_ATTR_MISSING:
return "BLE_GATTS_EVT_SYS_ATTR_MISSING";
case BLE_GATTS_EVT_HVC:
return "BLE_GATTS_EVT_HVC";
case BLE_GATTS_EVT_SC_CONFIRM:
return "BLE_GATTS_EVT_SC_CONFIRM";
case BLE_GATTS_EVT_EXCHANGE_MTU_REQUEST:
return "BLE_GATTS_EVT_EXCHANGE_MTU_REQUEST";
case BLE_GATTS_EVT_TIMEOUT:
return "BLE_GATTS_EVT_TIMEOUT";
case BLE_GATTS_EVT_HVN_TX_COMPLETE:
return "BLE_GATTS_EVT_HVN_TX_COMPLETE";

/* GATTC */
case BLE_GATTC_EVT_PRIM_SRVC_DISC_RSP:
return "BLE_GATTC_EVT_PRIM_SRVC_DISC_RSP";
case BLE_GATTC_EVT_REL_DISC_RSP:
return "BLE_GATTC_EVT_REL_DISC_RSP";
case BLE_GATTC_EVT_CHAR_DISC_RSP:
return "BLE_GATTC_EVT_CHAR_DISC_RSP";
case BLE_GATTC_EVT_DESC_DISC_RSP:
return "BLE_GATTC_EVT_DESC_DISC_RSP";
case BLE_GATTC_EVT_ATTR_INFO_DISC_RSP:
return "BLE_GATTC_EVT_ATTR_INFO_DISC_RSP";
case BLE_GATTC_EVT_CHAR_VAL_BY_UUID_READ_RSP:
return "BLE_GATTC_EVT_CHAR_VAL_BY_UUID_READ_RSP";
case BLE_GATTC_EVT_READ_RSP:
return "BLE_GATTC_EVT_READ_RSP";
case BLE_GATTC_EVT_CHAR_VALS_READ_RSP:
return "BLE_GATTC_EVT_CHAR_VALS_READ_RSP";
case BLE_GATTC_EVT_WRITE_RSP:
return "BLE_GATTC_EVT_WRITE_RSP";
case BLE_GATTC_EVT_HVX:
return "BLE_GATTC_EVT_HVX";
case BLE_GATTC_EVT_EXCHANGE_MTU_RSP:
return "BLE_GATTC_EVT_EXCHANGE_MTU_RSP";
case BLE_GATTC_EVT_TIMEOUT:
return "BLE_GATTC_EVT_TIMEOUT";
case BLE_GATTC_EVT_WRITE_CMD_TX_COMPLETE:
return "BLE_GATTC_EVT_WRITE_CMD_TX_COMPLETE";

default:
return "unknown";
}
Expand Down Expand Up @@ -298,7 +346,7 @@ static void ble_evt_poll(void *context)
}

if (IS_ENABLED(CONFIG_NRF_SDH_STR_TABLES)) {
LOG_DBG("BLE event: %s", gap_evt_tostr(ble_evt->header.evt_id));
LOG_DBG("BLE event: %s", ble_evt_tostr(ble_evt->header.evt_id));
} else {
LOG_DBG("BLE event: %#x", ble_evt->header.evt_id);
}
Expand Down