pbap_client: pass l2cap ertm config into pbap_client_connect and use goep_client_connect

This commit is contained in:
Matthias Ringwald 2024-08-07 13:09:59 +02:00
parent 1747cbabcd
commit 0806590a60
2 changed files with 9 additions and 3 deletions

View File

@ -1081,7 +1081,8 @@ void pbap_client_init(void){
void pbap_client_deinit(void){
}
uint8_t pbap_client_connect(pbap_client_t * client, btstack_packet_handler_t handler, bd_addr_t addr, uint16_t * out_cid) {
uint8_t pbap_client_connect(pbap_client_t * client, l2cap_ertm_config_t *l2cap_ertm_config, uint8_t *l2cap_ertm_buffer,
uint16_t l2cap_ertm_buffer_size, 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;
@ -1089,7 +1090,8 @@ uint8_t pbap_client_connect(pbap_client_t * client, btstack_packet_handler_t han
btstack_linked_list_add(&pbap_clients, (btstack_linked_item_t*) client);
uint8_t status = goep_client_create_connection(&pbap_packet_handler, addr, BLUETOOTH_SERVICE_CLASS_PHONEBOOK_ACCESS_PSE, &client->goep_cid);
uint8_t status = goep_client_connect(&client->goep_client, l2cap_ertm_config, l2cap_ertm_buffer, l2cap_ertm_buffer_size,
&pbap_packet_handler, addr, BLUETOOTH_SERVICE_CLASS_PHONEBOOK_ACCESS_PSE, 0, &client->goep_cid);
*out_cid = client->goep_cid;
if (status) {

View File

@ -181,13 +181,17 @@ void pbap_client_init(void);
* This function allows for multiple parallel connections.
*
* @param client storage for connection state. Must stay valid until connection closes
* @param l2cap_ertm_config
* @param l2cap_ertm_buffer_size
* @param l2cap_ertm_buffer
* @param handler
* @param addr
* @param out_cid to use for further commands
* @return status ERROR_CODE_SUCCESS on success, otherwise BTSTACK_MEMORY_ALLOC_FAILED if PBAP or GOEP connection already exists.
*/
uint8_t pbap_client_connect(pbap_client_t * client, btstack_packet_handler_t handler, bd_addr_t addr, uint16_t * out_cid);
uint8_t pbap_client_connect(pbap_client_t * client, l2cap_ertm_config_t *l2cap_ertm_config, uint8_t *l2cap_ertm_buffer,
uint16_t l2cap_ertm_buffer_size, btstack_packet_handler_t handler, bd_addr_t addr, uint16_t * out_cid);
/**
* @brief Create PBAP connection to a Phone Book Server (PSE) server on a remote device.