tests: bluetooth: audio: fix bsim timing

move extending advertising start after periodic adv.

Signed-off-by: Lingao Meng <[email protected]>

Author: LingaoM

subsys/bluetooth/host/adv.c

@@ -1509,14 +1509,14 @@ int bt_le_ext_adv_start(struct bt_le_ext_adv *adv,
 	if (atomic_test_bit(adv->flags, BT_ADV_CONNECTABLE)) {
 		if (IS_ENABLED(CONFIG_BT_PRIVACY) &&
 		    !atomic_test_bit(adv->flags, BT_ADV_USE_IDENTITY) &&
-		    (atomic_test_bit(adv->flags, BT_PER_ADV_ENABLED) ||
-		     !atomic_test_and_clear_bit(adv->flags, BT_ADV_RANDOM_ADDR_UPDATED))) {
+		    (!atomic_test_and_clear_bit(adv->flags, BT_ADV_RANDOM_ADDR_UPDATED) ||
+		     atomic_test_bit(adv->flags, BT_PER_ADV_ENABLED))) {
 			bt_id_set_adv_private_addr(adv);
 		}
 	} else {
 		if (!atomic_test_bit(adv->flags, BT_ADV_USE_IDENTITY) &&
-		    (atomic_test_bit(adv->flags, BT_PER_ADV_ENABLED) ||
-		     !atomic_test_and_clear_bit(adv->flags, BT_ADV_RANDOM_ADDR_UPDATED))) {
+		    (!atomic_test_and_clear_bit(adv->flags, BT_ADV_RANDOM_ADDR_UPDATED) ||
+		     atomic_test_bit(adv->flags, BT_PER_ADV_ENABLED))) {
 			bt_id_set_adv_private_addr(adv);
 		}
 	}

tests/bsim/bluetooth/audio/src/common.c

@@ -264,20 +264,20 @@ void start_broadcast_adv(struct bt_le_ext_adv *adv)
 		return;
 	}
 
-	if (info.ext_adv_state == BT_LE_EXT_ADV_STATE_DISABLED) {
-		/* Start extended advertising */
-		err = bt_le_ext_adv_start(adv, BT_LE_EXT_ADV_START_DEFAULT);
+	if (info.per_adv_state == BT_LE_PER_ADV_STATE_DISABLED) {
+		/* Enable Periodic Advertising */
+		err = bt_le_per_adv_start(adv);
 		if (err != 0) {
-			FAIL("Failed to start extended advertising: %d\n", err);
+			FAIL("Failed to enable periodic advertising: %d\n", err);
 			return;
 		}
 	}
 
-	if (info.per_adv_state == BT_LE_PER_ADV_STATE_DISABLED) {
-		/* Enable Periodic Advertising */
-		err = bt_le_per_adv_start(adv);
+	if (info.ext_adv_state == BT_LE_EXT_ADV_STATE_DISABLED) {
+		/* Start extended advertising */
+		err = bt_le_ext_adv_start(adv, BT_LE_EXT_ADV_START_DEFAULT);
 		if (err != 0) {
-			FAIL("Failed to enable periodic advertising: %d\n", err);
+			FAIL("Failed to start extended advertising: %d\n", err);
 			return;
 		}
 	}