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

avrcp browsing: refactor function name, emit done event with uid_count on success

Browse Source
This commit is contained in:
Milanka Ringwald 2018-04-10 15:05:59 +02:00
parent 5d6a28a5fc
commit 5c4bbc4e0f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/classic/avrcp_browsing_controller.c
View File

@ -566,7 +566,7 @@ static void avrcp_browsing_parse_and_emit_element_attrs(uint8_t * packet, uint16
}
}
static void avrcp_browsing_controller_emit_done(btstack_packet_handler_t callback, uint16_t browsing_cid, uint8_t browsing_status, uint8_t bluetooth_status){
static void avrcp_browsing_controller_emit_failed(btstack_packet_handler_t callback, uint16_t browsing_cid, uint8_t browsing_status, uint8_t bluetooth_status){
avrcp_browsing_controller_emit_done_with_uid_counter(callback, browsing_cid, 0, browsing_status, bluetooth_status);
}
@ -596,7 +596,7 @@ static void avrcp_browsing_controller_packet_handler(uint8_t packet_type, uint16
}
if (pos + 4 > size){
browsing_connection->state = AVCTP_CONNECTION_OPENED;
avrcp_browsing_controller_emit_done(avrcp_controller_context.browsing_avrcp_callback, channel, AVRCP_BROWSING_ERROR_CODE_INVALID_COMMAND, ERROR_CODE_SUCCESS);
avrcp_browsing_controller_emit_failed(avrcp_controller_context.browsing_avrcp_callback, channel, AVRCP_BROWSING_ERROR_CODE_INVALID_COMMAND, ERROR_CODE_SUCCESS);
return;
}
browsing_connection->pdu_id = packet[pos++];
@ -605,7 +605,7 @@ static void avrcp_browsing_controller_packet_handler(uint8_t packet_type, uint16
browsing_connection->browsing_status = packet[pos++];
if (browsing_connection->browsing_status != AVRCP_BROWSING_ERROR_CODE_SUCCESS){
browsing_connection->state = AVCTP_CONNECTION_OPENED;
avrcp_browsing_controller_emit_done(avrcp_controller_context.browsing_avrcp_callback, channel, browsing_connection->browsing_status, ERROR_CODE_SUCCESS);
avrcp_browsing_controller_emit_failed(avrcp_controller_context.browsing_avrcp_callback, channel, browsing_connection->browsing_status, ERROR_CODE_SUCCESS);
return;
}
browsing_connection->uid_counter = big_endian_read_16(packet, pos);
@ -618,10 +618,10 @@ static void avrcp_browsing_controller_packet_handler(uint8_t packet_type, uint16
uint32_t i;
switch(browsing_connection->pdu_id){
case AVRCP_PDU_ID_CHANGE_PATH:
printf("AVRCP_PDU_ID_CHANGE_PATH \n");
// printf("AVRCP_PDU_ID_CHANGE_PATH \n");
break;
case AVRCP_PDU_ID_SET_ADDRESSED_PLAYER:
printf("AVRCP_PDU_ID_SET_ADDRESSED_PLAYER \n");
// printf("AVRCP_PDU_ID_SET_ADDRESSED_PLAYER \n");
break;
case AVRCP_PDU_ID_GET_TOTAL_NUMBER_OF_ITEMS:{
uint32_t num_items = big_endian_read_32(packet, pos);
@ -648,14 +648,12 @@ static void avrcp_browsing_controller_packet_handler(uint8_t packet_type, uint16
}
case AVRCP_PDU_ID_GET_FOLDER_ITEMS:{
printf(" AVRCP_PDU_ID_GET_FOLDER_ITEMS\n");
switch (avctp_packet_type){
case AVRCP_SINGLE_PACKET:
case AVRCP_START_PACKET:
avrcp_parser_reset(browsing_connection);
browsing_connection->num_items = big_endian_read_16(packet, pos); //num_items
pos += 2;
printf(" num items %d\n", browsing_connection->num_items);
avrcp_browsing_parse_and_emit_element_attrs(packet+pos, size-pos, browsing_connection);
break;
@ -686,7 +684,7 @@ static void avrcp_browsing_controller_packet_handler(uint8_t packet_type, uint16
case AVRCP_END_PACKET:
// printf("reset browsing connection state to OPENED\n");
browsing_connection->state = AVCTP_CONNECTION_OPENED;
avrcp_browsing_controller_emit_done(avrcp_controller_context.browsing_avrcp_callback, channel, browsing_connection->browsing_status, ERROR_CODE_SUCCESS);
avrcp_browsing_controller_emit_done_with_uid_counter(avrcp_controller_context.browsing_avrcp_callback, channel, browsing_connection->uid_counter, browsing_connection->browsing_status, ERROR_CODE_SUCCESS);
break;
default:
break;

4
test/pts/avrcp_controller_test.c
View File

@ -272,7 +272,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
printf("media_type 0x%02x, charset 0x%02x, actual len %d, name %s\n", media_type, charset, value_len, value);
uint8_t num_attributes = packet[pos++];
printf("Num media attributes %d\n", num_attributes);
// printf("Num media attributes %d\n", num_attributes);
// for (avrcp_media_item_iterator_init(&media_item_context, size-pos, packet+pos); avrcp_media_item_iterator_has_more(&media_item_context); avrcp_media_item_iterator_next(&media_item_context)){
// uint32_t attr_id = avrcp_media_item_iterator_get_attr_id(&media_item_context);
// uint16_t attr_charset = avrcp_media_item_iterator_get_attr_charset(&media_item_context);
@ -390,7 +390,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
break;
}
browsing_uid_counter = avrcp_subevent_browsing_done_get_uid_counter(packet);
printf("DONE.\n");
printf("DONE, browsing_uid_counter %d.\n", browsing_uid_counter);
break;
default: