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

avrcp: fix compilation for c++

Browse Source
This commit is contained in:
Matthias Ringwald 2018-06-26 18:12:51 +02:00
parent a959741731
commit dfbbc26bf3
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/classic/avrcp_controller.c
View File

@ -85,7 +85,7 @@ static void avrcp_emit_operation_status(btstack_packet_handler_t callback, uint8
static void avrcp_press_and_hold_timeout_handler(btstack_timer_source_t * timer){ static void avrcp_press_and_hold_timeout_handler(btstack_timer_source_t * timer){
UNUSED(timer); UNUSED(timer);
avrcp_connection_t * connection = btstack_run_loop_get_timer_context(timer); avrcp_connection_t * connection = (avrcp_connection_t*) btstack_run_loop_get_timer_context(timer);
btstack_run_loop_set_timer(&connection->press_and_hold_cmd_timer, 2000); // 2 seconds timeout btstack_run_loop_set_timer(&connection->press_and_hold_cmd_timer, 2000); // 2 seconds timeout
btstack_run_loop_add_timer(&connection->press_and_hold_cmd_timer); btstack_run_loop_add_timer(&connection->press_and_hold_cmd_timer);
connection->state = AVCTP_W2_SEND_PRESS_COMMAND; connection->state = AVCTP_W2_SEND_PRESS_COMMAND;
@ -355,7 +355,7 @@ static void avrcp_parser_process_byte(uint8_t byte, avrcp_connection_t * connect
// emit empty attribute // emit empty attribute
attribute_id = big_endian_read_32(connection->parser_attribute_header, 0); attribute_id = big_endian_read_32(connection->parser_attribute_header, 0);
avrcp_controller_emit_now_playing_info_event(avrcp_controller_context.avrcp_callback, connection->avrcp_cid, ctype, attribute_id, connection->attribute_value, connection->attribute_value_len); avrcp_controller_emit_now_playing_info_event(avrcp_controller_context.avrcp_callback, connection->avrcp_cid, ctype, (avrcp_media_attribute_id_t) attribute_id, connection->attribute_value, connection->attribute_value_len);
// done, see below // done, see below
break; break;
@ -368,7 +368,7 @@ static void avrcp_parser_process_byte(uint8_t byte, avrcp_connection_t * connect
// emit (potentially partial) attribute // emit (potentially partial) attribute
attribute_id = big_endian_read_32(connection->parser_attribute_header, 0); attribute_id = big_endian_read_32(connection->parser_attribute_header, 0);
avrcp_controller_emit_now_playing_info_event(avrcp_controller_context.avrcp_callback, connection->avrcp_cid, ctype, attribute_id, connection->attribute_value, connection->attribute_value_len); avrcp_controller_emit_now_playing_info_event(avrcp_controller_context.avrcp_callback, connection->avrcp_cid, ctype, (avrcp_media_attribute_id_t) attribute_id, connection->attribute_value, connection->attribute_value_len);
attribute_total_value_len = big_endian_read_16(connection->parser_attribute_header, 6); attribute_total_value_len = big_endian_read_16(connection->parser_attribute_header, 6);
if (connection->attribute_value_offset < attribute_total_value_len){ if (connection->attribute_value_offset < attribute_total_value_len){
@ -777,7 +777,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
} }
case AVRCP_PDU_ID_GET_ELEMENT_ATTRIBUTES:{ case AVRCP_PDU_ID_GET_ELEMENT_ATTRIBUTES:{
avrcp_packet_type_t packet_type = operands[4] & 0x03; avrcp_packet_type_t packet_type = (avrcp_packet_type_t) (operands[4] & 0x03);
switch (packet_type){ switch (packet_type){
case AVRCP_START_PACKET: case AVRCP_START_PACKET:
case AVRCP_SINGLE_PACKET: case AVRCP_SINGLE_PACKET:

31
src/classic/avrcp_target.c
View File

@ -181,7 +181,8 @@ static int avrcp_target_send_now_playing_info(uint16_t cid, avrcp_connection_t *
packet[pos_packet_type] = AVRCP_SINGLE_PACKET; packet[pos_packet_type] = AVRCP_SINGLE_PACKET;
connection->packet_type = AVRCP_SINGLE_PACKET; connection->packet_type = AVRCP_SINGLE_PACKET;
packet[pos++] = count_set_bits_uint32(connection->now_playing_info_attr_bitmap); packet[pos++] = count_set_bits_uint32(connection->now_playing_info_attr_bitmap);
connection->next_attr_id++; // C++ compatible version of connection->next_attr_id++
connection->next_attr_id = (avrcp_media_attribute_id_t) (((int) connection->next_attr_id) + 1);
} }
// printf("updated connection->next_attr_id %d, connection->attribute_value_offset %d \n", connection->next_attr_id, connection->attribute_value_offset); // printf("updated connection->next_attr_id %d, connection->attribute_value_offset %d \n", connection->next_attr_id, connection->attribute_value_offset);
@ -251,7 +252,8 @@ static int avrcp_target_send_now_playing_info(uint16_t cid, avrcp_connection_t *
num_free_bytes -= num_written_bytes; num_free_bytes -= num_written_bytes;
} }
if (!fragmented){ if (!fragmented){
connection->next_attr_id++; // C++ compatible version of connection->next_attr_id++
connection->next_attr_id = (avrcp_media_attribute_id_t) (((int) connection->next_attr_id) + 1);
} }
} }
@ -768,7 +770,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
uint8_t transport_header = packet[0]; uint8_t transport_header = packet[0];
connection->transaction_label = transport_header >> 4; connection->transaction_label = transport_header >> 4;
// uint8_t frame_type = (transport_header & 0x03) >> 1; // uint8_t frame_type = (transport_header & 0x03) >> 1;
avrcp_packet_type_t packet_type = (transport_header & 0x0F) >> 2; avrcp_packet_type_t packet_type = (avrcp_packet_type_t) ((transport_header & 0x0F) >> 2);
switch (packet_type){ switch (packet_type){
case AVRCP_SINGLE_PACKET: case AVRCP_SINGLE_PACKET:
pid = big_endian_read_16(packet, 1); pid = big_endian_read_16(packet, 1);
@ -806,13 +808,14 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
// transport_header, transaction_label, packet_type, frame_type, ipid, pid); // transport_header, transaction_label, packet_type, frame_type, ipid, pid);
// printf_hexdump(packet+pos, size-pos); // printf_hexdump(packet+pos, size-pos);
avrcp_command_opcode_t opcode = avrcp_cmd_opcode(packet,size); avrcp_command_opcode_t opcode = (avrcp_command_opcode_t) avrcp_cmd_opcode(packet,size);
uint8_t * company_id = avrcp_get_company_id(packet, size); uint8_t * company_id = avrcp_get_company_id(packet, size);
uint8_t * pdu = avrcp_get_pdu(packet, size); uint8_t * pdu = avrcp_get_pdu(packet, size);
// uint16_t param_length = big_endian_read_16(pdu, 2); // uint16_t param_length = big_endian_read_16(pdu, 2);
int pos = 4; int pos = 4;
uint8_t pdu_id; uint16_t length;
avrcp_pdu_id_t pdu_id;
connection->cmd_operands_length = 0; connection->cmd_operands_length = 0;
switch (opcode){ switch (opcode){
@ -826,11 +829,11 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
} }
case AVRCP_CMD_OPCODE_PASS_THROUGH:{ case AVRCP_CMD_OPCODE_PASS_THROUGH:{
log_info("AVRCP_OPERATION_ID 0x%02x, operands length %d, operand %d", packet[6], packet[7], packet[8]); log_info("AVRCP_OPERATION_ID 0x%02x, operands length %d, operand %d", packet[6], packet[7], packet[8]);
avrcp_operation_id_t operation_id = packet[6]; avrcp_operation_id_t operation_id = (avrcp_operation_id_t) packet[6];
if (avrcp_is_receive_pass_through_cmd(operation_id)){ if (avrcp_is_receive_pass_through_cmd(operation_id)){
operation_id = packet[6] & 0x7F; operation_id = (avrcp_operation_id_t) (packet[6] & 0x7F);
avrcp_target_operation_accepted(connection->avrcp_cid, packet[6], packet[7], packet[8]); avrcp_target_operation_accepted(connection->avrcp_cid, (avrcp_operation_id_t) packet[6], packet[7], packet[8]);
break; break;
} }
@ -854,24 +857,24 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
case AVRCP_OPERATION_ID_LEFT: case AVRCP_OPERATION_ID_LEFT:
case AVRCP_OPERATION_ID_RIGHT: case AVRCP_OPERATION_ID_RIGHT:
case AVRCP_OPERATION_ID_ROOT_MENU: case AVRCP_OPERATION_ID_ROOT_MENU:
avrcp_target_operation_accepted(connection->avrcp_cid, packet[6], packet[7], packet[8]); avrcp_target_operation_accepted(connection->avrcp_cid, (avrcp_operation_id_t) packet[6], packet[7], packet[8]);
avrcp_target_emit_operation(avrcp_target_context.avrcp_callback, connection->avrcp_cid, operation_id, packet[7], packet[8]); avrcp_target_emit_operation(avrcp_target_context.avrcp_callback, connection->avrcp_cid, operation_id, packet[7], packet[8]);
break; break;
case AVRCP_OPERATION_ID_UNDEFINED: case AVRCP_OPERATION_ID_UNDEFINED:
avrcp_target_operation_not_implemented(connection->avrcp_cid, packet[6], packet[7], packet[8]); avrcp_target_operation_not_implemented(connection->avrcp_cid, (avrcp_operation_id_t) packet[6], packet[7], packet[8]);
return; return;
default: default:
avrcp_target_operation_not_implemented(connection->avrcp_cid, packet[6], packet[7], packet[8]); avrcp_target_operation_not_implemented(connection->avrcp_cid, (avrcp_operation_id_t) packet[6], packet[7], packet[8]);
return; return;
} }
break; break;
} }
case AVRCP_CMD_OPCODE_VENDOR_DEPENDENT: case AVRCP_CMD_OPCODE_VENDOR_DEPENDENT:
pdu_id = pdu[0]; pdu_id = (avrcp_pdu_id_t) pdu[0];
// 1 - reserved // 1 - reserved
// 2-3 param length, // 2-3 param length,
uint16_t length = big_endian_read_16(pdu, 2); length = big_endian_read_16(pdu, 2);
memcpy(connection->cmd_operands, company_id, 3); memcpy(connection->cmd_operands, company_id, 3);
connection->cmd_operands_length = 3; connection->cmd_operands_length = 3;
switch (pdu_id){ switch (pdu_id){
@ -997,7 +1000,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
if (absolute_volume < 0x80){ if (absolute_volume < 0x80){
connection->volume_percentage = absolute_volume; connection->volume_percentage = absolute_volume;
} }
avrcp_target_response_accept(connection, subunit_type, subunit_id, opcode, pdu_id, connection->volume_percentage); avrcp_target_response_accept(connection, subunit_type, subunit_id, opcode, pdu_id, (avrcp_status_code_t) connection->volume_percentage);
break; break;
} }
default: default: