Fix some rebasing quirks

Author: Donatien Garnier

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xGap.cpp

@@ -79,7 +79,7 @@ peer_address_type_t convert_nordic_address(uint8_t address) {
 }
 
 peer_address_type_t convert_identity_address(advertising_peer_address_type_t address) {
-    if (address == advertising_peer_address_type_t::PUBLIC) {
+    if (address == advertising_peer_address_type_t::PUBLIC_ADDRESS) {
         return peer_address_type_t::PUBLIC_IDENTITY;
     } else {
         return peer_address_type_t::RANDOM_STATIC_IDENTITY;

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xPalSecurityManager.cpp

@@ -988,10 +988,10 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
                         );
 
                         advertising_peer_address_type_t
-                            address_type(advertising_peer_address_type_t::PUBLIC);
+                            address_type(advertising_peer_address_type_t::PUBLIC_ADDRESS);
 
                         if (pairing_cb->peer_id_key.id_addr_info.addr_type) {
-                            address_type = advertising_peer_address_type_t::RANDOM;
+                            address_type = advertising_peer_address_type_t::RANDOM_ADDRESS;
                         }
 
                         handler->on_keys_distributed_bdaddr(

targets/targets.json

@@ -4124,7 +4124,7 @@
             "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""
         ],
         "MERGE_BOOTLOADER": false,
-        "extra_labels": ["NORDIC", "MCU_NRF51", "MCU_NRF51822", "CORDIO", "CORDIO_LL"],
+        "extra_labels": ["NORDIC", "MCU_NRF51", "MCU_NRF51822"],
         "OUTPUT_EXT": "hex",
         "is_disk_virtual": true,
         "supported_toolchains": ["ARM", "GCC_ARM"],
@@ -6319,9 +6319,7 @@
             "MCU_NRF51822_UNIFIED",
             "NRF5x",
             "NRF51",
-            "SDK_11",
-            "CORDIO",
-            "CORDIO_LL"
+            "SDK_11"
         ],
         "OUTPUT_EXT": "hex",
         "is_disk_virtual": true,