mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-01 03:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

avrcp: rename fields

Browse Source
This commit is contained in:
Milanka Ringwald 2021-11-25 11:31:24 +01:00
parent f3bb6622e4
commit 3d73cc81a1
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/classic/avrcp.c
View File

@ -530,7 +530,7 @@ static avrcp_connection_t * avrcp_create_connection(avrcp_role_t role, bd_addr_t
connection->transaction_id = 0xFF; connection->transaction_id = 0xFF;
connection->transaction_id_counter = 0; connection->transaction_id_counter = 0;
connection->max_num_fragments = 0xFF; connection->controller_max_num_fragments = 0xFF;
// setup default unit / subunit info // setup default unit / subunit info
connection->company_id = 0xffffff; connection->company_id = 0xffffff;

22
src/classic/avrcp.h
View File

@ -395,7 +395,6 @@ typedef enum {
AVRCP_PARSER_IGNORE_REST_OF_ATTRIBUTE_VALUE AVRCP_PARSER_IGNORE_REST_OF_ATTRIBUTE_VALUE
} avrcp_parser_state_t; } avrcp_parser_state_t;
typedef enum{ typedef enum{
AVRCP_CONTROLLER = 0, AVRCP_CONTROLLER = 0,
AVRCP_TARGET AVRCP_TARGET
@ -561,17 +560,20 @@ typedef struct {
uint16_t data_offset; uint16_t data_offset;
avrcp_media_attribute_id_t next_attr_id; avrcp_media_attribute_id_t next_attr_id;
avrcp_parser_state_t parser_state;
uint8_t parser_attribute_header[AVRCP_ATTRIBUTE_HEADER_LEN];
uint8_t parser_attribute_header_pos;
uint16_t list_size; // used for parser in controller, and for fragmentation in target
uint16_t list_offset;
uint8_t attribute_value[AVRCP_MAX_ATTRIBUTE_SIZE]; uint8_t attribute_value[AVRCP_MAX_ATTRIBUTE_SIZE];
uint16_t attribute_value_len; uint16_t attribute_value_len;
uint16_t attribute_value_offset; uint16_t attribute_value_offset;
// controller only // controller only
// parser
avrcp_parser_state_t parser_state;
uint8_t parser_attribute_header[AVRCP_ATTRIBUTE_HEADER_LEN];
uint8_t parser_attribute_header_pos;
uint16_t list_size;
uint16_t list_offset;
// limit number of pending commands to transaction id window size // limit number of pending commands to transaction id window size
uint8_t controller_last_confirmed_transaction_id; uint8_t controller_last_confirmed_transaction_id;
@ -585,8 +587,11 @@ typedef struct {
uint16_t controller_notifications_to_register; uint16_t controller_notifications_to_register;
uint16_t controller_notifications_to_deregister; uint16_t controller_notifications_to_deregister;
// target only // PTS requires definition of max num fragments
uint8_t controller_max_num_fragments;
uint8_t controller_num_received_fragments;
// target only
// PID check // PID check
bool target_reject_transport_header; bool target_reject_transport_header;
uint8_t target_invalid_pid; uint8_t target_invalid_pid;
@ -630,9 +635,6 @@ typedef struct {
uint32_t target_total_tracks; uint32_t target_total_tracks;
uint32_t target_track_nr; uint32_t target_track_nr;
// PTS requires definition of max num fragments
uint8_t max_num_fragments;
uint8_t num_received_fragments;
#ifdef ENABLE_AVCTP_FRAGMENTATION #ifdef ENABLE_AVCTP_FRAGMENTATION
uint16_t avctp_reassembly_size; uint16_t avctp_reassembly_size;

8
src/classic/avrcp_controller.c
View File

@ -446,7 +446,7 @@ static void avrcp_controller_emit_operation_status(btstack_packet_handler_t call
static void avrcp_parser_reset(avrcp_connection_t * connection){ static void avrcp_parser_reset(avrcp_connection_t * connection){
connection->list_offset = 0; connection->list_offset = 0;
connection->parser_attribute_header_pos = 0; connection->parser_attribute_header_pos = 0;
connection->num_received_fragments = 0; connection->controller_num_received_fragments = 0;
connection->parser_state = AVRCP_PARSER_GET_ATTRIBUTE_HEADER; connection->parser_state = AVRCP_PARSER_GET_ATTRIBUTE_HEADER;
} }
@ -1123,9 +1123,9 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
break; break;
case AVRCP_CONTINUE_PACKET: case AVRCP_CONTINUE_PACKET:
case AVRCP_END_PACKET: case AVRCP_END_PACKET:
connection->num_received_fragments++; connection->controller_num_received_fragments++;
if (connection->num_received_fragments < connection->max_num_fragments){ if (connection->controller_num_received_fragments < connection->controller_max_num_fragments){
avrcp_controller_parse_and_emit_element_attrs(packet+pos, size-pos, connection, ctype); avrcp_controller_parse_and_emit_element_attrs(packet+pos, size-pos, connection, ctype);
if (vendor_dependent_packet_type == AVRCP_CONTINUE_PACKET){ if (vendor_dependent_packet_type == AVRCP_CONTINUE_PACKET){
@ -1719,7 +1719,7 @@ uint8_t avrcp_controller_set_max_num_fragments(uint16_t avrcp_cid, uint8_t max_n
if (!connection){ if (!connection){
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER; return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
} }
connection->max_num_fragments = max_num_fragments; connection->controller_max_num_fragments = max_num_fragments;
return ERROR_CODE_SUCCESS; return ERROR_CODE_SUCCESS;
} }