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

pbap_client: allow to specify order, search property and search value for pull vcard

Browse Source
This commit is contained in:
Matthias Ringwald 2024-10-10 14:05:13 +02:00
parent 45cccc7d14
commit 8981e44266
2 changed files with 114 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/classic/pbap_client.c
View File

@ -494,6 +494,39 @@ static uint16_t pbap_client_application_params_add_list_start_offset(const pbap_
return pos;
}
static uint16_t pbap_client_application_params_add_order(const pbap_client_t * client, uint8_t * application_parameters, uint8_t order){
uint16_t pos = 0;
if (client->order != 0){
application_parameters[pos++] = PBAP_APPLICATION_PARAMETER_ORDER;
application_parameters[pos++] = 1;
application_parameters[pos++] = order;
}
return pos;
}
static uint16_t pbap_client_application_params_add_search_property(const pbap_client_t * client, uint8_t * application_parameters, uint8_t search_property){
uint16_t pos = 0;
if (client->search_property != 0){
application_parameters[pos++] = PBAP_APPLICATION_PARAMETER_SEARCH_PROPERTY;
application_parameters[pos++] = 1;
application_parameters[pos++] = search_property;
}
return pos;
}
static uint16_t pbap_client_application_params_add_search_value(const pbap_client_t * client, uint8_t * application_parameters, const char* search_value){
uint16_t pos = 0;
if (client->search_value != 0){
uint32_t length;
length = strlen (client->search_value);
application_parameters[pos++] = PBAP_APPLICATION_PARAMETER_SEARCH_VALUE;
application_parameters[pos++] = length;
memcpy (&application_parameters[pos], client->search_value, length);
pos += length;
}
return pos;
}
// max size: PBAP_MAX_PHONE_NUMBER_LEN + 5
static uint16_t pbap_client_application_params_add_phone_number(const pbap_client_t * client, uint8_t * application_parameters){
uint16_t pos = 0;
@ -713,6 +746,21 @@ static void pbap_handle_can_send_now(pbap_client_t *pbap_client) {
pos = 0;
pos += pbap_client_application_params_add_vcard_selector(pbap_client, &application_parameters[pos]);
pos += pbap_client_application_params_add_phone_number(pbap_client, &application_parameters[pos]);
if (pbap_client->search_value != NULL){
pos += pbap_client_application_params_add_search_value(pbap_client, &application_parameters[pos], pbap_client->search_value);
}
if (pbap_client->search_property){
pos += pbap_client_application_params_add_search_property(pbap_client, &application_parameters[pos], pbap_client->search_property);
}
if (pbap_client->order){
pos += pbap_client_application_params_add_order(pbap_client, &application_parameters[pos], pbap_client->order);
}
if (pbap_client->max_list_count){
pos += pbap_client_application_params_add_max_list_count(pbap_client, &application_parameters[pos], pbap_client->max_list_count);
}
if (pbap_client->list_start_offset){
pos += pbap_client_application_params_add_list_start_offset (pbap_client, &application_parameters[pos], pbap_client->list_start_offset);
}
pbap_client_add_application_parameters(pbap_client, application_parameters, pos);
}
// state
@ -1326,3 +1374,39 @@ uint8_t pbap_set_list_start_offset(uint16_t pbap_cid, uint16_t list_start_offset
pbap_client->list_start_offset = list_start_offset;
return ERROR_CODE_SUCCESS;
}
uint8_t pbap_set_order(uint16_t pbap_cid, uint8_t order){
pbap_client_t * pbap_client = pbap_client_for_cid(pbap_cid);
if (pbap_client == NULL){
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
}
if (pbap_client->state != PBAP_CLIENT_CONNECTED){
return BTSTACK_BUSY;
}
pbap_client->order = order;
return ERROR_CODE_SUCCESS;
}
uint8_t pbap_set_search_property(uint16_t pbap_cid, uint8_t search_property){
pbap_client_t * pbap_client = pbap_client_for_cid(pbap_cid);
if (pbap_client == NULL){
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
}
if (pbap_client->state != PBAP_CLIENT_CONNECTED){
return BTSTACK_BUSY;
}
pbap_client->search_property = search_property;
return ERROR_CODE_SUCCESS;
}
uint8_t pbap_set_search_value(uint16_t pbap_cid, const char * search_value){
pbap_client_t * pbap_client = pbap_client_for_cid(pbap_cid);
if (pbap_client == NULL){
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
}
if (pbap_client->state != PBAP_CLIENT_CONNECTED){
return BTSTACK_BUSY;
}
pbap_client->search_value = search_value;
return ERROR_CODE_SUCCESS;
}

33
src/classic/pbap_client.h
View File

@ -152,9 +152,12 @@ typedef struct pbap_client {
uint8_t vcard_selector_operator;
uint8_t vcard_selector_supported;
/* property selector */
uint32_t property_selector;
uint16_t list_start_offset;
uint16_t max_list_count;
uint32_t property_selector;
uint16_t list_start_offset;
uint16_t max_list_count;
uint8_t order;
uint8_t search_property;
const char * search_value;
/* abort */
uint8_t abort_operation;
/* obex parser */
@ -300,6 +303,30 @@ uint8_t pbap_set_max_list_count(uint16_t pbap_cid, uint16_t max_list_count);
*/
uint8_t pbap_set_list_start_offset(uint16_t pbap_cid, uint16_t list_start_offset);
/**
* @bbrief Set order for pbap_pull_vcard_listing
* @param pbap_cid
* @param order
* @return
*/
uint8_t pbap_set_order(uint16_t pbap_cid, uint8_t order);
/**
* @bbrief Set search property for pbap_pull_vcard_listing
* @param pbap_cid
* @param search_property
* @return
*/
uint8_t pbap_set_search_property(uint16_t pbap_cid, uint8_t search_property);
/**
* @bbrief Set search property for pbap_pull_vcard_listing
* @param pbap_cid
* @param search_value
* @return
*/
uint8_t pbap_set_search_value(uint16_t pbap_cid, const char * search_value);
/**
* @brief Get size of phone book from PSE. The result is reported via PBAP_SUBEVENT_PHONEBOOK_SIZE event.
*