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

handle incoming/terminate call on all hfp connections

Browse Source
This commit is contained in:
Matthias Ringwald 2015-11-19 11:35:55 +01:00
parent f9feb1a178
commit f0b83df783
4 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/hfp_ag.c
View File

@ -73,6 +73,9 @@ static int hfp_ag_call_hold_services_nr = 0;
static char *hfp_ag_call_hold_services[6];
static hfp_callback_t hfp_callback;
// AG Model
static uint8_t hfp_ag_use_in_band_ring_tone = 0;
static void packet_handler(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
hfp_generic_status_indicator_t * get_hfp_generic_status_indicators();
@ -176,7 +179,7 @@ static int hfp_ag_ok(uint16_t cid){
}
static int hfp_ag_ring(uint16_t cid){
return send_str_over_rfcomm(cid, "\r\nRING\r\n");
return send_str_over_rfcomm(cid, (char *) "\r\nRING\r\n");
}
static int hfp_ag_error(uint16_t cid){
@ -754,7 +757,7 @@ static void hfp_handle_rfcomm_data(uint8_t packet_type, uint16_t channel, uint8_
}
}
static void hfp_run(){
static void hfp_run(void){
linked_list_iterator_t it;
linked_list_iterator_init(&it, hfp_get_connections());
while (linked_list_iterator_has_next(&it)){
@ -875,27 +878,42 @@ void hfp_ag_release_audio_connection(bd_addr_t bd_addr){
hfp_run_for_context(connection);
}
/**
* @brief Enable in-band ring tone
*/
void hfp_ag_set_use_in_band_ring_tone(int use_in_band_ring_tone){
hfp_ag_use_in_band_ring_tone = use_in_band_ring_tone;
}
/**
* @brief
*/
void hfp_ag_incoming_call(bd_addr_t bd_addr, uint8_t use_in_band_ring_tone){
hfp_ag_establish_service_level_connection(bd_addr);
hfp_connection_t * connection = get_hfp_connection_context_for_bd_addr(bd_addr);
connection->use_in_band_ring_tone = use_in_band_ring_tone;
connection->run_call_state_machine = 1;
hfp_run_for_context(connection);
void hfp_ag_incoming_call(void){
linked_list_iterator_t it;
linked_list_iterator_init(&it, hfp_get_connections());
while (linked_list_iterator_has_next(&it)){
hfp_connection_t * connection = (hfp_connection_t *)linked_list_iterator_next(&it);
hfp_ag_establish_service_level_connection(connection->remote_addr);
connection->use_in_band_ring_tone = hfp_ag_use_in_band_ring_tone;
connection->run_call_state_machine = 1;
hfp_run_for_context(connection);
}
}
/**
* @brief
*/
void hfp_ag_terminate_call(bd_addr_t bd_addr){
hfp_connection_t * connection = get_hfp_connection_context_for_bd_addr(bd_addr);
if (connection->state != HFP_AUDIO_CONNECTION_ESTABLISHED) return;
connection->terminate_call = 1;
hfp_run_for_context(connection);
void hfp_ag_terminate_call(void){
linked_list_iterator_t it;
linked_list_iterator_init(&it, hfp_get_connections());
while (linked_list_iterator_has_next(&it)){
hfp_connection_t * connection = (hfp_connection_t *)linked_list_iterator_next(&it);
if (connection->state != HFP_AUDIO_CONNECTION_ESTABLISHED) return;
connection->terminate_call = 1;
hfp_run_for_context(connection);
}
}

13
src/hfp_ag.h
View File

@ -163,16 +163,19 @@ void hfp_ag_release_audio_connection(bd_addr_t bd_addr);
/**
* @brief
* @brief Enable in-band ring tone
*/
void hfp_ag_incoming_call(bd_addr_t bd_addr, uint8_t use_in_band_ring_tone);
void hfp_ag_set_use_in_band_ring_tone(int use_in_band_ring_tone);
/**
* @brief
*/
void hfp_ag_terminate_call(bd_addr_t bd_addr);
void hfp_ag_incoming_call(void);
/**
* @brief
*/
void hfp_ag_terminate_call(void);
/* API_END */

5
test/hfp/hfp_ag_client_test.c
View File

@ -216,8 +216,9 @@ TEST_GROUP(HFPClient){
TEST(HFPClient, HFAnswerIncomingCallWithInBandRingTone){
setup_hfp_service_level_connection(default_slc_setup(), default_slc_setup_size());
CHECK_EQUAL(service_level_connection_established, 1);
hfp_ag_incoming_call(device_addr, 1);
hfp_ag_set_use_in_band_ring_tone(1);
hfp_ag_incoming_call();
simulate_test_sequence(default_ic_setup(), default_ic_setup_size());
CHECK_EQUAL(audio_connection_established, 1);

9
test/pts/hfp_ag_test.c
View File

@ -121,6 +121,7 @@ static void show_usage(void){
printf("c - simulate incoming call\n");
printf("C - simulate terminage call\n");
printf("r - enable in-band ring tone\n");
printf("t - terminate connection\n");
printf("---\n");
@ -159,16 +160,20 @@ static int stdin_process(struct data_source *ds){
break;
case 'c':
printf("Simulate incoming call\n");
hfp_ag_incoming_call(device_addr, inband_ringing);
hfp_ag_incoming_call();
break;
case 'C':
printf("Simulate terminate call\n");
hfp_ag_terminate_call(device_addr);
hfp_ag_terminate_call();
break;
case 'd':
printf("Report AG failure\n");
hfp_ag_report_extended_audio_gateway_error_result_code(device_addr, HFP_CME_ERROR_AG_FAILURE);
break;
case 'r':
printf("Enable in-band ring tone");
hfp_ag_set_use_in_band_ring_tone(1);
break;
case 't':
gap_disconnect(handle);
default: