nrf_sdh: optimize the idx get functionality when limited to one link

When only a single connection at a time is supported and
CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT is set to one, the idx get and
idx<->conn_handle management can be simplified to save code space.

Signed-off-by: Andreas Moltumyr <[email protected]>

Author: anhmolt

include/nrf_sdh_ble.h

@@ -93,7 +93,18 @@ int nrf_sdh_ble_enable(uint8_t conn_cfg_tag);
  * @returns An integer in the range from 0 to (CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT - 1) if the
  *          connection handle has been assigned to an index, otherwise -1.
  */
-int nrf_sdh_ble_idx_get(uint16_t conn_handle);
+static inline int nrf_sdh_ble_idx_get(uint16_t conn_handle)
+{
+	/* Code size optimization when supporting only one connection. */
+	if (CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT == 1) {
+		ARG_UNUSED(conn_handle);
+		return 0;
+	}
+
+	/* This is used when supporting multiple connections. */
+	int _nrf_sdh_ble_idx_get(uint16_t conn_handle);
+	return _nrf_sdh_ble_idx_get(conn_handle);
+}
 
 #ifdef __cplusplus
 }

subsys/softdevice_handler/nrf_sdh_ble.c

@@ -155,7 +155,7 @@ static uint16_t conn_handles[CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT] = {
 	[0 ... CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT - 1] = BLE_CONN_HANDLE_INVALID,
 };
 
-int nrf_sdh_ble_idx_get(uint16_t conn_handle)
+int _nrf_sdh_ble_idx_get(uint16_t conn_handle)
 {
 	for (int idx = 0; idx < ARRAY_SIZE(conn_handles); idx++) {
 		if (conn_handles[idx] == conn_handle) {
@@ -222,7 +222,8 @@ static void ble_evt_poll(void *context)
 			LOG_DBG("BLE event: %#x", ble_evt->header.evt_id);
 		}
 
-		if (ble_evt->header.evt_id == BLE_GAP_EVT_CONNECTED) {
+		if ((CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT > 1) &&
+		    (ble_evt->header.evt_id == BLE_GAP_EVT_CONNECTED)) {
 			idx_assign(ble_evt->evt.gap_evt.conn_handle);
 		}
 
@@ -232,7 +233,8 @@ static void ble_evt_poll(void *context)
 			obs->handler(ble_evt, obs->context);
 		}
 
-		if (ble_evt->header.evt_id == BLE_GAP_EVT_DISCONNECTED) {
+		if ((CONFIG_NRF_SDH_BLE_TOTAL_LINK_COUNT > 1) &&
+		    (ble_evt->header.evt_id == BLE_GAP_EVT_DISCONNECTED)) {
 			idx_unassign(ble_evt->evt.gap_evt.conn_handle);
 		}
 	}