Merge pull request #9907 from pan-/fix-cordio-conf

BLE - Fix cordio configuration

features/FEATURE_BLE/source/generic/GenericGap.tpp

@@ -1465,6 +1465,11 @@ ble_error_t GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEve
 #if BLE_ROLE_OBSERVER
     _scan_timeout.detach();
 #endif
+
+    if (_deprecated_scan_api_used == true) {
+    	return BLE_ERROR_NONE;
+    }
+
 #if BLE_FEATURE_EXTENDED_ADVERTISING
     if (is_extended_advertising_available()) {
         /* stop all advertising sets */

features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp

@@ -394,10 +394,8 @@ void BLE::stack_setup()
 
     WsfTimerInit();
 
-#if BLE_FEATURE_SECURITY
+    // Note: SecInit required for RandInit.
     SecInit();
-#endif
-
     SecRandInit();
 
 #if BLE_FEATURE_SECURITY
@@ -519,11 +517,14 @@ void BLE::stack_setup()
     DmConnRegister(DM_CLIENT_ID_APP, BLE::device_manager_cb);
 #endif
 
+#if BLE_FEATURE_GATT_SERVER
+    AttConnRegister(BLE::connection_handler);
+#endif
+
 #if BLE_FEATURE_ATT
 #if BLE_FEATURE_GATT_CLIENT
     AttRegister((attCback_t) ble::pal::vendor::cordio::CordioAttClient::att_client_handler);
 #else
-    AttConnRegister(BLE::connection_handler);
     AttRegister((attCback_t) ble::vendor::cordio::GattServer::att_cb);
 #endif // BLE_FEATURE_GATT_CLIENT
 #endif