lib: peer_manager: use SOFTDEVICE_PERIPHERAL Kconfig for periph code

Switch on Kconfig CONFIG_SOFTDEVICE_PERIPHERAL instead of
SoftDevice define BLE_GAP_ROLE_PERIPH when adding peripheral
specific code in security dispatcher module of the peer manager.

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

Author: anhmolt

lib/bluetooth/peer_manager/modules/security_dispatcher.c

@@ -374,7 +374,7 @@ static void sec_request_process(const ble_gap_evt_t *gap_evt)
 }
 #endif /* CONFIG_SOFTDEVICE_CENTRAL */
 
-#ifdef BLE_GAP_ROLE_PERIPH
+#if defined(CONFIG_SOFTDEVICE_PERIPHERAL)
 /** @brief Function for asking the central to secure the link. See @ref smd_link_secure for more
  * info.
  */
@@ -457,7 +457,7 @@ static void sec_info_request_process(const ble_gap_evt_t *gap_evt)
 				   BLE_GAP_SEC_STATUS_SOURCE_LOCAL);
 	}
 }
-#endif /* BLE_GAP_ROLE_PERIPH */
+#endif /* CONFIG_SOFTDEVICE_PERIPHERAL */
 
 /**
  * @brief Function for sending a PM_EVT_CONN_SEC_CONFIG_REQ event.
@@ -526,14 +526,14 @@ static void send_params_req(uint16_t conn_handle, const ble_gap_sec_params_t *pe
  */
 static void sec_params_request_process(const ble_gap_evt_t *gap_evt)
 {
-#ifdef BLE_GAP_ROLE_PERIPH
+#if defined(CONFIG_SOFTDEVICE_PERIPHERAL)
 	if (ble_conn_state_role(gap_evt->conn_handle) == BLE_GAP_ROLE_PERIPH) {
 		sec_proc_start(gap_evt->conn_handle, true,
 			       gap_evt->params.sec_params_request.peer_params.bond
 				       ? PM_CONN_SEC_PROCEDURE_BONDING
 				       : PM_CONN_SEC_PROCEDURE_PAIRING);
 	}
-#endif /* BLE_GAP_ROLE_PERIPH */
+#endif /* CONFIG_SOFTDEVICE_PERIPHERAL */
 
 	send_params_req(gap_evt->conn_handle, &gap_evt->params.sec_params_request.peer_params);
 }
@@ -837,14 +837,14 @@ uint32_t smd_params_reply(uint16_t conn_handle, ble_gap_sec_params_t *sec_params
 	ble_gap_sec_keyset_t sec_keyset;
 
 	memset(&sec_keyset, 0, sizeof(ble_gap_sec_keyset_t));
-#ifdef BLE_GAP_ROLE_PERIPH
+#if defined(CONFIG_SOFTDEVICE_PERIPHERAL)
 	if (role == BLE_GAP_ROLE_PERIPH) {
 		/* Set the default value for allowing repairing at the start of the sec proc. (for
 		 * peripheral)
 		 */
 		ble_conn_state_user_flag_set(conn_handle, flag_allow_repairing, false);
 	}
-#endif /* BLE_GAP_ROLE_PERIPH */
+#endif /* CONFIG_SOFTDEVICE_PERIPHERAL */
 
 	if (role == BLE_GAP_ROLE_INVALID) {
 		return BLE_ERROR_INVALID_CONN_HANDLE;
@@ -860,7 +860,7 @@ uint32_t smd_params_reply(uint16_t conn_handle, ble_gap_sec_params_t *sec_params
 			/* NULL params means reject pairing. */
 			sec_status = BLE_GAP_SEC_STATUS_PAIRING_NOT_SUPP;
 		} else {
-#ifdef BLE_GAP_ROLE_PERIPH
+#if defined(CONFIG_SOFTDEVICE_PERIPHERAL)
 			if ((im_peer_id_get_by_conn_handle(conn_handle) != PM_PEER_ID_INVALID) &&
 			    (role == BLE_GAP_ROLE_PERIPH) && !allow_repairing(conn_handle)) {
 				/* Bond already exists. Reject the pairing request if the user
@@ -872,7 +872,7 @@ uint32_t smd_params_reply(uint16_t conn_handle, ble_gap_sec_params_t *sec_params
 					sec_status = BLE_GAP_SEC_STATUS_PAIRING_NOT_SUPP;
 				}
 			}
-#endif /* BLE_GAP_ROLE_PERIPH */
+#endif /* CONFIG_SOFTDEVICE_PERIPHERAL */
 
 			if (!sec_params->bond) {
 				/* Pairing, no bonding. */
@@ -890,9 +890,9 @@ uint32_t smd_params_reply(uint16_t conn_handle, ble_gap_sec_params_t *sec_params
 		 * opportunity to change the parameters and retry the call.
 		 */
 		ble_gap_sec_params_t *aux_sec_params = NULL;
-#ifdef BLE_GAP_ROLE_PERIPH
+#if defined(CONFIG_SOFTDEVICE_PERIPHERAL)
 		aux_sec_params = (role == BLE_GAP_ROLE_PERIPH) ? sec_params : NULL;
-#endif /* BLE_GAP_ROLE_PERIPH */
+#endif /* CONFIG_SOFTDEVICE_PERIPHERAL */
 
 		err_code = sd_ble_gap_sec_params_reply(conn_handle, sec_status, aux_sec_params,
 						       &sec_keyset);
@@ -914,10 +914,10 @@ uint32_t smd_link_secure(uint16_t conn_handle, ble_gap_sec_params_t *sec_params,
 		return link_secure_central(conn_handle, sec_params, force_repairing);
 #endif /* CONFIG_SOFTDEVICE_CENTRAL */
 
-#ifdef BLE_GAP_ROLE_PERIPH
+#if defined(CONFIG_SOFTDEVICE_PERIPHERAL)
 	case BLE_GAP_ROLE_PERIPH:
 		return link_secure_peripheral(conn_handle, sec_params);
-#endif /* BLE_GAP_ROLE_PERIPH */
+#endif /* CONFIG_SOFTDEVICE_PERIPHERAL */
 
 	default:
 		return BLE_ERROR_INVALID_CONN_HANDLE;
@@ -935,11 +935,11 @@ void smd_ble_evt_handler(const ble_evt_t *ble_evt)
 		sec_params_request_process(&(ble_evt->evt.gap_evt));
 		break;
 
-#ifdef BLE_GAP_ROLE_PERIPH
+#if defined(CONFIG_SOFTDEVICE_PERIPHERAL)
 	case BLE_GAP_EVT_SEC_INFO_REQUEST:
 		sec_info_request_process(&(ble_evt->evt.gap_evt));
 		break;
-#endif /* BLE_GAP_ROLE_PERIPH */
+#endif /* CONFIG_SOFTDEVICE_PERIPHERAL */
 
 #if defined(CONFIG_SOFTDEVICE_CENTRAL)
 	case BLE_GAP_EVT_SEC_REQUEST: