applications: nrf5340_audio: Use static address when privacy=n

- Add BT_LE_ADV_OPT_USE_IDENTITY when BT_PRIVACY=n
- This ensures a static address for debugging/testing purposes
- Removed old method of reading out FICR to set static addr manually
- OCT-3152

Signed-off-by: Alexander Svensen <[email protected]>

Author: alexsven

applications/nrf5340_audio/src/bluetooth/bt_management/advertising/bt_mgmt_adv.c

@@ -437,6 +437,14 @@ int bt_mgmt_adv_start(uint8_t ext_adv_index, const struct bt_data *adv, size_t a
 	per_adv_local[ext_adv_index] = per_adv;
 	per_adv_local_size[ext_adv_index] = per_adv_size;
 
+	/* Only use fixed address if no privacy and it is the first ext adv set */
+	if (!IS_ENABLED(CONFIG_BT_PRIVACY) && ext_adv_index == 0) {
+		ext_adv_param.options |= BT_LE_ADV_OPT_USE_IDENTITY;
+	} else {
+		/* If privacy is enabled, use RPA */
+		ext_adv_param.options &= ~BT_LE_ADV_OPT_USE_IDENTITY;
+	}
+
 	if (connectable) {
 		ret = bt_le_ext_adv_create(LE_AUDIO_EXTENDED_ADV_CONN_NAME, &adv_cb,
 					   &ext_adv[ext_adv_index]);

applications/nrf5340_audio/src/bluetooth/bt_management/bt_mgmt.c

@@ -231,42 +231,6 @@ static int bonding_clear_check(void)
 	return 0;
 }
 
-static int ficr_static_addr_set(void)
-{
-	int ret;
-	static bt_addr_le_t addr;
-
-	if ((NRF_FICR->INFO.DEVICEID[0] != UINT32_MAX) ||
-	    ((NRF_FICR->INFO.DEVICEID[1] & UINT16_MAX) != UINT16_MAX)) {
-		/* Put the device ID from FICR into address */
-		sys_put_le32(NRF_FICR->INFO.DEVICEID[0], &addr.a.val[0]);
-		sys_put_le16(NRF_FICR->INFO.DEVICEID[1], &addr.a.val[4]);
-
-		/* The FICR value is a just a random number, with no knowledge
-		 * of the Bluetooth Specification requirements for random
-		 * static addresses.
-		 */
-		BT_ADDR_SET_STATIC(&addr.a);
-
-		addr.type = BT_ADDR_LE_RANDOM;
-
-		ret = bt_id_create(&addr, NULL);
-		if (ret < 0) {
-			LOG_ERR("Failed to create ID %d", ret);
-			return ret;
-		}
-
-		return 0;
-	}
-
-	/* If no address can be created (e.g. based on
-	 * FICR), then a random address is created
-	 */
-	LOG_WRN("Unable to read from FICR");
-
-	return 0;
-}
-
 /* This function generates a random address for bonding testing */
 static int random_static_addr_set(void)
 {
@@ -373,13 +337,6 @@ int bt_mgmt_init(void)
 {
 	int ret;
 
-	if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
-		ret = ficr_static_addr_set();
-		if (ret) {
-			return ret;
-		}
-	}
-
 	ret = bt_enable(bt_enabled_cb);
 	if (ret) {
 		return ret;