mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 08:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbap_client: use temp pbap_client_singleton_pointer

Browse Source
This commit is contained in:
Matthias Ringwald 2024-07-17 17:09:45 +02:00
parent cb40ee0821
commit 65bf3c45de
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/classic/pbap_client.c
View File

@ -72,7 +72,7 @@ const char * pbap_vcard_listing_name = "pb";
static uint32_t pbap_client_supported_features; static uint32_t pbap_client_supported_features;
static pbap_client_t pbap_client_singleton; static pbap_client_t pbap_client_singleton;
static pbap_client_t * pbap_client = &pbap_client_singleton; static pbap_client_t * pbap_client_singleton_pointer = &pbap_client_singleton;
static void pbap_client_emit_connected_event(pbap_client_t * context, uint8_t status){ static void pbap_client_emit_connected_event(pbap_client_t * context, uint8_t status){
uint8_t event[15]; uint8_t event[15];
@ -322,6 +322,9 @@ static void pbap_client_yml_append_character(yxml_t * xml_parser, char * buffer,
} }
static void pbap_client_process_vcard_list_body(const uint8_t * data, uint16_t data_len){ static void pbap_client_process_vcard_list_body(const uint8_t * data, uint16_t data_len){
pbap_client_t * pbap_client = pbap_client_singleton_pointer;
while (data_len--) { while (data_len--) {
yxml_ret_t r = yxml_parse(&pbap_client->xml_parser, *data++); yxml_ret_t r = yxml_parse(&pbap_client->xml_parser, *data++);
switch (r) { switch (r) {
@ -561,6 +564,8 @@ static void pbap_handle_can_send_now(void){
MD5_CTX md5_ctx; MD5_CTX md5_ctx;
pbap_client_t * pbap_client = pbap_client_singleton_pointer;
if (pbap_client->abort_operation){ if (pbap_client->abort_operation){
pbap_client->abort_operation = 0; pbap_client->abort_operation = 0;
// prepare request // prepare request
@ -811,6 +816,9 @@ static void pbap_client_handle_srm_headers(pbap_client_t *client) {
static void pbap_packet_handler_hci(uint8_t *packet, uint16_t size){ static void pbap_packet_handler_hci(uint8_t *packet, uint16_t size){
UNUSED(size); UNUSED(size);
uint8_t status; uint8_t status;
pbap_client_t * pbap_client = pbap_client_singleton_pointer;
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
case HCI_EVENT_GOEP_META: case HCI_EVENT_GOEP_META:
switch (hci_event_goep_meta_get_subevent_code(packet)){ switch (hci_event_goep_meta_get_subevent_code(packet)){
@ -850,6 +858,8 @@ static void pbap_packet_handler_hci(uint8_t *packet, uint16_t size){
} }
static void pbap_packet_handler_goep(uint8_t *packet, uint16_t size){ static void pbap_packet_handler_goep(uint8_t *packet, uint16_t size){
pbap_client_t * pbap_client = pbap_client_singleton_pointer;
if (pbap_client->obex_parser_waiting_for_response == false) return; if (pbap_client->obex_parser_waiting_for_response == false) return;
obex_parser_object_state_t parser_state; obex_parser_object_state_t parser_state;