Skip to content

Commit ddedff7

Browse files
sjanckartben
sjanc
authored and
kartben
committed
tests: bluetooth: tester: Add helper for supported commands response
This makes sure that supported commands are reported correctly. Signed-off-by: Szymon Janc <[email protected]>
1 parent b2b7a7a commit ddedff7

22 files changed

+76
-442
lines changed

‎tests/bluetooth/tester/src/audio/btp_aics.c

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,8 @@ static uint8_t aics_supported_commands(const void *cmd, uint16_t cmd_len, void *
3939
{
4040
struct btp_aics_read_supported_commands_rp *rp = rsp;
4141

42-
/* octet 0 */
43-
tester_set_bit(rp->data, BTP_AICS_READ_SUPPORTED_COMMANDS);
44-
tester_set_bit(rp->data, BTP_AICS_SET_GAIN);
45-
tester_set_bit(rp->data, BTP_AICS_MUTE);
46-
tester_set_bit(rp->data, BTP_AICS_UNMUTE);
47-
tester_set_bit(rp->data, BTP_AICS_MAN_GAIN_SET);
48-
tester_set_bit(rp->data, BTP_AICS_AUTO_GAIN_SET);
49-
tester_set_bit(rp->data, BTP_AICS_SET_MAN_GAIN_ONLY);
50-
51-
/* octet 1 */
52-
tester_set_bit(rp->data, BTP_AICS_SET_AUTO_GAIN_ONLY);
53-
tester_set_bit(rp->data, BTP_AICS_AUDIO_DESCRIPTION_SET);
54-
tester_set_bit(rp->data, BTP_AICS_MUTE_DISABLE);
55-
tester_set_bit(rp->data, BTP_AICS_GAIN_SETTING_PROP_GET);
56-
tester_set_bit(rp->data, BTP_AICS_TYPE_GET);
57-
tester_set_bit(rp->data, BTP_AICS_STATUS_GET);
58-
tester_set_bit(rp->data, BTP_AICS_STATE_GET);
59-
60-
/* octet 2 */
61-
tester_set_bit(rp->data, BTP_AICS_DESCRIPTION_GET);
62-
63-
*rsp_len = sizeof(*rp) + 2;
42+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_AICS, rp->data);
43+
*rsp_len += sizeof(*rp);
6444

6545
return BTP_STATUS_SUCCESS;
6646
}

‎tests/bluetooth/tester/src/audio/btp_bap.c

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ static uint8_t btp_ascs_supported_commands(const void *cmd, uint16_t cmd_len,
6565
{
6666
struct btp_ascs_read_supported_commands_rp *rp = rsp;
6767

68-
/* octet 0 */
69-
tester_set_bit(rp->data, BTP_ASCS_READ_SUPPORTED_COMMANDS);
70-
71-
*rsp_len = sizeof(*rp) + 1;
68+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_ASCS, rp->data);
69+
*rsp_len += sizeof(*rp);
7270

7371
return BTP_STATUS_SUCCESS;
7472
}
@@ -196,14 +194,8 @@ static uint8_t pacs_supported_commands(const void *cmd, uint16_t cmd_len,
196194
{
197195
struct btp_pacs_read_supported_commands_rp *rp = rsp;
198196

199-
/* octet 0 */
200-
tester_set_bit(rp->data, BTP_PACS_READ_SUPPORTED_COMMANDS);
201-
tester_set_bit(rp->data, BTP_PACS_UPDATE_CHARACTERISTIC);
202-
tester_set_bit(rp->data, BTP_PACS_SET_LOCATION);
203-
tester_set_bit(rp->data, BTP_PACS_SET_AVAILABLE_CONTEXTS);
204-
tester_set_bit(rp->data, BTP_PACS_SET_SUPPORTED_CONTEXTS);
205-
206-
*rsp_len = sizeof(*rp) + 1;
197+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_PACS, rp->data);
198+
*rsp_len += sizeof(*rp);
207199

208200
return BTP_STATUS_SUCCESS;
209201
}
@@ -330,12 +322,8 @@ static uint8_t btp_bap_supported_commands(const void *cmd, uint16_t cmd_len,
330322
{
331323
struct btp_bap_read_supported_commands_rp *rp = rsp;
332324

333-
/* octet 0 */
334-
tester_set_bit(rp->data, BTP_BAP_READ_SUPPORTED_COMMANDS);
335-
tester_set_bit(rp->data, BTP_BAP_DISCOVER);
336-
tester_set_bit(rp->data, BTP_BAP_SEND);
337-
338-
*rsp_len = sizeof(*rp) + 1;
325+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_BAP, rp->data);
326+
*rsp_len += sizeof(*rp);
339327

340328
return BTP_STATUS_SUCCESS;
341329
}

