From fd1559f54b1598ff94daec1331803b0dd9b71105 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 17 Jul 2024 16:27:57 +0200 Subject: [PATCH] pbap_client: extract pbap_client_connect --- src/classic/pbap_client.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/classic/pbap_client.c b/src/classic/pbap_client.c index f18b5ee29..b094b8c32 100644 --- a/src/classic/pbap_client.c +++ b/src/classic/pbap_client.c @@ -1049,22 +1049,26 @@ void pbap_client_init(void){ void pbap_client_deinit(void){ } -uint8_t pbap_connect(btstack_packet_handler_t handler, bd_addr_t addr, uint16_t * out_cid){ - if (pbap_client->state != PBAP_CLIENT_INIT){ - return BTSTACK_MEMORY_ALLOC_FAILED; - } - pbap_client->state = PBAP_CLIENT_W4_GOEP_CONNECTION; - pbap_client->client_handler = handler; - pbap_client->vcard_selector = 0; - pbap_client->vcard_selector_operator = PBAP_VCARD_SELECTOR_OPERATOR_OR; +static uint8_t pbap_client_connect(pbap_client_t * client, btstack_packet_handler_t handler, bd_addr_t addr, uint16_t * out_cid) { + client->state = PBAP_CLIENT_W4_GOEP_CONNECTION; + client->client_handler = handler; + client->vcard_selector = 0; + client->vcard_selector_operator = PBAP_VCARD_SELECTOR_OPERATOR_OR; - uint8_t err = goep_client_create_connection(&pbap_packet_handler, addr, BLUETOOTH_SERVICE_CLASS_PHONEBOOK_ACCESS_PSE, &pbap_client->goep_cid); - *out_cid = pbap_client->goep_cid; + uint8_t err = goep_client_create_connection(&pbap_packet_handler, addr, BLUETOOTH_SERVICE_CLASS_PHONEBOOK_ACCESS_PSE, &client->goep_cid); + *out_cid = client->goep_cid; if (err) return err; return ERROR_CODE_SUCCESS; } +uint8_t pbap_connect(btstack_packet_handler_t handler, bd_addr_t addr, uint16_t * out_cid){ + if (pbap_client_singleton.state != PBAP_CLIENT_INIT){ + return BTSTACK_MEMORY_ALLOC_FAILED; + } + return pbap_client_connect(&pbap_client_singleton, handler, addr, out_cid); +} + uint8_t pbap_disconnect(uint16_t pbap_cid){ UNUSED(pbap_cid); if (pbap_client->state < PBAP_CLIENT_CONNECTED){