espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-24 01:47:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

btp: Coding style fix for BTP handles

Browse Source 
Clang-format was flagging these structures as invalid.
This led to many failing CI's during PR process.

As there is no specific option in cf to enforce existing
style, change this to format that cf will accept.
This commit is contained in:
Szymon Czapracki
2026-08-12 14:52:20 +05:30
committed by Rahul Tank
parent 3befc22f96
commit 8d0d7e011d
8 changed files with 508 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/bttester/src/btp_bap.c
+50 -50
View File
@@ -397,65 +397,65 @@ broadcast_source_stop(const void *cmd, uint16_t cmd_len, void *rsp,
static const struct btp_handler handlers[] = {
{
.opcode = BTP_BAP_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
.opcode = BTP_BAP_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
{
.opcode = BTP_BAP_BROADCAST_SOURCE_SETUP,
.index = BTP_INDEX,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = broadcast_source_setup,
},
.opcode = BTP_BAP_BROADCAST_SOURCE_SETUP,
.index = BTP_INDEX,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = broadcast_source_setup,
},
{
.opcode = BTP_BAP_BROADCAST_SOURCE_RELEASE,
.index = BTP_INDEX,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = broadcast_source_release,
},
.opcode = BTP_BAP_BROADCAST_SOURCE_RELEASE,
.index = BTP_INDEX,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = broadcast_source_release,
},
{
.opcode = BTP_BAP_BROADCAST_ADV_START,
.index = BTP_INDEX,
.expect_len = sizeof(struct bap_bap_broadcast_adv_start_cmd),
.func = broadcast_adv_start,
},
.opcode = BTP_BAP_BROADCAST_ADV_START,
.index = BTP_INDEX,
.expect_len = sizeof(struct bap_bap_broadcast_adv_start_cmd),
.func = broadcast_adv_start,
},
{
.opcode = BTP_BAP_BROADCAST_ADV_STOP,
.index = BTP_INDEX,
.expect_len = sizeof(struct bap_bap_broadcast_adv_stop_cmd),
.func = broadcast_adv_stop,
},
.opcode = BTP_BAP_BROADCAST_ADV_STOP,
.index = BTP_INDEX,
.expect_len = sizeof(struct bap_bap_broadcast_adv_stop_cmd),
.func = broadcast_adv_stop,
},
{
.opcode = BTP_BAP_BROADCAST_SOURCE_START,
.index = BTP_INDEX,
.expect_len = sizeof(struct bap_bap_broadcast_source_start_cmd),
.func = broadcast_source_start,
},
.opcode = BTP_BAP_BROADCAST_SOURCE_START,
.index = BTP_INDEX,
.expect_len = sizeof(struct bap_bap_broadcast_source_start_cmd),
.func = broadcast_source_start,
},
{
.opcode = BTP_BAP_BROADCAST_SOURCE_STOP,
.index = BTP_INDEX,
.expect_len = sizeof(struct bap_bap_broadcast_source_stop_cmd),
.func = broadcast_source_stop,
},
.opcode = BTP_BAP_BROADCAST_SOURCE_STOP,
.index = BTP_INDEX,
.expect_len = sizeof(struct bap_bap_broadcast_source_stop_cmd),
.func = broadcast_source_stop,
},
{
.opcode = BTP_BAP_SET_BROADCAST_CODE,
.index = BTP_INDEX,
.expect_len = sizeof(struct btp_bap_set_broadcast_code_cmd),
.func = broadcast_code_set,
},
.opcode = BTP_BAP_SET_BROADCAST_CODE,
.index = BTP_INDEX,
.expect_len = sizeof(struct btp_bap_set_broadcast_code_cmd),
.func = broadcast_code_set,
},
{
.opcode = BTP_BAP_BROADCAST_SINK_SETUP,
.index = BTP_INDEX,
.expect_len = 0,
.func = broadcast_sink_setup,
},
.opcode = BTP_BAP_BROADCAST_SINK_SETUP,
.index = BTP_INDEX,
.expect_len = 0,
.func = broadcast_sink_setup,
},
{
.opcode = BTP_BAP_BROADCAST_SINK_STOP,
.index = BTP_INDEX,
.expect_len = sizeof(struct btp_bap_broadcast_sink_stop_cmd),
.func = broadcast_sink_stop,
},
.opcode = BTP_BAP_BROADCAST_SINK_STOP,
.index = BTP_INDEX,
.expect_len = sizeof(struct btp_bap_broadcast_sink_stop_cmd),
.func = broadcast_sink_stop,
},
};
#define BROADCAST_SINK_PA_SYNC_TIMEOUT_DEFAULT 0x07D0
apps/bttester/src/btp_core.c
+20 -20
View File
@@ -184,29 +184,29 @@ unregister_service(const void *cmd, uint16_t cmd_len,
static const struct btp_handler handlers[] = {
{
.opcode = BTP_CORE_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
.opcode = BTP_CORE_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
{
.opcode = BTP_CORE_READ_SUPPORTED_SERVICES,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_services,
},
.opcode = BTP_CORE_READ_SUPPORTED_SERVICES,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_services,
},
{
.opcode = BTP_CORE_REGISTER_SERVICE,
.index = BTP_INDEX_NONE,
.expect_len = sizeof(struct btp_core_register_service_cmd),
.func = register_service,
},
.opcode = BTP_CORE_REGISTER_SERVICE,
.index = BTP_INDEX_NONE,
.expect_len = sizeof(struct btp_core_register_service_cmd),
.func = register_service,
},
{
.opcode = BTP_CORE_UNREGISTER_SERVICE,
.index = BTP_INDEX_NONE,
.expect_len = sizeof(struct btp_core_unregister_service_cmd),
.func = unregister_service,
},
.opcode = BTP_CORE_UNREGISTER_SERVICE,
.index = BTP_INDEX_NONE,
.expect_len = sizeof(struct btp_core_unregister_service_cmd),
.func = unregister_service,
},
};
void
apps/bttester/src/btp_gap.c
+134 -135
View File
@@ -2272,180 +2272,179 @@ subrate_request(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
static const struct btp_handler handlers[] = {
{
.opcode = BTP_GAP_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
.opcode = BTP_GAP_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
{
.opcode = BTP_GAP_READ_CONTROLLER_INDEX_LIST,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = controller_index_list,
},
.opcode = BTP_GAP_READ_CONTROLLER_INDEX_LIST,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = controller_index_list,
},
{
.opcode = BTP_GAP_READ_CONTROLLER_INFO,
.expect_len = 0,
.func = controller_info,
},
.opcode = BTP_GAP_READ_CONTROLLER_INFO,
.expect_len = 0,
.func = controller_info,
},
{
.opcode = BTP_GAP_SET_CONNECTABLE,
.expect_len = sizeof(struct btp_gap_set_connectable_cmd),
.func = set_connectable,
},
.opcode = BTP_GAP_SET_CONNECTABLE,
.expect_len = sizeof(struct btp_gap_set_connectable_cmd),
.func = set_connectable,
},
{
.opcode = BTP_GAP_SET_DISCOVERABLE,
.expect_len = sizeof(struct btp_gap_set_discoverable_cmd),
.func = set_discoverable,
},
.opcode = BTP_GAP_SET_DISCOVERABLE,
.expect_len = sizeof(struct btp_gap_set_discoverable_cmd),
.func = set_discoverable,
},
{
.opcode = BTP_GAP_SET_BONDABLE,
.expect_len = sizeof(struct btp_gap_set_bondable_cmd),
.func = set_bondable,
},
.opcode = BTP_GAP_SET_BONDABLE,
.expect_len = sizeof(struct btp_gap_set_bondable_cmd),
.func = set_bondable,
},
{
.opcode = BTP_GAP_START_ADVERTISING,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = start_advertising,
},
.opcode = BTP_GAP_START_ADVERTISING,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = start_advertising,
},
{
.opcode = BTP_GAP_START_DIRECT_ADV,
.expect_len = sizeof(struct btp_gap_start_direct_adv_cmd),
.func = start_direct_adv,
},
.opcode = BTP_GAP_START_DIRECT_ADV,
.expect_len = sizeof(struct btp_gap_start_direct_adv_cmd),
.func = start_direct_adv,
},
{
.opcode = BTP_GAP_STOP_ADVERTISING,
.expect_len = 0,
.func = stop_advertising,
},
.opcode = BTP_GAP_STOP_ADVERTISING,
.expect_len = 0,
.func = stop_advertising,
},
{
.opcode = BTP_GAP_START_DISCOVERY,
.expect_len = sizeof(struct btp_gap_start_discovery_cmd),
.func = start_discovery,
},
.opcode = BTP_GAP_START_DISCOVERY,
.expect_len = sizeof(struct btp_gap_start_discovery_cmd),
.func = start_discovery,
},
{
.opcode = BTP_GAP_STOP_DISCOVERY,
.expect_len = 0,
.func = stop_discovery,
},
.opcode = BTP_GAP_STOP_DISCOVERY,
.expect_len = 0,
.func = stop_discovery,
},
{
.opcode = BTP_GAP_CONNECT,
.expect_len = sizeof(struct btp_gap_connect_cmd),
.func = connect,
},
.opcode = BTP_GAP_CONNECT,
.expect_len = sizeof(struct btp_gap_connect_cmd),
.func = connect,
},
{
.opcode = BTP_GAP_DISCONNECT,
.expect_len = sizeof(struct btp_gap_disconnect_cmd),
.func = disconnect,
},
.opcode = BTP_GAP_DISCONNECT,
.expect_len = sizeof(struct btp_gap_disconnect_cmd),
.func = disconnect,
},
{
.opcode = BTP_GAP_SET_IO_CAP,
.expect_len = sizeof(struct btp_gap_set_io_cap_cmd),
.func = set_io_cap,
},
.opcode = BTP_GAP_SET_IO_CAP,
.expect_len = sizeof(struct btp_gap_set_io_cap_cmd),
.func = set_io_cap,
},
{
.opcode = BTP_GAP_PAIR,
.expect_len = sizeof(struct btp_gap_pair_cmd),
.func = pair,
},
.opcode = BTP_GAP_PAIR,
.expect_len = sizeof(struct btp_gap_pair_cmd),
.func = pair,
},
{
.opcode = BTP_GAP_UNPAIR,
.expect_len = sizeof(struct btp_gap_unpair_cmd),
.func = unpair,
},
.opcode = BTP_GAP_UNPAIR,
.expect_len = sizeof(struct btp_gap_unpair_cmd),
.func = unpair,
},
{
.opcode = BTP_GAP_PASSKEY_ENTRY,
.expect_len = sizeof(struct btp_gap_passkey_entry_cmd),
.func = passkey_entry,
},
.opcode = BTP_GAP_PASSKEY_ENTRY,
.expect_len = sizeof(struct btp_gap_passkey_entry_cmd),
.func = passkey_entry,
},
{
.opcode = BTP_GAP_PASSKEY_CONFIRM,
.expect_len = sizeof(struct btp_gap_passkey_confirm_cmd),
.func = passkey_confirm,
},
.opcode = BTP_GAP_PASSKEY_CONFIRM,
.expect_len = sizeof(struct btp_gap_passkey_confirm_cmd),
.func = passkey_confirm,
},
{
.opcode = BTP_GAP_CONN_PARAM_UPDATE,
.expect_len = sizeof(struct btp_gap_conn_param_update_cmd),
.func = conn_param_update_async,
},
.opcode = BTP_GAP_CONN_PARAM_UPDATE,
.expect_len = sizeof(struct btp_gap_conn_param_update_cmd),
.func = conn_param_update_async,
},
{
.opcode = BTP_GAP_OOB_LEGACY_SET_DATA,
.expect_len = sizeof(struct btp_gap_oob_legacy_set_data_cmd),
.func = set_oob_legacy_data,
},
.opcode = BTP_GAP_OOB_LEGACY_SET_DATA,
.expect_len = sizeof(struct btp_gap_oob_legacy_set_data_cmd),
.func = set_oob_legacy_data,
},
{
.opcode = BTP_GAP_OOB_SC_GET_LOCAL_DATA,
.expect_len = 0,
.func = get_oob_sc_local_data,
},
.opcode = BTP_GAP_OOB_SC_GET_LOCAL_DATA,
.expect_len = 0,
.func = get_oob_sc_local_data,
},
{
.opcode = BTP_GAP_OOB_SC_SET_REMOTE_DATA,
.expect_len = sizeof(struct btp_gap_oob_sc_set_remote_data_cmd),
.func = set_oob_sc_remote_data,
},
.opcode = BTP_GAP_OOB_SC_SET_REMOTE_DATA,
.expect_len = sizeof(struct btp_gap_oob_sc_set_remote_data_cmd),
.func = set_oob_sc_remote_data,
},
{
.opcode = BTP_GAP_SET_MITM,
.expect_len = sizeof(struct btp_gap_set_mitm_cmd),
.func = set_mitm,
},
.opcode = BTP_GAP_SET_MITM,
.expect_len = sizeof(struct btp_gap_set_mitm_cmd),
.func = set_mitm,
},
{
.opcode = BTP_GAP_SET_FILTER_ACCEPT_LIST,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = set_filter_accept_list,
},
.opcode = BTP_GAP_SET_FILTER_ACCEPT_LIST,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = set_filter_accept_list,
},
#if MYNEWT_VAL(BLE_EXT_ADV)
{
.opcode = GAP_SET_EXT_ADV,
.expect_len = sizeof(struct btp_gap_set_ext_advertising_cmd),
.func = set_ext_advertising,
},
.opcode = GAP_SET_EXT_ADV,
.expect_len = sizeof(struct btp_gap_set_ext_advertising_cmd),
.func = set_ext_advertising,
},
#endif /* BLE_EXT_ADV*/
#if MYNEWT_VAL(BLE_PERIODIC_ADV)
{
.opcode = GAP_PADV_CONFIGURE,
.expect_len = sizeof(struct gap_periodic_adv_configure_cmd),
.func = periodic_adv_configure,
},
.opcode = GAP_PADV_CONFIGURE,
.expect_len = sizeof(struct gap_periodic_adv_configure_cmd),
.func = periodic_adv_configure,
},
{
.opcode = GAP_PADV_START,
.expect_len = sizeof(struct gap_periodic_adv_start_cmd),
.func = periodic_adv_start,
},
.opcode = GAP_PADV_START,
.expect_len = sizeof(struct gap_periodic_adv_start_cmd),
.func = periodic_adv_start,
},
{
.opcode = GAP_PADV_SET_DATA,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = periodic_adv_set_data,
},
.opcode = GAP_PADV_SET_DATA,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = periodic_adv_set_data,
},
{
.opcode = GAP_PADV_CREATE_SYNC,
.expect_len = sizeof(struct gap_periodic_adv_create_sync_cmd),
.func = periodic_adv_create_sync,
},
.opcode = GAP_PADV_CREATE_SYNC,
.expect_len = sizeof(struct gap_periodic_adv_create_sync_cmd),
.func = periodic_adv_create_sync,
},
#endif
#if MYNEWT_VAL(BLE_PERIODIC_ADV_SYNC_TRANSFER)
{
.opcode = GAP_PADV_SYNC_TRANSFER_SET_INFO,
.expect_len =
sizeof(struct gap_periodic_adv_sync_transfer_set_info_cmd),
.func = periodic_adv_sync_transfer_set_info,
},
.opcode = GAP_PADV_SYNC_TRANSFER_SET_INFO,
.expect_len = sizeof(struct gap_periodic_adv_sync_transfer_set_info_cmd),
.func = periodic_adv_sync_transfer_set_info,
},
{
.opcode = GAP_PADV_SYNC_TRANSFER_START,
.expect_len = sizeof(struct gap_periodic_adv_sync_transfer_start_cmd),
.func = periodic_adv_sync_transfer_start,
},
.opcode = GAP_PADV_SYNC_TRANSFER_START,
.expect_len = sizeof(struct gap_periodic_adv_sync_transfer_start_cmd),
.func = periodic_adv_sync_transfer_start,
},
{
.opcode = GAP_PADV_SYNC_TRANSFER_RECV,
.expect_len = sizeof(struct gap_periodic_adv_sync_transfer_recv_cmd),
.func = periodic_adv_sync_transfer_recv,
},
.opcode = GAP_PADV_SYNC_TRANSFER_RECV,
.expect_len = sizeof(struct gap_periodic_adv_sync_transfer_recv_cmd),
.func = periodic_adv_sync_transfer_recv,
},
#endif
#if MYNEWT_VAL(BLE_CONN_SUBRATING)
{
.opcode = GAP_SUBRATE_REQUEST,
.expect_len = sizeof(struct gap_subrate_request_cmd),
.func = subrate_request,
},
.opcode = GAP_SUBRATE_REQUEST,
.expect_len = sizeof(struct gap_subrate_request_cmd),
.func = subrate_request,
},
#endif
};
apps/bttester/src/btp_gatt.c
+97 -97
View File
@@ -1966,128 +1966,128 @@ enum attr_type {
static const struct btp_handler handlers[] = {
{
.opcode = BTP_GATT_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
.opcode = BTP_GATT_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
{
.opcode = BTP_GATT_START_SERVER,
.expect_len = 0,
.func = start_server,
},
.opcode = BTP_GATT_START_SERVER,
.expect_len = 0,
.func = start_server,
},
{
.opcode = BTP_GATT_EXCHANGE_MTU,
.expect_len = sizeof(struct btp_gatt_exchange_mtu_cmd),
.func = exchange_mtu,
},
.opcode = BTP_GATT_EXCHANGE_MTU,
.expect_len = sizeof(struct btp_gatt_exchange_mtu_cmd),
.func = exchange_mtu,
},
{
.opcode = BTP_GATT_DISC_ALL_PRIM_SVCS,
.expect_len = sizeof(struct btp_gatt_disc_all_prim_svcs_cmd),
.func = disc_all_prim_svcs,
},
.opcode = BTP_GATT_DISC_ALL_PRIM_SVCS,
.expect_len = sizeof(struct btp_gatt_disc_all_prim_svcs_cmd),
.func = disc_all_prim_svcs,
},
{
.opcode = BTP_GATT_DISC_PRIM_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_prim_uuid,
},
.opcode = BTP_GATT_DISC_PRIM_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_prim_uuid,
},
{
.opcode = BTP_GATT_FIND_INCLUDED,
.expect_len = sizeof(struct btp_gatt_find_included_cmd),
.func = find_included,
},
.opcode = BTP_GATT_FIND_INCLUDED,
.expect_len = sizeof(struct btp_gatt_find_included_cmd),
.func = find_included,
},
{
.opcode = BTP_GATT_DISC_ALL_CHRC,
.expect_len = sizeof(struct btp_gatt_disc_all_chrc_cmd),
.func = disc_all_chrc,
},
.opcode = BTP_GATT_DISC_ALL_CHRC,
.expect_len = sizeof(struct btp_gatt_disc_all_chrc_cmd),
.func = disc_all_chrc,
},
{
.opcode = BTP_GATT_DISC_CHRC_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_chrc_uuid,
},
.opcode = BTP_GATT_DISC_CHRC_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_chrc_uuid,
},
{
.opcode = BTP_GATT_DISC_ALL_DESC,
.expect_len = sizeof(struct btp_gatt_disc_all_desc_cmd),
.func = disc_all_desc,
},
.opcode = BTP_GATT_DISC_ALL_DESC,
.expect_len = sizeof(struct btp_gatt_disc_all_desc_cmd),
.func = disc_all_desc,
},
{
.opcode = BTP_GATT_CHANGE_DATABASE,
.expect_len = sizeof(struct btp_gatt_change_database_cmd),
.func = change_database,
},
.opcode = BTP_GATT_CHANGE_DATABASE,
.expect_len = sizeof(struct btp_gatt_change_database_cmd),
.func = change_database,
},
{
.opcode = BTP_GATT_READ,
.expect_len = sizeof(struct btp_gatt_read_cmd),
.func = read_data,
},
.opcode = BTP_GATT_READ,
.expect_len = sizeof(struct btp_gatt_read_cmd),
.func = read_data,
},
{
.opcode = BTP_GATT_READ_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_uuid,
},
.opcode = BTP_GATT_READ_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_uuid,
},
{
.opcode = BTP_GATT_READ_LONG,
.expect_len = sizeof(struct btp_gatt_read_long_cmd),
.func = read_long,
},
.opcode = BTP_GATT_READ_LONG,
.expect_len = sizeof(struct btp_gatt_read_long_cmd),
.func = read_long,
},
{
.opcode = BTP_GATT_READ_MULTIPLE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_multiple,
},
.opcode = BTP_GATT_READ_MULTIPLE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_multiple,
},
{
.opcode = BTP_GATT_WRITE_WITHOUT_RSP,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_without_rsp,
},
.opcode = BTP_GATT_WRITE_WITHOUT_RSP,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_without_rsp,
},
#if 0
{
.opcode = BTP_GATT_SIGNED_WRITE_WITHOUT_RSP,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_signed_without_rsp,
},
.opcode = BTP_GATT_SIGNED_WRITE_WITHOUT_RSP,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_signed_without_rsp,
},
#endif
{
.opcode = BTP_GATT_WRITE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_data,
},
.opcode = BTP_GATT_WRITE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_data,
},
{
.opcode = BTP_GATT_WRITE_LONG,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_long,
},
.opcode = BTP_GATT_WRITE_LONG,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_long,
},
{
.opcode = BTP_GATT_RELIABLE_WRITE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = reliable_write,
},
.opcode = BTP_GATT_RELIABLE_WRITE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = reliable_write,
},
{
.opcode = BTP_GATT_CFG_NOTIFY,
.expect_len = sizeof(struct btp_gatt_cfg_notify_cmd),
.func = config_subscription_notif,
},
.opcode = BTP_GATT_CFG_NOTIFY,
.expect_len = sizeof(struct btp_gatt_cfg_notify_cmd),
.func = config_subscription_notif,
},
{
.opcode = BTP_GATT_CFG_INDICATE,
.expect_len = sizeof(struct btp_gatt_cfg_notify_cmd),
.func = config_subscription_ind,
},
.opcode = BTP_GATT_CFG_INDICATE,
.expect_len = sizeof(struct btp_gatt_cfg_notify_cmd),
.func = config_subscription_ind,
},
{
.opcode = BTP_GATT_GET_ATTRIBUTES,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = get_attrs,
},
.opcode = BTP_GATT_GET_ATTRIBUTES,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = get_attrs,
},
{
.opcode = BTP_GATT_GET_ATTRIBUTE_VALUE,
.expect_len = sizeof(struct btp_gatt_get_attribute_value_cmd),
.func = get_attr_val,
},
.opcode = BTP_GATT_GET_ATTRIBUTE_VALUE,
.expect_len = sizeof(struct btp_gatt_get_attribute_value_cmd),
.func = get_attr_val,
},
{
.opcode = BTP_GATT_NOTIFY_MULTIPLE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = notify_mult,
},
.opcode = BTP_GATT_NOTIFY_MULTIPLE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = notify_mult,
},
};
int
apps/bttester/src/btp_gatt_cl.c
+81 -82
View File
@@ -1497,111 +1497,110 @@ supported_commands(const void *cmd, uint16_t cmd_len,
return BTP_STATUS_SUCCESS;
}
static const struct btp_handler handlers[] = {
{
.opcode = BTP_GATTC_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
.opcode = BTP_GATTC_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
{
.opcode = BTP_GATTC_EXCHANGE_MTU,
.expect_len = sizeof(struct btp_gattc_exchange_mtu_cmd),
.func = exchange_mtu,
},
.opcode = BTP_GATTC_EXCHANGE_MTU,
.expect_len = sizeof(struct btp_gattc_exchange_mtu_cmd),
.func = exchange_mtu,
},
{
.opcode = BTP_GATTC_DISC_ALL_PRIM_SVCS,
.expect_len = sizeof(struct btp_gattc_disc_all_prim_svcs_cmd),
.func = disc_all_prim_svcs,
},
.opcode = BTP_GATTC_DISC_ALL_PRIM_SVCS,
.expect_len = sizeof(struct btp_gattc_disc_all_prim_svcs_cmd),
.func = disc_all_prim_svcs,
},
{
.opcode = BTP_GATTC_DISC_PRIM_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_prim_uuid,
},
.opcode = BTP_GATTC_DISC_PRIM_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_prim_uuid,
},
{
.opcode = BTP_GATTC_FIND_INCLUDED,
.expect_len = sizeof(struct btp_gattc_find_included_cmd),
.func = find_included,
},
.opcode = BTP_GATTC_FIND_INCLUDED,
.expect_len = sizeof(struct btp_gattc_find_included_cmd),
.func = find_included,
},
{
.opcode = BTP_GATTC_DISC_ALL_CHRC,
.expect_len = sizeof(struct btp_gattc_disc_all_chrc_cmd),
.func = disc_all_chrc,
},
.opcode = BTP_GATTC_DISC_ALL_CHRC,
.expect_len = sizeof(struct btp_gattc_disc_all_chrc_cmd),
.func = disc_all_chrc,
},
{
.opcode = BTP_GATTC_DISC_CHRC_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_chrc_uuid,
},
.opcode = BTP_GATTC_DISC_CHRC_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = disc_chrc_uuid,
},
{
.opcode = BTP_GATTC_DISC_ALL_DESC,
.expect_len = sizeof(struct btp_gattc_disc_all_desc_cmd),
.func = disc_all_desc,
},
.opcode = BTP_GATTC_DISC_ALL_DESC,
.expect_len = sizeof(struct btp_gattc_disc_all_desc_cmd),
.func = disc_all_desc,
},
{
.opcode = BTP_GATTC_READ,
.expect_len = sizeof(struct btp_gattc_read_cmd),
.func = read,
},
.opcode = BTP_GATTC_READ,
.expect_len = sizeof(struct btp_gattc_read_cmd),
.func = read,
},
{
.opcode = BTP_GATTC_READ_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_uuid,
},
.opcode = BTP_GATTC_READ_UUID,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_uuid,
},
{
.opcode = BTP_GATTC_READ_LONG,
.expect_len = sizeof(struct btp_gattc_read_long_cmd),
.func = read_long,
},
.opcode = BTP_GATTC_READ_LONG,
.expect_len = sizeof(struct btp_gattc_read_long_cmd),
.func = read_long,
},
{
.opcode = BTP_GATTC_READ_MULTIPLE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_multiple,
},
.opcode = BTP_GATTC_READ_MULTIPLE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_multiple,
},
{
.opcode = BTP_GATTC_WRITE_WITHOUT_RSP,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_without_rsp,
},
.opcode = BTP_GATTC_WRITE_WITHOUT_RSP,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_without_rsp,
},
#if 0
{
.opcode = BTP_GATTC_SIGNED_WRITE_WITHOUT_RSP,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_signed_without_rsp,
},
.opcode = BTP_GATTC_SIGNED_WRITE_WITHOUT_RSP,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_signed_without_rsp,
},
#endif
{
.opcode = BTP_GATTC_WRITE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write,
},
.opcode = BTP_GATTC_WRITE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write,
},
{
.opcode = BTP_GATTC_WRITE_LONG,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_long,
},
.opcode = BTP_GATTC_WRITE_LONG,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = write_long,
},
{
.opcode = BTP_GATTC_RELIABLE_WRITE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = reliable_write,
},
.opcode = BTP_GATTC_RELIABLE_WRITE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = reliable_write,
},
{
.opcode = BTP_GATTC_CFG_NOTIFY,
.expect_len = sizeof(struct btp_gattc_cfg_notify_cmd),
.func = config_subscription_notif,
},
.opcode = BTP_GATTC_CFG_NOTIFY,
.expect_len = sizeof(struct btp_gattc_cfg_notify_cmd),
.func = config_subscription_notif,
},
{
.opcode = BTP_GATTC_CFG_INDICATE,
.expect_len = sizeof(struct btp_gattc_cfg_notify_cmd),
.func = config_subscription_ind,
},
.opcode = BTP_GATTC_CFG_INDICATE,
.expect_len = sizeof(struct btp_gattc_cfg_notify_cmd),
.func = config_subscription_ind,
},
{
.opcode = BTP_GATTC_READ_MULTIPLE_VAR,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_multiple_var,
},
.opcode = BTP_GATTC_READ_MULTIPLE_VAR,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = read_multiple_var,
},
};
uint8_t
apps/bttester/src/btp_l2cap.c
+29 -29
View File
@@ -719,41 +719,41 @@ supported_commands(const void *cmd, uint16_t cmd_len,
static const struct btp_handler handlers[] = {
{
.opcode = BTP_L2CAP_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
.opcode = BTP_L2CAP_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
{
.opcode = BTP_L2CAP_CONNECT,
.expect_len = sizeof(struct btp_l2cap_connect_cmd),
.func = connect,
},
.opcode = BTP_L2CAP_CONNECT,
.expect_len = sizeof(struct btp_l2cap_connect_cmd),
.func = connect,
},
{
.opcode = BTP_L2CAP_DISCONNECT,
.expect_len = sizeof(struct btp_l2cap_disconnect_cmd),
.func = disconnect,
},
.opcode = BTP_L2CAP_DISCONNECT,
.expect_len = sizeof(struct btp_l2cap_disconnect_cmd),
.func = disconnect,
},
{
.opcode = BTP_L2CAP_SEND_DATA,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = send_data,
},
.opcode = BTP_L2CAP_SEND_DATA,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = send_data,
},
{
.opcode = BTP_L2CAP_LISTEN,
.expect_len = sizeof(struct btp_l2cap_listen_cmd),
.func = listen,
},
.opcode = BTP_L2CAP_LISTEN,
.expect_len = sizeof(struct btp_l2cap_listen_cmd),
.func = listen,
},
{
.opcode = BTP_L2CAP_RECONFIGURE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = reconfigure,
},
.opcode = BTP_L2CAP_RECONFIGURE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = reconfigure,
},
{
.opcode = BTP_L2CAP_CREDITS,
.expect_len = sizeof(struct btp_l2cap_credits_cmd),
.func = credits,
},
.opcode = BTP_L2CAP_CREDITS,
.expect_len = sizeof(struct btp_l2cap_credits_cmd),
.func = credits,
},
};
uint8_t
apps/bttester/src/btp_mesh.c
+81 -81
View File
@@ -826,106 +826,106 @@ start(const void *cmd, uint16_t cmd_len,
static const struct btp_handler handlers[] = {
{
.opcode = BTP_MESH_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
.opcode = BTP_MESH_READ_SUPPORTED_COMMANDS,
.index = BTP_INDEX_NONE,
.expect_len = 0,
.func = supported_commands,
},
{
.opcode = BTP_MESH_CONFIG_PROVISIONING,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = config_prov,
},
.opcode = BTP_MESH_CONFIG_PROVISIONING,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = config_prov,
},
{
.opcode = BTP_MESH_PROVISION_NODE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = provision_node,
},
.opcode = BTP_MESH_PROVISION_NODE,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = provision_node,
},
{
.opcode = BTP_MESH_INIT,
.expect_len = 1,
.func = init,
},
.opcode = BTP_MESH_INIT,
.expect_len = 1,
.func = init,
},
{
.opcode = BTP_MESH_RESET,
.expect_len = 0,
.func = reset,
},
.opcode = BTP_MESH_RESET,
.expect_len = 0,
.func = reset,
},
{
.opcode = BTP_MESH_INPUT_NUMBER,
.expect_len = sizeof(struct btp_mesh_input_number_cmd),
.func = input_number,
},
.opcode = BTP_MESH_INPUT_NUMBER,
.expect_len = sizeof(struct btp_mesh_input_number_cmd),
.func = input_number,
},
{
.opcode = BTP_MESH_INPUT_STRING,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = input_string,
},
.opcode = BTP_MESH_INPUT_STRING,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = input_string,
},
{
.opcode = BTP_MESH_IVU_TEST_MODE,
.expect_len = sizeof(struct btp_mesh_ivu_test_mode_cmd),
.func = ivu_test_mode,
},
.opcode = BTP_MESH_IVU_TEST_MODE,
.expect_len = sizeof(struct btp_mesh_ivu_test_mode_cmd),
.func = ivu_test_mode,
},
{
.opcode = BTP_MESH_IVU_TOGGLE_STATE,
.expect_len = 0,
.func = ivu_toggle_state,
},
.opcode = BTP_MESH_IVU_TOGGLE_STATE,
.expect_len = 0,
.func = ivu_toggle_state,
},
{
.opcode = BTP_MESH_LPN,
.expect_len = sizeof(struct btp_mesh_lpn_set_cmd),
.func = lpn,
},
.opcode = BTP_MESH_LPN,
.expect_len = sizeof(struct btp_mesh_lpn_set_cmd),
.func = lpn,
},
{
.opcode = BTP_MESH_LPN_POLL,
.expect_len = 0,
.func = lpn_poll,
},
.opcode = BTP_MESH_LPN_POLL,
.expect_len = 0,
.func = lpn_poll,
},
{
.opcode = BTP_MESH_NET_SEND,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = net_send,
},
.opcode = BTP_MESH_NET_SEND,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = net_send,
},
{
.opcode = BTP_MESH_HEALTH_GENERATE_FAULTS,
.expect_len = 0,
.func = health_generate_faults,
},
.opcode = BTP_MESH_HEALTH_GENERATE_FAULTS,
.expect_len = 0,
.func = health_generate_faults,
},
{
.opcode = BTP_MESH_HEALTH_CLEAR_FAULTS,
.expect_len = 0,
.func = health_clear_faults,
},
.opcode = BTP_MESH_HEALTH_CLEAR_FAULTS,
.expect_len = 0,
.func = health_clear_faults,
},
{
.opcode = BTP_MESH_MODEL_SEND,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = model_send,
},
.opcode = BTP_MESH_MODEL_SEND,
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = model_send,
},
{
.opcode = BTP_MESH_LPN_SUBSCRIBE,
.expect_len = sizeof(struct btp_mesh_lpn_subscribe_cmd),
.func = lpn_subscribe,
},
.opcode = BTP_MESH_LPN_SUBSCRIBE,
.expect_len = sizeof(struct btp_mesh_lpn_subscribe_cmd),
.func = lpn_subscribe,
},
{
.opcode = BTP_MESH_LPN_UNSUBSCRIBE,
.expect_len = sizeof(struct btp_mesh_lpn_unsubscribe_cmd),
.func = lpn_unsubscribe,
},
.opcode = BTP_MESH_LPN_UNSUBSCRIBE,
.expect_len = sizeof(struct btp_mesh_lpn_unsubscribe_cmd),
.func = lpn_unsubscribe,
},
{
.opcode = BTP_MESH_RPL_CLEAR,
.expect_len = 0,
.func = rpl_clear,
},
.opcode = BTP_MESH_RPL_CLEAR,
.expect_len = 0,
.func = rpl_clear,
},
{
.opcode = BTP_MESH_PROXY_IDENTITY,
.expect_len = 0,
.func = proxy_identity_enable,
},
.opcode = BTP_MESH_PROXY_IDENTITY,
.expect_len = 0,
.func = proxy_identity_enable,
},
{
.opcode = BTP_MESH_START,
.expect_len = 0,
.func = start,
},
.opcode = BTP_MESH_START,
.expect_len = 0,
.func = start,
},
};
void
apps/bttester/src/btp_pacs.c
+16 -16
View File
@@ -274,25 +274,25 @@ supported_commands(const void *cmd, uint16_t cmd_len,
static const struct btp_handler handlers[] = {
{
.opcode = BTP_PACS_READ_SUPPORTED_COMMANDS,
.expect_len = 0,
.func = supported_commands,
},
.opcode = BTP_PACS_READ_SUPPORTED_COMMANDS,
.expect_len = 0,
.func = supported_commands,
},
{
.opcode = BTP_PACS_UPDATE_CHARACTERISTIC,
.expect_len = sizeof(struct btp_pacs_update_characteristic_cmd),
.func = pacs_update_characteristic,
},
.opcode = BTP_PACS_UPDATE_CHARACTERISTIC,
.expect_len = sizeof(struct btp_pacs_update_characteristic_cmd),
.func = pacs_update_characteristic,
},
{
.opcode = BTP_PACS_SET_AVAILABLE_CONTEXTS,
.expect_len = sizeof(struct btp_pacs_set_available_contexts_cmd),
.func = pacs_set_available_contexts,
},
.opcode = BTP_PACS_SET_AVAILABLE_CONTEXTS,
.expect_len = sizeof(struct btp_pacs_set_available_contexts_cmd),
.func = pacs_set_available_contexts,
},
{
.opcode = BTP_PACS_SET_SUPPORTED_CONTEXTS,
.expect_len = sizeof(struct btp_pacs_set_supported_contexts_cmd),
.func = pacs_set_supported_contexts,
},
.opcode = BTP_PACS_SET_SUPPORTED_CONTEXTS,
.expect_len = sizeof(struct btp_pacs_set_supported_contexts_cmd),
.func = pacs_set_supported_contexts,
},
};
uint8_t