ble client: rename gatt client state

This commit is contained in:
mila@ringwald.ch 2014-04-25 14:29:32 +00:00
parent f1ae2665f8
commit 97f577dd92
2 changed files with 7 additions and 7 deletions

View File

@ -1281,7 +1281,7 @@ static void report_gatt_all_characteristic_descriptors(gatt_client_t * periphera
}
static void trigger_next_query(gatt_client_t * peripheral, uint16_t last_result_handle, peripheral_state_t next_query_state, uint8_t complete_event_type){
static void trigger_next_query(gatt_client_t * peripheral, uint16_t last_result_handle, gatt_client_state_t next_query_state, uint8_t complete_event_type){
if (last_result_handle < peripheral->end_group_handle){
peripheral->start_group_handle = last_result_handle + 1;
peripheral->state = next_query_state;
@ -1317,7 +1317,7 @@ static inline void trigger_next_characteristic_descriptor_query(gatt_client_t *
trigger_next_query(peripheral, last_result_handle, P_W2_SEND_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY, GATT_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY_COMPLETE);
}
static inline void trigger_next_prepare_write_query(gatt_client_t * peripheral, peripheral_state_t next_query_state, peripheral_state_t done_state){
static inline void trigger_next_prepare_write_query(gatt_client_t * peripheral, gatt_client_state_t next_query_state, gatt_client_state_t done_state){
peripheral->attribute_offset += write_blob_length(peripheral);
uint16_t next_blob_length = write_blob_length(peripheral);
@ -1328,7 +1328,7 @@ static inline void trigger_next_prepare_write_query(gatt_client_t * peripheral,
peripheral->state = next_query_state;
}
static inline void trigger_next_blob_query(gatt_client_t * peripheral, peripheral_state_t next_query_state, uint8_t done_event, uint16_t received_blob_length){
static inline void trigger_next_blob_query(gatt_client_t * peripheral, gatt_client_state_t next_query_state, uint8_t done_event, uint16_t received_blob_length){
uint16_t max_blob_length = peripheral->mtu - 1;
if (received_blob_length < max_blob_length){

View File

@ -146,7 +146,7 @@ typedef enum {
P_W4_PREPARE_WRITE_CHARACTERISTIC_DESCRIPTOR_RESULT,
P_W2_EXECUTE_PREPARED_WRITE_CHARACTERISTIC_DESCRIPTOR,
P_W4_EXECUTE_PREPARED_WRITE_CHARACTERISTIC_DESCRIPTOR_RESULT
} peripheral_state_t;
} gatt_client_state_t;
typedef enum {
BLE_PERIPHERAL_OK = 0,
@ -162,17 +162,17 @@ typedef enum {
typedef struct le_peripheral_connection{
linked_item_t item;
peripheral_state_t state;
le_central_state_t state;
uint8_t address_type;
bd_addr_t address;
uint16_t handle;
} le_peripheral_connection_t;
} le_central_t;
typedef struct gatt_client{
linked_item_t item;
peripheral_state_t state;
gatt_client_state_t state;
le_central_state_t le_central_state;
uint16_t handle;