mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-06 21:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

gatt_client: move ready check into gatt_client_provide_context_for_request

Browse Source
This commit is contained in:
Matthias Ringwald 2023-06-12 14:49:30 +02:00
parent 2cbb1bf185
commit de27733da9
1 changed files with 44 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
src/ble/gatt_client.c
View File

@ -199,17 +199,26 @@ static uint8_t gatt_client_provide_context_for_handle(hci_con_handle_t con_handl
return ERROR_CODE_SUCCESS;
}
static uint8_t gatt_client_provide_context_for_handle_and_start_timer(hci_con_handle_t con_handle, gatt_client_t ** out_gatt_client){
uint8_t status = gatt_client_provide_context_for_handle(con_handle, out_gatt_client);
static bool is_ready(gatt_client_t * gatt_client){
return gatt_client->gatt_client_state == P_READY;
}
static uint8_t gatt_client_provide_context_for_request(hci_con_handle_t con_handle, gatt_client_t ** out_gatt_client){
gatt_client_t * gatt_client = NULL;
uint8_t status = gatt_client_provide_context_for_handle(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
gatt_client_timeout_start(*out_gatt_client);
return status;
}
static bool is_ready(gatt_client_t * gatt_client){
return gatt_client->gatt_client_state == P_READY;
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client_timeout_start(gatt_client);
*out_gatt_client = gatt_client;
return status;
}
int gatt_client_is_ready(hci_con_handle_t con_handle){
@ -2015,13 +2024,10 @@ uint8_t gatt_client_signed_write_without_response(btstack_packet_handler_t callb
uint8_t gatt_client_discover_primary_services(btstack_packet_handler_t callback, hci_con_handle_t con_handle){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->start_group_handle = 0x0001;
@ -2034,13 +2040,10 @@ uint8_t gatt_client_discover_primary_services(btstack_packet_handler_t callback,
uint8_t gatt_client_discover_secondary_services(btstack_packet_handler_t callback, hci_con_handle_t con_handle){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->start_group_handle = 0x0001;
@ -2053,13 +2056,10 @@ uint8_t gatt_client_discover_secondary_services(btstack_packet_handler_t callbac
uint8_t gatt_client_discover_primary_services_by_uuid16(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t uuid16){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->start_group_handle = 0x0001;
@ -2073,13 +2073,10 @@ uint8_t gatt_client_discover_primary_services_by_uuid16(btstack_packet_handler_t
uint8_t gatt_client_discover_primary_services_by_uuid128(btstack_packet_handler_t callback, hci_con_handle_t con_handle, const uint8_t * uuid128){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->start_group_handle = 0x0001;
@ -2093,13 +2090,10 @@ uint8_t gatt_client_discover_primary_services_by_uuid128(btstack_packet_handler_
uint8_t gatt_client_discover_characteristics_for_service(btstack_packet_handler_t callback, hci_con_handle_t con_handle, gatt_client_service_t * service){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->start_group_handle = service->start_group_handle;
@ -2113,13 +2107,11 @@ uint8_t gatt_client_discover_characteristics_for_service(btstack_packet_handler_
uint8_t gatt_client_find_included_services_for_service(btstack_packet_handler_t callback, hci_con_handle_t con_handle, gatt_client_service_t * service){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->start_group_handle = service->start_group_handle;
gatt_client->end_group_handle = service->end_group_handle;
@ -2131,13 +2123,10 @@ uint8_t gatt_client_find_included_services_for_service(btstack_packet_handler_t
uint8_t gatt_client_discover_characteristics_for_handle_range_by_uuid16(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t start_handle, uint16_t end_handle, uint16_t uuid16){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->start_group_handle = start_handle;
@ -2153,13 +2142,10 @@ uint8_t gatt_client_discover_characteristics_for_handle_range_by_uuid16(btstack_
uint8_t gatt_client_discover_characteristics_for_handle_range_by_uuid128(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t start_handle, uint16_t end_handle, const uint8_t * uuid128){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->start_group_handle = start_handle;
@ -2184,14 +2170,11 @@ uint8_t gatt_client_discover_characteristics_for_service_by_uuid128(btstack_pack
uint8_t gatt_client_discover_characteristic_descriptors(btstack_packet_handler_t callback, hci_con_handle_t con_handle, gatt_client_characteristic_t * characteristic){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
if (characteristic->value_handle == characteristic->end_handle){
emit_gatt_complete_event(gatt_client, ATT_ERROR_SUCCESS);
return ERROR_CODE_SUCCESS;
@ -2206,13 +2189,10 @@ uint8_t gatt_client_discover_characteristic_descriptors(btstack_packet_handler_t
uint8_t gatt_client_read_value_of_characteristic_using_value_handle(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t value_handle){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->attribute_handle = value_handle;
@ -2224,13 +2204,10 @@ uint8_t gatt_client_read_value_of_characteristic_using_value_handle(btstack_pack
uint8_t gatt_client_read_value_of_characteristics_by_uuid16(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t start_handle, uint16_t end_handle, uint16_t uuid16){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->start_group_handle = start_handle;
@ -2246,13 +2223,10 @@ uint8_t gatt_client_read_value_of_characteristics_by_uuid16(btstack_packet_handl
uint8_t gatt_client_read_value_of_characteristics_by_uuid128(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t start_handle, uint16_t end_handle, const uint8_t * uuid128){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->start_group_handle = start_handle;
@ -2273,13 +2247,10 @@ uint8_t gatt_client_read_value_of_characteristic(btstack_packet_handler_t callba
uint8_t gatt_client_read_long_value_of_characteristic_using_value_handle_with_offset(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t value_handle, uint16_t offset){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->attribute_handle = value_handle;
@ -2299,13 +2270,10 @@ uint8_t gatt_client_read_long_value_of_characteristic(btstack_packet_handler_t c
uint8_t gatt_client_read_multiple_characteristic_values(btstack_packet_handler_t callback, hci_con_handle_t con_handle, int num_value_handles, uint16_t * value_handles){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->read_multiple_handle_count = num_value_handles;
@ -2330,13 +2298,10 @@ uint8_t gatt_client_write_value_of_characteristic_without_response(hci_con_handl
uint8_t gatt_client_write_value_of_characteristic(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t value_handle, uint16_t value_length, uint8_t * value){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->attribute_handle = value_handle;
@ -2349,13 +2314,10 @@ uint8_t gatt_client_write_value_of_characteristic(btstack_packet_handler_t callb
uint8_t gatt_client_write_long_value_of_characteristic_with_offset(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t value_handle, uint16_t offset, uint16_t value_length, uint8_t * value){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->attribute_handle = value_handle;
@ -2373,13 +2335,10 @@ uint8_t gatt_client_write_long_value_of_characteristic(btstack_packet_handler_t
uint8_t gatt_client_reliable_write_long_value_of_characteristic(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t value_handle, uint16_t value_length, uint8_t * value){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->attribute_handle = value_handle;
@ -2393,14 +2352,11 @@ uint8_t gatt_client_reliable_write_long_value_of_characteristic(btstack_packet_h
uint8_t gatt_client_write_client_characteristic_configuration(btstack_packet_handler_t callback, hci_con_handle_t con_handle, gatt_client_characteristic_t * characteristic, uint16_t configuration){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
if ( (configuration & GATT_CLIENT_CHARACTERISTICS_CONFIGURATION_NOTIFICATION) &&
((characteristic->properties & ATT_PROPERTY_NOTIFY) == 0u)) {
log_info("gatt_client_write_client_characteristic_configuration: GATT_CLIENT_CHARACTERISTIC_NOTIFICATION_NOT_SUPPORTED");
@ -2427,13 +2383,10 @@ uint8_t gatt_client_write_client_characteristic_configuration(btstack_packet_han
uint8_t gatt_client_read_characteristic_descriptor_using_descriptor_handle(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t descriptor_handle){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->attribute_handle = descriptor_handle;
@ -2449,13 +2402,10 @@ uint8_t gatt_client_read_characteristic_descriptor(btstack_packet_handler_t call
uint8_t gatt_client_read_long_characteristic_descriptor_using_descriptor_handle_with_offset(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t descriptor_handle, uint16_t offset){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->attribute_handle = descriptor_handle;
@ -2475,13 +2425,10 @@ uint8_t gatt_client_read_long_characteristic_descriptor(btstack_packet_handler_t
uint8_t gatt_client_write_characteristic_descriptor_using_descriptor_handle(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t descriptor_handle, uint16_t value_length, uint8_t * value){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->attribute_handle = descriptor_handle;
@ -2499,13 +2446,10 @@ uint8_t gatt_client_write_characteristic_descriptor(btstack_packet_handler_t cal
uint8_t gatt_client_write_long_characteristic_descriptor_using_descriptor_handle_with_offset(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t descriptor_handle, uint16_t offset, uint16_t value_length, uint8_t * value){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->attribute_handle = descriptor_handle;
@ -2530,13 +2474,10 @@ uint8_t gatt_client_write_long_characteristic_descriptor(btstack_packet_handler_
*/
uint8_t gatt_client_prepare_write(btstack_packet_handler_t callback, hci_con_handle_t con_handle, uint16_t attribute_handle, uint16_t offset, uint16_t value_length, uint8_t * value){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->attribute_handle = attribute_handle;
@ -2553,13 +2494,10 @@ uint8_t gatt_client_prepare_write(btstack_packet_handler_t callback, hci_con_han
*/
uint8_t gatt_client_execute_write(btstack_packet_handler_t callback, hci_con_handle_t con_handle){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->gatt_client_state = P_W2_EXECUTE_PREPARED_WRITE;
@ -2572,13 +2510,10 @@ uint8_t gatt_client_execute_write(btstack_packet_handler_t callback, hci_con_han
*/
uint8_t gatt_client_cancel_write(btstack_packet_handler_t callback, hci_con_handle_t con_handle){
gatt_client_t * gatt_client;
uint8_t status = gatt_client_provide_context_for_handle_and_start_timer(con_handle, &gatt_client);
uint8_t status = gatt_client_provide_context_for_request(con_handle, &gatt_client);
if (status != ERROR_CODE_SUCCESS){
return status;
}
if (is_ready(gatt_client) == 0){
return GATT_CLIENT_IN_WRONG_STATE;
}
gatt_client->callback = callback;
gatt_client->gatt_client_state = P_W2_CANCEL_PREPARED_WRITE;