bluetooth: tester: btp: refactors periodic adv selection

Takes in use IS_ENABLED as preferred way of guarding Kconfig option for
enabling periodic advertising api, CONFIG_BT_PER_ADV. It enables compiling
guarded code get warning/errors and not link it if not used.

Signed-off-by: Evgenii Kosenko <[email protected]>

Author: kedMertens

tests/bluetooth/tester/src/btp_gap.c

@@ -262,6 +262,7 @@ static uint8_t supported_commands(const void *cmd, uint16_t cmd_len,
 		tester_set_bit(rp->data, BTP_GAP_OOB_SC_GET_LOCAL_DATA);
 		tester_set_bit(rp->data, BTP_GAP_OOB_SC_SET_REMOTE_DATA);
 	}
+
 	tester_set_bit(rp->data, BTP_GAP_SET_MITM);
 	tester_set_bit(rp->data, BTP_GAP_SET_FILTER_LIST);
 	if (IS_ENABLED(CONFIG_BT_EXT_ADV)) {
@@ -528,6 +529,7 @@ struct bt_le_ext_adv *tester_gap_ext_adv_get(void)
 	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
 		return NULL;
 	}
+
 	return ext_adv;
 }
 
@@ -654,6 +656,7 @@ int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_ad
 		if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
 			return -EINVAL;
 		}
+
 		/* RPA usage is controlled via privacy settings */
 		if (!atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_PRIVACY)) {
 			return -EINVAL;
@@ -663,6 +666,7 @@ int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_ad
 		if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
 			return -EINVAL;
 		}
+
 		/* NRPA is used only for non-connectable advertising */
 		if (atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_CONNECTABLE)) {
 			return -EINVAL;
@@ -1403,12 +1407,14 @@ static uint8_t set_extended_advertising(const void *cmd, uint16_t cmd_len, void
 }
 #endif /* defined(CONFIG_BT_EXT_ADV) */
 
-#if defined(CONFIG_BT_PER_ADV)
-static struct bt_data padv[10];
 static struct bt_le_per_adv_sync *pa_sync;
 
 struct bt_le_per_adv_sync *tester_gap_padv_get(void)
 {
+	if (!IS_ENABLED(CONFIG_BT_PER_ADV)) {
+		return NULL;
+	}
+
 	return pa_sync;
 }
 
@@ -1453,6 +1459,9 @@ static struct bt_le_per_adv_sync_cb pa_sync_cb = {
 	.term = pa_sync_terminated_cb,
 };
 
+#if defined(CONFIG_BT_PER_ADV)
+static struct bt_data padv[10];
+
 int tester_gap_padv_configure(const struct bt_le_per_adv_param *param)
 {
 	int err;
@@ -1626,9 +1635,14 @@ static uint8_t padv_set_data(const void *cmd, uint16_t cmd_len,
 
 	return BTP_STATUS_VAL(err);
 }
+#endif /* defined(CONFIG_BT_PER_ADV) */
 
 int tester_gap_padv_create_sync(struct bt_le_per_adv_sync_param *create_params)
 {
+	if (!IS_ENABLED(CONFIG_BT_PER_ADV_SYNC)) {
+		return -ENOTSUP;
+	}
+
 	int err;
 
 	if (pa_sync != NULL) {
@@ -1646,6 +1660,10 @@ int tester_gap_padv_create_sync(struct bt_le_per_adv_sync_param *create_params)
 
 int tester_gap_padv_stop_sync(void)
 {
+	if (!IS_ENABLED(CONFIG_BT_PER_ADV_SYNC)) {
+		return -ENOTSUP;
+	}
+
 	int err;
 
 	if (pa_sync == NULL) {
@@ -1660,6 +1678,7 @@ int tester_gap_padv_stop_sync(void)
 	return err;
 }
 
+#if defined(CONFIG_BT_PER_ADV)
 static uint8_t padv_create_sync(const void *cmd, uint16_t cmd_len,
 				void *rsp, uint16_t *rsp_len)
 {
@@ -1685,39 +1704,6 @@ static uint8_t padv_create_sync(const void *cmd, uint16_t cmd_len,
 
 	return BTP_STATUS_VAL(err);
 }
-
-static uint8_t padv_sync_transfer_set_info(const void *cmd, uint16_t cmd_len,
-					   void *rsp, uint16_t *rsp_len)
-{
-	const struct btp_gap_padv_sync_transfer_set_info_cmd *cp = cmd;
-	(void)cp;
-
-	/* TODO */
-
-	return BTP_STATUS_FAILED;
-}
-
-static uint8_t padv_sync_transfer_start(const void *cmd, uint16_t cmd_len,
-					void *rsp, uint16_t *rsp_len)
-{
-	const struct btp_gap_padv_sync_transfer_start_cmd *cp = cmd;
-	(void)cp;
-
-	/* TODO */
-
-	return BTP_STATUS_FAILED;
-}
-
-static uint8_t padv_sync_transfer_recv(const void *cmd, uint16_t cmd_len,
-				       void *rsp, uint16_t *rsp_len)
-{
-	const struct btp_gap_padv_sync_transfer_recv_cmd *cp = cmd;
-	(void)cp;
-
-	/* TODO */
-
-	return BTP_STATUS_FAILED;
-}
 #endif /* defined(CONFIG_BT_PER_ADV) */
 
 static const struct btp_handler handlers[] = {
@@ -1882,21 +1868,6 @@ static const struct btp_handler handlers[] = {
 		.expect_len = sizeof(struct btp_gap_padv_create_sync_cmd),
 		.func = padv_create_sync,
 	},
-	{
-		.opcode = BTP_GAP_PADV_SYNC_TRANSFER_SET_INFO,
-		.expect_len = sizeof(struct btp_gap_padv_sync_transfer_set_info_cmd),
-		.func = padv_sync_transfer_set_info,
-	},
-	{
-		.opcode = BTP_GAP_PADV_SYNC_TRANSFER_START,
-		.expect_len = sizeof(struct btp_gap_padv_sync_transfer_start_cmd),
-		.func = padv_sync_transfer_start,
-	},
-	{
-		.opcode = BTP_GAP_PADV_SYNC_TRANSFER_RECV,
-		.expect_len = sizeof(struct btp_gap_padv_sync_transfer_recv_cmd),
-		.func = padv_sync_transfer_recv,
-	},
 #endif /* defined(CONFIG_BT_PER_ADV) */
 #endif /* defined(CONFIG_BT_EXT_ADV) */
 };
@@ -1930,9 +1901,9 @@ uint8_t tester_init_gap(void)
 	bt_conn_cb_register(&conn_callbacks);
 	bt_conn_auth_info_cb_register(&auth_info_cb);
 
-#if defined(CONFIG_BT_PER_ADV)
-	bt_le_per_adv_sync_cb_register(&pa_sync_cb);
-#endif /* defined(CONFIG_BT_PER_ADV) */
+	if (IS_ENABLED(CONFIG_BT_PER_ADV)) {
+		bt_le_per_adv_sync_cb_register(&pa_sync_cb);
+	}
 
 	tester_register_command_handlers(BTP_SERVICE_ID_GAP, handlers,
 					 ARRAY_SIZE(handlers));