fix build

This commit is contained in:
Matthias Ringwald 2021-01-19 10:51:31 +01:00
parent 2a95308bb2
commit b5bbcbf411
4 changed files with 11 additions and 4 deletions

View File

@ -1374,9 +1374,9 @@ avdtp_channel_mode_t avdtp_choose_sbc_channel_mode(avdtp_stream_endpoint_t * str
avdtp_sbc_allocation_method_t avdtp_choose_sbc_allocation_method(avdtp_stream_endpoint_t * stream_endpoint, uint8_t remote_allocation_method_bitmap){
uint8_t * media_codec = stream_endpoint->sep.capabilities.media_codec.media_codec_information;
avdtp_sbc_allocation_method_t allocation_method_bitmap = (media_codec[1] & 0x03) & remote_allocation_method_bitmap;
uint8_t allocation_method = AVDTP_SBC_ALLOCATION_METHOD_LOUDNESS;
uint8_t allocation_method_bitmap = (media_codec[1] & 0x03) & remote_allocation_method_bitmap;
avdtp_sbc_allocation_method_t allocation_method = AVDTP_SBC_ALLOCATION_METHOD_LOUDNESS;
if (allocation_method_bitmap & AVDTP_SBC_ALLOCATION_METHOD_LOUDNESS){
allocation_method = AVDTP_SBC_ALLOCATION_METHOD_LOUDNESS;
} else if (allocation_method_bitmap & AVDTP_SBC_ALLOCATION_METHOD_SNR){

View File

@ -1160,7 +1160,7 @@ avdtp_signaling_emit_media_codec_atrac_configuration(avdtp_stream_endpoint_t *st
event[pos++] = remote_seid;
event[pos++] = reconfigure;
avdtp_atrac_version_t version = media_codec_information[0] >> 5;
avdtp_atrac_version_t version = (avdtp_atrac_version_t) (media_codec_information[0] >> 5);
uint8_t channel_mode_bitmap = (media_codec_information[0] >> 2) & 0x07;
uint16_t sampling_frequency_bitmap = (media_codec_information[1] >> 4) & 0x03;
uint8_t vbr = (media_codec_information[1] >> 3) & 0x01;

View File

@ -3131,7 +3131,10 @@ void hci_deinit(void){
}
#endif
hci_stack = NULL;
#ifdef ENABLE_CLASSIC
disable_l2cap_timeouts = 0;
#endif
}
/**

View File

@ -873,7 +873,9 @@ static uint8_t l2cap_next_sig_id(void){
void l2cap_init(void){
signaling_responses_pending = 0;
#ifdef L2CAP_USES_CHANNELS
local_source_cid = 0x40;
#endif
sig_seq_nr = 0xff;
l2cap_channels = NULL;
@ -925,7 +927,9 @@ void l2cap_init(void){
* @brief De-Init L2CAP
*/
void l2cap_deinit(void){
#ifdef ENABLE_CLASSIC
memset(l2cap_outgoing_classic_addr, 0, 6);
#endif
signaling_responses_pending = 0;
}