mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-26 12:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify incoming call sm

Browse Source
This commit is contained in:
Milanka Ringwald 2015-11-20 13:50:18 +01:00
parent 8152ef5960
commit be26d8c843
2 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hfp.h
View File

@ -220,6 +220,7 @@ typedef enum {
HFP_AG_INCOMING_CALL,
HFP_AG_INCOMING_CALL_ACCEPTED_BY_AG,
HFP_AG_INCOMING_CALL_ACCEPTED_BY_HF,
HFP_AG_AUDIO_CONNECTION_ESTABLISHED,
HFP_AG_TERMINATE_CALL_BY_AG,
HFP_AG_TERMINATE_CALL_BY_HF,
HFP_AG_CALL_DROPPED,

61
src/hfp_ag.c
View File

@ -660,46 +660,33 @@ static void hfp_timeout_stop(hfp_connection_t * context){
run_loop_remove_timer(&context->hfp_timeout);
}
static void hfp_ag_hf_stop_ringing(hfp_connection_t * context);
//
// only reason for this: wait for audio connection established event
//
static int incoming_call_state_machine(hfp_connection_t * context){
if (!context->run_call_state_machine) return 0;
if (context->state < HFP_SERVICE_LEVEL_CONNECTION_ESTABLISHED) return 0;
if (context->state != HFP_AUDIO_CONNECTION_ESTABLISHED) return 0;
if (context->call_state != HFP_CALL_W4_AUDIO_CONNECTION) return 0;
int done = 0;
switch (context->call_state){
case HFP_CALL_TRIGGER_AUDIO_CONNECTION:
if (use_in_band_tone()){
context->call_state = HFP_CALL_ACTIVE;
} else {
context->call_state = HFP_CALL_W4_AUDIO_CONNECTION;
hfp_ag_establish_audio_connection(context->remote_addr);
}
break;
case HFP_CALL_W4_AUDIO_CONNECTION:
if (context->state < HFP_AUDIO_CONNECTION_ESTABLISHED) return 0;
if (use_in_band_tone()){
context->call_state = HFP_CALL_RINGING;
hfp_emit_event(hfp_callback, HFP_SUBEVENT_START_RINGINIG, 0);
} else {
context->call_state = HFP_CALL_ACTIVE;
}
return 0;
default:
break;
// we got event: audio connection established
if (use_in_band_tone()){
context->call_state = HFP_CALL_RINGING;
hfp_emit_event(hfp_callback, HFP_SUBEVENT_START_RINGINIG, 0);
} else {
context->call_state = HFP_CALL_ACTIVE;
}
return done;
return 0;
}
//
// transitition implementations for hfp_ag_call_state_machine
//
static void hfp_ag_hf_start_ringing(hfp_connection_t * context){
hfp_timeout_start(context);
context->ag_ring = 1;
if (use_in_band_tone()){
hfp_ag_establish_audio_connection(context->remote_addr);
context->call_state = HFP_CALL_W4_AUDIO_CONNECTION;
hfp_ag_establish_audio_connection(context->remote_addr);
} else {
context->call_state = HFP_CALL_RINGING;
hfp_emit_event(hfp_callback, HFP_SUBEVENT_START_RINGINIG, 0);
@ -745,7 +732,13 @@ static void hfp_ag_hf_accept_call(hfp_connection_t * source){
connection->run_call_state_machine = 1;
if (connection == source){
connection->ok_pending = 1;
connection->call_state = HFP_CALL_TRIGGER_AUDIO_CONNECTION;
if (use_in_band_tone()){
connection->call_state = HFP_CALL_ACTIVE;
} else {
connection->call_state = HFP_CALL_W4_AUDIO_CONNECTION;
hfp_ag_establish_audio_connection(connection->remote_addr);
}
connection->ag_indicators_status_update_bitmap = store_bit(connection->ag_indicators_status_update_bitmap, call_indicator_index, 1);
connection->ag_indicators_status_update_bitmap = store_bit(connection->ag_indicators_status_update_bitmap, callsetup_indicator_index, 1);
@ -833,9 +826,8 @@ static void hfp_ag_call_sm(hfp_ag_call_event_t event, hfp_connection_t * connect
default:
break;
}
break;
case HFP_CALL_STATUS_ACTIVE_OR_HELD_CALL_IS_PRESENT:
default:
break;
}
@ -914,14 +906,11 @@ static void hfp_ag_call_sm(hfp_ag_call_event_t event, hfp_connection_t * connect
break;
}
break;
default:
break;
}
}
static void hfp_run_for_context(hfp_connection_t *context){
if (!context) return;
if (!rfcomm_can_send_packet_now(context->rfcomm_cid)) return;