‎tests/bluetooth/tester/src/audio/btp_cap.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,8 @@ static uint8_t btp_cap_supported_commands(const void *cmd, uint16_t cmd_len,
173173
{
174174
struct btp_cap_read_supported_commands_rp *rp = rsp;
175175

176-
/* octet 0 */
177-
tester_set_bit(rp->data, BTP_CAP_READ_SUPPORTED_COMMANDS);
178-
tester_set_bit(rp->data, BTP_CAP_DISCOVER);
179-
180-
*rsp_len = sizeof(*rp) + 1;
176+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CAP, rp->data);
177+
*rsp_len += sizeof(*rp);
181178

182179
return BTP_STATUS_SUCCESS;
183180
}

‎tests/bluetooth/tester/src/audio/btp_cas.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@ static uint8_t cas_supported_commands(const void *cmd, uint16_t cmd_len,
2222
{
2323
struct btp_cas_read_supported_commands_rp *rp = rsp;
2424

25-
/* octet 0 */
26-
tester_set_bit(rp->data, BTP_CAS_READ_SUPPORTED_COMMANDS);
27-
tester_set_bit(rp->data, BTP_CAS_SET_MEMBER_LOCK);
28-
tester_set_bit(rp->data, BTP_CAS_GET_MEMBER_RSI);
29-
30-
*rsp_len = sizeof(*rp) + 1;
25+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CAS, rp->data);
26+
*rsp_len += sizeof(*rp);
3127

3228
return BTP_STATUS_SUCCESS;
3329
}

‎tests/bluetooth/tester/src/audio/btp_ccp.c

Lines changed: 4 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -28,38 +28,8 @@ static uint8_t ccp_supported_commands(const void *cmd, uint16_t cmd_len,
2828
{
2929
struct btp_ccp_read_supported_commands_rp *rp = rsp;
3030

31-
/* octet 0 */
32-
tester_set_bit(rp->data, BTP_CCP_READ_SUPPORTED_COMMANDS);
33-
tester_set_bit(rp->data, BTP_CCP_DISCOVER_TBS);
34-
tester_set_bit(rp->data, BTP_CCP_ACCEPT_CALL);
35-
tester_set_bit(rp->data, BTP_CCP_TERMINATE_CALL);
36-
tester_set_bit(rp->data, BTP_CCP_ORIGINATE_CALL);
37-
tester_set_bit(rp->data, BTP_CCP_READ_CALL_STATE);
38-
tester_set_bit(rp->data, BTP_CCP_READ_BEARER_NAME);
39-
40-
/* octet 1 */
41-
tester_set_bit(rp->data, BTP_CCP_READ_BEARER_UCI);
42-
tester_set_bit(rp->data, BTP_CCP_READ_BEARER_TECH);
43-
tester_set_bit(rp->data, BTP_CCP_READ_URI_LIST);
44-
tester_set_bit(rp->data, BTP_CCP_READ_SIGNAL_STRENGTH);
45-
tester_set_bit(rp->data, BTP_CCP_READ_SIGNAL_INTERVAL);
46-
tester_set_bit(rp->data, BTP_CCP_READ_CURRENT_CALLS);
47-
tester_set_bit(rp->data, BTP_CCP_READ_CCID);
48-
49-
/* octet 2 */
50-
tester_set_bit(rp->data, BTP_CCP_READ_CALL_URI);
51-
tester_set_bit(rp->data, BTP_CCP_READ_STATUS_FLAGS);
52-
tester_set_bit(rp->data, BTP_CCP_READ_OPTIONAL_OPCODES);
53-
tester_set_bit(rp->data, BTP_CCP_READ_FRIENDLY_NAME);
54-
tester_set_bit(rp->data, BTP_CCP_READ_REMOTE_URI);
55-
tester_set_bit(rp->data, BTP_CCP_SET_SIGNAL_INTERVAL);
56-
tester_set_bit(rp->data, BTP_CCP_HOLD_CALL);
57-
58-
/* octet 3 */
59-
tester_set_bit(rp->data, BTP_CCP_RETRIEVE_CALL);
60-
tester_set_bit(rp->data, BTP_CCP_JOIN_CALLS);
61-
62-
*rsp_len = sizeof(*rp) + 1;
31+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CCP, rp->data);
32+
*rsp_len += sizeof(*rp);
6333

6434
return BTP_STATUS_SUCCESS;
6535
}
@@ -886,21 +856,8 @@ static uint8_t tbs_supported_commands(const void *cmd, uint16_t cmd_len, void *r
886856
{
887857
struct btp_tbs_read_supported_commands_rp *rp = rsp;
888858

889-
/* octet 0 */
890-
tester_set_bit(rp->data, BTP_TBS_READ_SUPPORTED_COMMANDS);
891-
tester_set_bit(rp->data, BTP_TBS_REMOTE_INCOMING);
892-
tester_set_bit(rp->data, BTP_TBS_HOLD);
893-
tester_set_bit(rp->data, BTP_TBS_SET_BEARER_NAME);
894-
tester_set_bit(rp->data, BTP_TBS_SET_TECHNOLOGY);
895-
tester_set_bit(rp->data, BTP_TBS_SET_URI_SCHEME);
896-
tester_set_bit(rp->data, BTP_TBS_SET_STATUS_FLAGS);
897-
898-
/* octet 1 */
899-
tester_set_bit(rp->data, BTP_TBS_REMOTE_HOLD);
900-
tester_set_bit(rp->data, BTP_TBS_ORIGINATE);
901-
tester_set_bit(rp->data, BTP_TBS_SET_SIGNAL_STRENGTH);
902-
903-
*rsp_len = sizeof(*rp) + 2;
859+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_TBS, rp->data);
860+
*rsp_len += sizeof(*rp);
904861

905862
return BTP_STATUS_SUCCESS;
906863
}

