mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-14 10:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

att_server: use bool for ir_lookup_active and pairing_active

Browse Source
This commit is contained in:
Matthias Ringwald 2023-12-04 18:06:17 +01:00
parent c7ceba5914
commit 4ab476746f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ble/att_server.c
View File

@ -328,8 +328,8 @@ static void att_server_event_packet_handler (uint8_t packet_type, uint16_t chann
att_connection->authorized = 0u;
// workaround: identity resolving can already be complete, at least store result
att_server->ir_le_device_db_index = sm_le_device_index(con_handle);
att_server->ir_lookup_active = 0u;
att_server->pairing_active = 0u;
att_server->ir_lookup_active = false;
att_server->pairing_active = false;
// notify all - new
att_emit_connected_event(att_server, att_connection);
break;
@ -384,7 +384,7 @@ static void att_server_event_packet_handler (uint8_t packet_type, uint16_t chann
att_connection = &hci_connection->att_connection;
att_clear_transaction_queue(att_connection);
att_connection->con_handle = 0;
att_server->pairing_active = 0;
att_server->pairing_active = false;
att_server->state = ATT_SERVER_IDLE;
if (att_server->value_indication_handle != 0u){
btstack_run_loop_remove_timer(&att_server->value_indication_timer);
@ -405,7 +405,7 @@ static void att_server_event_packet_handler (uint8_t packet_type, uint16_t chann
if (!hci_connection) break;
att_server = &hci_connection->att_server;
log_info("SM_EVENT_IDENTITY_RESOLVING_STARTED");
att_server->ir_lookup_active = 1;
att_server->ir_lookup_active = true;
break;
case SM_EVENT_IDENTITY_RESOLVING_SUCCEEDED:
con_handle = sm_event_identity_created_get_handle(packet);
@ -413,7 +413,7 @@ static void att_server_event_packet_handler (uint8_t packet_type, uint16_t chann
if (!hci_connection) return;
att_connection = &hci_connection->att_connection;
att_server = &hci_connection->att_server;
att_server->ir_lookup_active = 0;
att_server->ir_lookup_active = false;
att_server->ir_le_device_db_index = sm_event_identity_resolving_succeeded_get_index(packet);
log_info("SM_EVENT_IDENTITY_RESOLVING_SUCCEEDED");
att_run_for_context(att_server, att_connection);
@ -425,7 +425,7 @@ static void att_server_event_packet_handler (uint8_t packet_type, uint16_t chann
att_connection = &hci_connection->att_connection;
att_server = &hci_connection->att_server;
log_info("SM_EVENT_IDENTITY_RESOLVING_FAILED");
att_server->ir_lookup_active = 0;
att_server->ir_lookup_active = false;
att_server->ir_le_device_db_index = -1;
att_run_for_context(att_server, att_connection);
break;
@ -442,7 +442,7 @@ static void att_server_event_packet_handler (uint8_t packet_type, uint16_t chann
if (!hci_connection) break;
att_server = &hci_connection->att_server;
log_info("SM Pairing started");
att_server->pairing_active = 1;
att_server->pairing_active = true;
if (att_server->ir_le_device_db_index < 0) break;
att_server_persistent_ccc_clear(att_server);
// index not valid anymore
@ -456,7 +456,7 @@ static void att_server_event_packet_handler (uint8_t packet_type, uint16_t chann
if (!hci_connection) return;
att_connection = &hci_connection->att_connection;
att_server = &hci_connection->att_server;
att_server->pairing_active = 0;
att_server->pairing_active = false;
att_server->ir_le_device_db_index = sm_event_identity_created_get_index(packet);
att_run_for_context(att_server, att_connection);
break;
@ -468,7 +468,7 @@ static void att_server_event_packet_handler (uint8_t packet_type, uint16_t chann
if (!hci_connection) return;
att_connection = &hci_connection->att_connection;
att_server = &hci_connection->att_server;
att_server->pairing_active = 0;
att_server->pairing_active = false;
att_run_for_context(att_server, att_connection);
break;

5
src/hci.h
View File

@ -45,6 +45,7 @@
#include "btstack_config.h"
#include "btstack_bool.h"
#include "btstack_chipset.h"
#include "btstack_control.h"
#include "btstack_linked_list.h"
@ -494,8 +495,8 @@ typedef struct {
att_bearer_type_t bearer_type;
int ir_le_device_db_index;
uint8_t ir_lookup_active;
uint8_t pairing_active;
bool ir_lookup_active;
bool pairing_active;
uint16_t value_indication_handle;
btstack_timer_source_t value_indication_timer;