bluetooth: tester: Use define for variable length BTP commands

This makes code a bit easier to follow.
This commit is contained in:
Krzysztof Kopyściński
2023-07-26 19:38:24 +02:00
committed by Szymon Janc
parent 6871cec5f6
commit e2065a6016
6 changed files with 33 additions and 28 deletions
+5
View File
@@ -77,6 +77,11 @@ tester_rsp_full(uint8_t service, uint8_t opcode, const void *rsp, size_t len);
void void
tester_event(uint8_t service, uint8_t opcode, const void *data, size_t len); tester_event(uint8_t service, uint8_t opcode, const void *data, size_t len);
/* Used to indicate that command length is variable and that validation will
* be done in handler.
*/
#define BTP_HANDLER_LENGTH_VARIABLE (-1)
struct btp_handler { struct btp_handler {
uint8_t opcode; uint8_t opcode;
uint8_t index; uint8_t index;
+2 -2
View File
@@ -1801,7 +1801,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GAP_START_ADVERTISING, .opcode = BTP_GAP_START_ADVERTISING,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = start_advertising, .func = start_advertising,
}, },
{ {
@@ -1886,7 +1886,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GAP_SET_FILTER_ACCEPT_LIST, .opcode = BTP_GAP_SET_FILTER_ACCEPT_LIST,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = set_filter_accept_list, .func = set_filter_accept_list,
}, },
}; };
+10 -10
View File
@@ -1918,7 +1918,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GATT_DISC_PRIM_UUID, .opcode = BTP_GATT_DISC_PRIM_UUID,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_prim_uuid, .func = disc_prim_uuid,
}, },
{ {
@@ -1933,7 +1933,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GATT_DISC_CHRC_UUID, .opcode = BTP_GATT_DISC_CHRC_UUID,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_chrc_uuid, .func = disc_chrc_uuid,
}, },
{ {
@@ -1953,7 +1953,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GATT_READ_UUID, .opcode = BTP_GATT_READ_UUID,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_uuid, .func = read_uuid,
}, },
{ {
@@ -1963,34 +1963,34 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GATT_READ_MULTIPLE, .opcode = BTP_GATT_READ_MULTIPLE,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_multiple, .func = read_multiple,
}, },
{ {
.opcode = BTP_GATT_WRITE_WITHOUT_RSP, .opcode = BTP_GATT_WRITE_WITHOUT_RSP,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_without_rsp, .func = write_without_rsp,
}, },
#if 0 #if 0
{ {
.opcode = BTP_GATT_SIGNED_WRITE_WITHOUT_RSP, .opcode = BTP_GATT_SIGNED_WRITE_WITHOUT_RSP,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_signed_without_rsp, .func = write_signed_without_rsp,
}, },
#endif #endif
{ {
.opcode = BTP_GATT_WRITE, .opcode = BTP_GATT_WRITE,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_data, .func = write_data,
}, },
{ {
.opcode = BTP_GATT_WRITE_LONG, .opcode = BTP_GATT_WRITE_LONG,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_long, .func = write_long,
}, },
{ {
.opcode = BTP_GATT_RELIABLE_WRITE, .opcode = BTP_GATT_RELIABLE_WRITE,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = reliable_write, .func = reliable_write,
}, },
{ {
@@ -2005,7 +2005,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GATT_GET_ATTRIBUTES, .opcode = BTP_GATT_GET_ATTRIBUTES,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = get_attrs, .func = get_attrs,
}, },
{ {
+9 -9
View File
@@ -1459,7 +1459,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GATTC_DISC_PRIM_UUID, .opcode = BTP_GATTC_DISC_PRIM_UUID,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_prim_uuid, .func = disc_prim_uuid,
}, },
{ {
@@ -1474,7 +1474,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GATTC_DISC_CHRC_UUID, .opcode = BTP_GATTC_DISC_CHRC_UUID,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_chrc_uuid, .func = disc_chrc_uuid,
}, },
{ {
@@ -1489,7 +1489,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GATTC_READ_UUID, .opcode = BTP_GATTC_READ_UUID,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_uuid, .func = read_uuid,
}, },
{ {
@@ -1499,34 +1499,34 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_GATTC_READ_MULTIPLE, .opcode = BTP_GATTC_READ_MULTIPLE,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_multiple, .func = read_multiple,
}, },
{ {
.opcode = BTP_GATTC_WRITE_WITHOUT_RSP, .opcode = BTP_GATTC_WRITE_WITHOUT_RSP,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_without_rsp, .func = write_without_rsp,
}, },
#if 0 #if 0
{ {
.opcode = BTP_GATTC_SIGNED_WRITE_WITHOUT_RSP, .opcode = BTP_GATTC_SIGNED_WRITE_WITHOUT_RSP,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_signed_without_rsp, .func = write_signed_without_rsp,
}, },
#endif #endif
{ {
.opcode = BTP_GATTC_WRITE, .opcode = BTP_GATTC_WRITE,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write, .func = write,
}, },
{ {
.opcode = BTP_GATTC_WRITE_LONG, .opcode = BTP_GATTC_WRITE_LONG,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_long, .func = write_long,
}, },
{ {
.opcode = BTP_GATTC_RELIABLE_WRITE, .opcode = BTP_GATTC_RELIABLE_WRITE,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = reliable_write, .func = reliable_write,
}, },
{ {
+2 -2
View File
@@ -727,7 +727,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_L2CAP_SEND_DATA, .opcode = BTP_L2CAP_SEND_DATA,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = send_data, .func = send_data,
}, },
{ {
@@ -737,7 +737,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_L2CAP_RECONFIGURE, .opcode = BTP_L2CAP_RECONFIGURE,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = reconfigure, .func = reconfigure,
}, },
{ {
+5 -5
View File
@@ -837,12 +837,12 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_MESH_CONFIG_PROVISIONING, .opcode = BTP_MESH_CONFIG_PROVISIONING,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = config_prov, .func = config_prov,
}, },
{ {
.opcode = BTP_MESH_PROVISION_NODE, .opcode = BTP_MESH_PROVISION_NODE,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = provision_node, .func = provision_node,
}, },
{ {
@@ -862,7 +862,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_MESH_INPUT_STRING, .opcode = BTP_MESH_INPUT_STRING,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = input_string, .func = input_string,
}, },
{ {
@@ -887,7 +887,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_MESH_NET_SEND, .opcode = BTP_MESH_NET_SEND,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = net_send, .func = net_send,
}, },
{ {
@@ -902,7 +902,7 @@ static const struct btp_handler handlers[] = {
}, },
{ {
.opcode = BTP_MESH_MODEL_SEND, .opcode = BTP_MESH_MODEL_SEND,
.expect_len = -1, .expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = model_send, .func = model_send,
}, },
{ {