‎tests/bluetooth/tester/src/audio/btp_csip.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,8 @@ static uint8_t btp_csip_supported_commands(const void *cmd, uint16_t cmd_len,
2323
{
2424
struct btp_csip_read_supported_commands_rp *rp = rsp;
2525

26-
/* octet 0 */
27-
tester_set_bit(rp->data, BTP_CSIP_READ_SUPPORTED_COMMANDS);
28-
tester_set_bit(rp->data, BTP_CSIP_DISCOVER);
29-
tester_set_bit(rp->data, BTP_CSIP_START_ORDERED_ACCESS);
30-
tester_set_bit(rp->data, BTP_CSIP_SET_COORDINATOR_LOCK);
31-
tester_set_bit(rp->data, BTP_CSIP_SET_COORDINATOR_RELEASE);
32-
33-
*rsp_len = sizeof(*rp) + 1;
26+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CSIP, rp->data);
27+
*rsp_len += sizeof(*rp);
3428

3529
return BTP_STATUS_SUCCESS;
3630
}

‎tests/bluetooth/tester/src/audio/btp_csis.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,8 @@ static uint8_t csis_supported_commands(const void *cmd, uint16_t cmd_len,
2424
{
2525
struct btp_csis_read_supported_commands_rp *rp = rsp;
2626

27-
/* octet 0 */
28-
tester_set_bit(rp->data, BTP_CSIS_READ_SUPPORTED_COMMANDS);
29-
tester_set_bit(rp->data, BTP_CSIS_SET_MEMBER_LOCK);
30-
tester_set_bit(rp->data, BTP_CSIS_GET_MEMBER_RSI);
31-
tester_set_bit(rp->data, BTP_CSIS_ENC_SIRK_TYPE);
32-
33-
*rsp_len = sizeof(*rp) + 1;
27+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CSIS, rp->data);
28+
*rsp_len += sizeof(*rp);
3429

3530
return BTP_STATUS_SUCCESS;
3631
}

‎tests/bluetooth/tester/src/audio/btp_hap.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,8 @@ static uint8_t read_supported_commands(const void *cmd, uint16_t cmd_len, void *
2323
{
2424
struct btp_hap_read_supported_commands_rp *rp = rsp;
2525

26-
tester_set_bit(rp->data, BTP_HAP_READ_SUPPORTED_COMMANDS);
27-
tester_set_bit(rp->data, BTP_HAP_HA_INIT);
28-
tester_set_bit(rp->data, BTP_HAP_HAUC_INIT);
29-
tester_set_bit(rp->data, BTP_HAP_IAC_INIT);
30-
tester_set_bit(rp->data, BTP_HAP_IAC_DISCOVER);
31-
tester_set_bit(rp->data, BTP_HAP_IAC_SET_ALERT);
32-
tester_set_bit(rp->data, BTP_HAP_HAUC_DISCOVER);
33-
34-
*rsp_len = sizeof(*rp) + 1;
26+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_HAP, rp->data);
27+
*rsp_len += sizeof(*rp);
3528

3629
return BTP_STATUS_SUCCESS;
3730
}

‎tests/bluetooth/tester/src/audio/btp_has.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,8 @@ static uint8_t has_supported_commands(const void *cmd, uint16_t cmd_len,
2121
{
2222
struct btp_has_read_supported_commands_rp *rp = rsp;
2323

24-
tester_set_bit(rp->data, BTP_HAS_READ_SUPPORTED_COMMANDS);
25-
tester_set_bit(rp->data, BTP_HAS_SET_ACTIVE_INDEX);
26-
tester_set_bit(rp->data, BTP_HAS_SET_PRESET_NAME);
27-
tester_set_bit(rp->data, BTP_HAS_REMOVE_PRESET);
28-
tester_set_bit(rp->data, BTP_HAS_ADD_PRESET);
29-
tester_set_bit(rp->data, BTP_HAS_SET_PROPERTIES);
30-
31-
*rsp_len = sizeof(*rp) + 1;
24+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_HAS, rp->data);
25+
*rsp_len += sizeof(*rp);
3226

3327
return BTP_STATUS_SUCCESS;
3428
}

‎tests/bluetooth/tester/src/audio/btp_mcp.c

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -662,40 +662,8 @@ static uint8_t mcp_supported_commands(const void *cmd, uint16_t cmd_len, void *r
662662
{
663663
struct btp_mcp_read_supported_commands_rp *rp = rsp;
664664

665-
/* octet 0 */
666-
tester_set_bit(rp->data, BTP_MCP_READ_SUPPORTED_COMMANDS);
667-
tester_set_bit(rp->data, BTP_MCP_DISCOVER);
668-
tester_set_bit(rp->data, BTP_MCP_TRACK_DURATION_READ);
669-
tester_set_bit(rp->data, BTP_MCP_TRACK_POSITION_READ);
670-
tester_set_bit(rp->data, BTP_MCP_TRACK_POSITION_SET);
671-
tester_set_bit(rp->data, BTP_MCP_PLAYBACK_SPEED_READ);
672-
tester_set_bit(rp->data, BTP_MCP_PLAYBACK_SPEED_SET);
673-
674-
/* octet 1 */
675-
tester_set_bit(rp->data, BTP_MCP_SEEKING_SPEED_READ);
676-
tester_set_bit(rp->data, BTP_MCP_ICON_OBJ_ID_READ);
677-
tester_set_bit(rp->data, BTP_MCP_NEXT_TRACK_OBJ_ID_READ);
678-
tester_set_bit(rp->data, BTP_MCP_NEXT_TRACK_OBJ_ID_SET);
679-
tester_set_bit(rp->data, BTP_MCP_PARENT_GROUP_OBJ_ID_READ);
680-
tester_set_bit(rp->data, BTP_MCP_CURRENT_GROUP_OBJ_ID_READ);
681-
tester_set_bit(rp->data, BTP_MCP_CURRENT_GROUP_OBJ_ID_SET);
682-
683-
/* octet 2 */
684-
tester_set_bit(rp->data, BTP_MCP_PLAYING_ORDER_READ);
685-
tester_set_bit(rp->data, BTP_MCP_PLAYING_ORDER_SET);
686-
tester_set_bit(rp->data, BTP_MCP_PLAYING_ORDERS_SUPPORTED_READ);
687-
tester_set_bit(rp->data, BTP_MCP_MEDIA_STATE_READ);
688-
tester_set_bit(rp->data, BTP_MCP_OPCODES_SUPPORTED_READ);
689-
tester_set_bit(rp->data, BTP_MCP_CONTENT_CONTROL_ID_READ);
690-
tester_set_bit(rp->data, BTP_MCP_SEGMENTS_OBJ_ID_READ);
691-
692-
/* octet 3 */
693-
tester_set_bit(rp->data, BTP_MCP_CURRENT_TRACK_OBJ_ID_READ);
694-
tester_set_bit(rp->data, BTP_MCP_CURRENT_TRACK_OBJ_ID_SET);
695-
tester_set_bit(rp->data, BTP_MCP_CMD_SEND);
696-
tester_set_bit(rp->data, BTP_MCP_CMD_SEARCH);
697-
698-
*rsp_len = sizeof(*rp) + 1;
665+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_MCP, rp->data);
666+
*rsp_len += sizeof(*rp);
699667

700668
return BTP_STATUS_SUCCESS;
701669
}
@@ -1462,15 +1430,8 @@ static uint8_t mcs_supported_commands(const void *cmd, uint16_t cmd_len, void *r
14621430
{
14631431
struct btp_mcs_read_supported_commands_rp *rp = rsp;
14641432

1465-
/* octet 0 */
1466-
tester_set_bit(rp->data, BTP_MCS_READ_SUPPORTED_COMMANDS);
1467-
tester_set_bit(rp->data, BTP_MCS_CMD_SEND);
1468-
tester_set_bit(rp->data, BTP_MCS_CURRENT_TRACK_OBJ_ID_GET);
1469-
tester_set_bit(rp->data, BTP_MCS_NEXT_TRACK_OBJ_ID_GET);
1470-
tester_set_bit(rp->data, BTP_MCS_INACTIVE_STATE_SET);
1471-
tester_set_bit(rp->data, BTP_MCS_PARENT_GROUP_SET);
1472-
1473-
*rsp_len = sizeof(*rp) + 1;
1433+
*rsp_len = tester_supported_commands(BTP_SERVICE_ID_GMCS, rp->data);
1434+
*rsp_len += sizeof(*rp);
14741435

14751436
return BTP_STATUS_SUCCESS;
14761437
}

0 commit comments

Comments
 (0)