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

hsp_ag: remove hsp_establish_audio_connection flag, use state instead

Browse Source
This commit is contained in:
Milanka Ringwald 2020-09-09 10:22:04 +02:00
parent bd4519d99f
commit a400e7302a
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/classic/hsp_ag.c
View File

@ -93,7 +93,6 @@ static uint8_t ag_send_ok = 0;
static uint8_t ag_send_error = 0;
static uint8_t ag_support_custom_commands = 0;
static uint8_t hsp_disconnect_rfcomm = 0;
static uint8_t hsp_establish_audio_connection = 0;
static uint8_t hsp_release_audio_connection = 0;
static btstack_packet_callback_registration_t hci_event_callback_registration;
@ -267,7 +266,6 @@ static void hsp_ag_reset_state(void){
ag_speaker_gain = -1;
hsp_disconnect_rfcomm = 0;
hsp_establish_audio_connection = 0;
hsp_release_audio_connection = 0;
}
@ -318,8 +316,7 @@ void hsp_ag_disconnect(void){
void hsp_ag_establish_audio_connection(void){
switch (hsp_state){
case HSP_RFCOMM_CONNECTION_ESTABLISHED:
hsp_establish_audio_connection = 1;
hsp_state = HSP_W4_SCO_CONNECTED;
hsp_state = HSP_W2_CONNECT_SCO;
break;
case HSP_W4_RFCOMM_CONNECTED:
hsp_state = HSP_W4_CONNECTION_ESTABLISHED_TO_SHUTDOWN;
@ -424,13 +421,6 @@ static void hsp_run(void){
return;
}
if (hsp_establish_audio_connection){
if (!hci_can_send_command_packet_now()) return;
hsp_establish_audio_connection = 0;
hci_send_cmd(&hci_setup_synchronous_connection, rfcomm_handle, 8000, 8000, 0xFFFF, hci_get_sco_voice_setting(), 0xFF, 0x003F);
return;
}
if (hsp_release_audio_connection){
hsp_release_audio_connection = 0;
gap_disconnect(sco_handle);
@ -439,7 +429,6 @@ static void hsp_run(void){
if (hsp_disconnect_rfcomm){
hsp_disconnect_rfcomm = 0;
hsp_establish_audio_connection = 0;
rfcomm_disconnect(rfcomm_cid);
return;
}
@ -525,7 +514,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
hsp_release_audio_connection = 1;
break;
case HSP_RFCOMM_CONNECTION_ESTABLISHED:
hsp_establish_audio_connection = 1;
hsp_state = HSP_W2_CONNECT_SCO;
break;
default:
break;