mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-20 18:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings - mostly enum casts and set but not used

Browse Source
This commit is contained in:
Matthias Ringwald 2017-06-22 15:29:47 +02:00
parent ba9e989ad9
commit d5ff3b26ac
5 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rd-party/bluedroid/decoder/srce/decoder-private.c vendored
View File

@ -37,7 +37,7 @@ This file drives SBC decoding.
#include "oi_bitstream.h"
#include <stdio.h>
OI_CHAR * const OI_Codec_Copyright = (OI_CHAR *const)"Copyright 2002-2007 Open Interface North America, Inc. All rights reserved";
OI_CHAR * const OI_Codec_Copyright = "Copyright 2002-2007 Open Interface North America, Inc. All rights reserved";
INLINE OI_STATUS internal_DecoderReset(OI_CODEC_SBC_DECODER_CONTEXT *context,
OI_UINT32 *decoderData,

2
3rd-party/bluedroid/decoder/srce/oi_codec_version.c vendored
View File

@ -38,7 +38,7 @@ version number of the eSBC codec
#include "oi_codec_sbc_private.h"
/** Version string for the BLUEmagic 3.0 protocol stack and profiles */
PRIVATE OI_CHAR * const codecVersion = (OI_CHAR * const)"v1.5"
PRIVATE OI_CHAR * const codecVersion = "v1.5"
#ifdef OI_SBC_EVAL
" (Evaluation version)"
#endif

47
src/classic/avrcp.c
View File

@ -455,7 +455,7 @@ static inline uint8_t request_pass_through_press_control_cmd(uint16_t avrcp_cid,
connection->command_opcode = AVRCP_CMD_OPCODE_PASS_THROUGH;
connection->command_type = AVRCP_CTYPE_CONTROL;
connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
connection->subunit_id = 0;
connection->subunit_id = AVRCP_SUBUNIT_ID;
connection->cmd_operands_length = 0;
connection->continuous_fast_forward_cmd = continuous_fast_forward_cmd;
@ -521,7 +521,7 @@ static void avrcp_prepare_notification(avrcp_connection_t * connection, avrcp_no
connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
connection->command_type = AVRCP_CTYPE_NOTIFY;
connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
connection->subunit_id = 0;
connection->subunit_id = AVRCP_SUBUNIT_ID;
int pos = 0;
big_endian_store_24(connection->cmd_operands, pos, BT_SIG_COMPANY_ID);
pos += 3;
@ -555,15 +555,18 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
// uint8_t byte_value = packet[2];
// uint16_t pid = (byte_value << 8) | packet[2];
avrcp_command_type_t ctype = packet[pos++];
avrcp_command_type_t ctype = (avrcp_command_type_t) packet[pos++];
uint8_t byte_value = packet[pos++];
avrcp_subunit_type_t subunit_type = byte_value >> 3;
avrcp_subunit_type_t subunit_id = byte_value & 0x07;
avrcp_subunit_type_t subunit_type = (avrcp_subunit_type_t) (byte_value >> 3);
avrcp_subunit_type_t subunit_id = (avrcp_subunit_type_t) (byte_value & 0x07);
opcode = packet[pos++];
// printf(" Transport header 0x%02x (transaction_label %d, packet_type %d, frame_type %d, ipid %d), pid 0x%4x\n",
// transport_header, transaction_label, packet_type, frame_type, ipid, pid);
// // printf_hexdump(packet+pos, size-pos);
uint8_t pdu_id;
uint16_t param_length;
switch (avrcp_cmd_opcode(packet,size)){
case AVRCP_CMD_OPCODE_UNIT_INFO:{
if (connection->state != AVCTP_W2_RECEIVE_RESPONSE) return;
@ -587,7 +590,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
memcpy(operands, packet+pos, 7);
pos += 7;
// uint32_t company_id = operands[0] << 16 | operands[1] << 8 | operands[2];
uint8_t pdu_id = operands[3];
pdu_id = operands[3];
if (connection->state != AVCTP_W2_RECEIVE_RESPONSE && pdu_id != AVRCP_PDU_ID_REGISTER_NOTIFICATION){
log_info("AVRCP_CMD_OPCODE_VENDOR_DEPENDENT state %d", connection->state);
@ -598,7 +601,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
// uint8_t unit_type = operands[4] >> 3;
// uint8_t unit = operands[4] & 0x07;
uint16_t param_length = big_endian_read_16(operands, 5);
param_length = big_endian_read_16(operands, 5);
// printf(" VENDOR DEPENDENT response: ctype 0x%02x (0C), subunit_type 0x%02x (1F), subunit_id 0x%02x (07), opcode 0x%02x (30), unit_type 0x%02x, unit %d, company_id 0x%06x\n",
// ctype, subunit_type, subunit_id, opcode, unit_type, unit, company_id );
@ -609,17 +612,17 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
case AVRCP_PDU_ID_GetCurrentPlayerApplicationSettingValue:{
uint8_t num_attributes = packet[pos++];
int i;
uint8_t repeat_mode = 0;
uint8_t shuffle_mode = 0;
avrcp_repeat_mode_t repeat_mode = AVRCP_REPEAT_MODE_INVALID;
avrcp_shuffle_mode_t shuffle_mode = AVRCP_SHUFFLE_MODE_INVALID;
for (i = 0; i < num_attributes; i++){
uint8_t attribute_id = packet[pos++];
uint8_t attribute_value = packet[pos++];
switch (attribute_id){
case 0x02:
repeat_mode = attribute_value;
repeat_mode = (avrcp_repeat_mode_t) attribute_value;
break;
case 0x03:
shuffle_mode = attribute_value;
shuffle_mode = (avrcp_shuffle_mode_t) attribute_value;
break;
default:
break;
@ -654,7 +657,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
break;
}
case AVRCP_PDU_ID_GET_CAPABILITIES:{
avrcp_capability_id_t capability_id = packet[pos++];
avrcp_capability_id_t capability_id = (avrcp_capability_id_t) packet[pos++];
uint8_t capability_count = packet[pos++];
int i;
switch (capability_id){
@ -701,7 +704,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
break;
}
case AVRCP_PDU_ID_REGISTER_NOTIFICATION:{
uint8_t event_id = packet[pos++];
avrcp_notification_event_id_t event_id = (avrcp_notification_event_id_t) packet[pos++];
uint16_t event_mask = (1 << event_id);
uint16_t reset_event_mask = ~event_mask;
switch (ctype){
@ -836,7 +839,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
uint16_t max_string_attribute_value_len = 0;
if (ctype == AVRCP_CTYPE_RESPONSE_IMPLEMENTED_STABLE || ctype == AVRCP_CTYPE_RESPONSE_CHANGED_STABLE){
for (i = 0; i < num_attributes; i++){
avrcp_media_attribute_id_t attr_id = big_endian_read_32(packet, pos);
avrcp_media_attribute_id_t attr_id = (avrcp_media_attribute_id_t) big_endian_read_32(packet, pos);
pos += 4;
// uint16_t character_set = big_endian_read_16(packet, pos);
pos += 2;
@ -898,7 +901,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
pos += 2;
event[pos++] = ctype;
for (i = 0; i < sizeof(attribute_order); i++){
avrcp_media_attribute_id_t attr_id = attribute_order[i];
avrcp_media_attribute_id_t attr_id = (avrcp_media_attribute_id_t) attribute_order[i];
uint16_t value_len = 0;
switch (attr_id){
case AVRCP_MEDIA_ATTR_TITLE:
@ -997,7 +1000,7 @@ static void avrcp_handle_can_send_now(avrcp_connection_t * connection){
for (i = 1; i <= AVRCP_NOTIFICATION_EVENT_VOLUME_CHANGED; i++){
if (connection->notifications_to_register & (1<<i)){
connection->notifications_to_register &= ~ (1 << i);
avrcp_prepare_notification(connection, i);
avrcp_prepare_notification(connection, (avrcp_notification_event_id_t) i);
connection->state = AVCTP_W2_RECEIVE_RESPONSE;
avrcp_send_cmd(connection->l2cap_signaling_cid, connection);
return;
@ -1179,7 +1182,7 @@ static uint8_t avrcp_get_capabilities(uint16_t avrcp_cid, uint8_t capability_id)
connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
connection->command_type = AVRCP_CTYPE_STATUS;
connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
connection->subunit_id = 0;
connection->subunit_id = AVRCP_SUBUNIT_ID;
big_endian_store_24(connection->cmd_operands, 0, BT_SIG_COMPANY_ID);
connection->cmd_operands[3] = AVRCP_PDU_ID_GET_CAPABILITIES; // PDU ID
connection->cmd_operands[4] = 0;
@ -1285,7 +1288,7 @@ uint8_t avrcp_get_play_status(uint16_t avrcp_cid){
connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
connection->command_type = AVRCP_CTYPE_STATUS;
connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
connection->subunit_id = 0;
connection->subunit_id = AVRCP_SUBUNIT_ID;
big_endian_store_24(connection->cmd_operands, 0, BT_SIG_COMPANY_ID);
connection->cmd_operands[3] = AVRCP_PDU_ID_GET_PLAY_STATUS;
connection->cmd_operands[4] = 0; // reserved(upper 6) | packet_type -> 0
@ -1329,7 +1332,7 @@ uint8_t avrcp_get_now_playing_info(uint16_t avrcp_cid){
connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
connection->command_type = AVRCP_CTYPE_STATUS;
connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
connection->subunit_id = 0;
connection->subunit_id = AVRCP_SUBUNIT_ID;
int pos = 0;
big_endian_store_24(connection->cmd_operands, pos, BT_SIG_COMPANY_ID);
pos += 3;
@ -1365,7 +1368,7 @@ uint8_t avrcp_set_absolute_volume(uint16_t avrcp_cid, uint8_t volume){
connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
connection->command_type = AVRCP_CTYPE_CONTROL;
connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
connection->subunit_id = 0;
connection->subunit_id = AVRCP_SUBUNIT_ID;
int pos = 0;
big_endian_store_24(connection->cmd_operands, pos, BT_SIG_COMPANY_ID);
pos += 3;
@ -1395,7 +1398,7 @@ uint8_t avrcp_query_shuffle_and_repeat_modes(uint16_t avrcp_cid){
connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
connection->command_type = AVRCP_CTYPE_STATUS;
connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
connection->subunit_id = 0;
connection->subunit_id = AVRCP_SUBUNIT_ID;
big_endian_store_24(connection->cmd_operands, 0, BT_SIG_COMPANY_ID);
connection->cmd_operands[3] = AVRCP_PDU_ID_GetCurrentPlayerApplicationSettingValue; // PDU ID
connection->cmd_operands[4] = 0;
@ -1424,7 +1427,7 @@ static uint8_t avrcp_set_current_player_application_setting_value(uint16_t avrcp
connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
connection->command_type = AVRCP_CTYPE_CONTROL;
connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
connection->subunit_id = 0;
connection->subunit_id = AVRCP_SUBUNIT_ID;
int pos = 0;
big_endian_store_24(connection->cmd_operands, pos, BT_SIG_COMPANY_ID);
pos += 3;

6
src/classic/avrcp.h
View File

@ -218,13 +218,15 @@ typedef enum {
} avrcp_play_status_t;
typedef enum {
AVRCP_SHUFFLE_MODE_OFF = 0x01,
AVRCP_SHUFFLE_MODE_INVALID,
AVRCP_SHUFFLE_MODE_OFF,
AVRCP_SHUFFLE_MODE_ALL_TRACKS,
AVRCP_SHUFFLE_MODE_GROUP
} avrcp_shuffle_mode_t;
typedef enum {
AVRCP_REPEAT_MODE_OFF = 0x01,
AVRCP_REPEAT_MODE_INVALID,
AVRCP_REPEAT_MODE_OFF,
AVRCP_REPEAT_MODE_SINGLE_TRACK,
AVRCP_REPEAT_MODE_ALL_TRACKS,
AVRCP_REPEAT_MODE_GROUP

2
src/classic/hfp_hf.c
View File

@ -1072,6 +1072,8 @@ static void hfp_handle_rfcomm_event(uint8_t packet_type, uint16_t channel, uint8
hfp_callsetup_status = (hfp_callsetup_status_t) hfp_connection->ag_indicators[i].status;
} else if (strcmp(hfp_connection->ag_indicators[i].name, "callheld") == 0){
hfp_callheld_status = (hfp_callheld_status_t) hfp_connection->ag_indicators[i].status;
// avoid set but not used warning
(void) hfp_callheld_status;
} else if (strcmp(hfp_connection->ag_indicators[i].name, "call") == 0){
hfp_call_status = (hfp_call_status_t) hfp_connection->ag_indicators[i].status;
}