mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-01 22:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix codecs connection tests

Browse Source
This commit is contained in:
Milanka Ringwald 2015-11-13 23:19:36 +01:00
parent d212fbd898
commit ec0ee77dc3
4 changed files with 53 additions and 33 deletions

1
src/hfp.h

@ -280,6 +280,7 @@ typedef enum {
HFP_RECEIVED_LIST_OF_CODECS, HFP_RECEIVED_LIST_OF_CODECS,
HFP_CODECS_RECEIVED_TRIGGER_CODEC_EXCHANGE, HFP_CODECS_RECEIVED_TRIGGER_CODEC_EXCHANGE,
HFP_CODECS_AG_SENT_COMMON_CODEC, HFP_CODECS_AG_SENT_COMMON_CODEC,
HFP_CODECS_AG_RESEND_COMMON_CODEC,
HFP_CODECS_EXCHANGED, HFP_CODECS_EXCHANGED,
HFP_CODECS_ERROR HFP_CODECS_ERROR
} hfp_codecs_state_t; } hfp_codecs_state_t;

47
src/hfp_ag.c

@ -371,29 +371,49 @@ static int codecs_exchange_state_machine(hfp_connection_t * context){
HFP_CMD_HF_CONFIRMED_CODEC == received AT+BCS HFP_CMD_HF_CONFIRMED_CODEC == received AT+BCS
*/ */
if (context->codecs_state == HFP_CODECS_RECEIVED_TRIGGER_CODEC_EXCHANGE){ switch (context->codecs_state){
context->command = HFP_CMD_AG_SEND_COMMON_CODEC; case HFP_CODECS_RECEIVED_TRIGGER_CODEC_EXCHANGE:
context->command = HFP_CMD_AG_SEND_COMMON_CODEC;
break;
case HFP_CODECS_AG_RESEND_COMMON_CODEC:
context->command = HFP_CMD_AG_SEND_COMMON_CODEC;
break;
default:
break;
} }
printf(" -> State machine: CC\n");
int done = 1; int done = 1;
switch (context->command){ switch (context->command){
case HFP_CMD_AVAILABLE_CODECS: case HFP_CMD_AVAILABLE_CODECS:
printf("HFP_RECEIVED_LIST_OF_CODECS \n");
context->codecs_state = HFP_RECEIVED_LIST_OF_CODECS;
context->suggested_codec = hfp_ag_suggest_codec(context);
hfp_ag_ok(context->rfcomm_cid); hfp_ag_ok(context->rfcomm_cid);
printf("HFP_RECEIVED_LIST_OF_CODECS \n");
if (context->state < HFP_SERVICE_LEVEL_CONNECTION_ESTABLISHED){
context->codecs_state = HFP_RECEIVED_LIST_OF_CODECS;
break;
}
switch (context->codecs_state){
case HFP_CODECS_AG_SENT_COMMON_CODEC:
case HFP_CODECS_EXCHANGED:
context->codecs_state = HFP_CODECS_AG_RESEND_COMMON_CODEC;
break;
default:
break;
}
break; break;
case HFP_CMD_TRIGGER_CODEC_CONNECTION_SETUP: case HFP_CMD_TRIGGER_CODEC_CONNECTION_SETUP:
hfp_ag_ok(context->rfcomm_cid);
printf(" HFP_CMD_TRIGGER_CODEC_CONNECTION_SETUP \n"); printf(" HFP_CMD_TRIGGER_CODEC_CONNECTION_SETUP \n");
context->codecs_state = HFP_CODECS_RECEIVED_TRIGGER_CODEC_EXCHANGE; context->codecs_state = HFP_CODECS_RECEIVED_TRIGGER_CODEC_EXCHANGE;
context->suggested_codec = hfp_ag_suggest_codec(context);
hfp_ag_ok(context->rfcomm_cid);
break; break;
case HFP_CMD_AG_SEND_COMMON_CODEC: case HFP_CMD_AG_SEND_COMMON_CODEC:
printf(" HFP_CMD_AG_SEND_COMMON_CODEC \n"); printf(" HFP_CMD_AG_SEND_COMMON_CODEC \n");
context->codecs_state = HFP_CODECS_AG_SENT_COMMON_CODEC; context->codecs_state = HFP_CODECS_AG_SENT_COMMON_CODEC;
context->suggested_codec = hfp_ag_suggest_codec(context);
hfp_ag_cmd_suggest_codec(context->rfcomm_cid, context->suggested_codec); hfp_ag_cmd_suggest_codec(context->rfcomm_cid, context->suggested_codec);
break; break;
@ -419,9 +439,9 @@ static int codecs_exchange_state_machine(hfp_connection_t * context){
static int hfp_ag_run_for_context_service_level_connection(hfp_connection_t * context){ static int hfp_ag_run_for_context_service_level_connection(hfp_connection_t * context){
if (context->state >= HFP_CODECS_CONNECTION_ESTABLISHED) return 0; if (context->state >= HFP_SERVICE_LEVEL_CONNECTION_ESTABLISHED) return 0;
int done = 0; int done = 0;
// printf(" AG run for context_service_level_connection 1\n"); printf(" -> State machine: SLC\n");
switch(context->command){ switch(context->command){
case HFP_CMD_SUPPORTED_FEATURES: case HFP_CMD_SUPPORTED_FEATURES:
@ -538,11 +558,11 @@ static int hfp_ag_run_for_context_service_level_connection(hfp_connection_t * co
static int hfp_ag_run_for_context_service_level_connection_queries(hfp_connection_t * context){ static int hfp_ag_run_for_context_service_level_connection_queries(hfp_connection_t * context){
if (context->state != HFP_SERVICE_LEVEL_CONNECTION_ESTABLISHED) return 0; if (context->state != HFP_SERVICE_LEVEL_CONNECTION_ESTABLISHED) return 0;
int done = 0; int done = 0;
printf(" SLC queries: \n");
done = codecs_exchange_state_machine(context); done = codecs_exchange_state_machine(context);
if (done) return done; if (done) return done;
printf(" -> State machine: SLC Queries\n");
switch(context->command){ switch(context->command){
case HFP_CMD_QUERY_OPERATOR_SELECTION: case HFP_CMD_QUERY_OPERATOR_SELECTION:
@ -737,10 +757,15 @@ static void hfp_run_for_context(hfp_connection_t *context){
context->command = HFP_CMD_NONE; context->command = HFP_CMD_NONE;
return; return;
} }
//printf("hfp_run_for_context 1, state %d\n", context->state);
int done = hfp_ag_run_for_context_service_level_connection(context); int done = hfp_ag_run_for_context_service_level_connection(context);
//printf("hfp_run_for_context 2, state %d\n", context->state);
if (!done){ if (!done){
done = hfp_ag_run_for_context_service_level_connection_queries(context); done = hfp_ag_run_for_context_service_level_connection_queries(context);
// printf("hfp_run_for_context 3, state %d\n", context->state);
} }
// if (!done){ // if (!done){
// done = incoming_call_state_machine(context); // done = incoming_call_state_machine(context);

26
test/hfp/hfp_ag_client_test.c

@ -251,20 +251,20 @@ TEST(HFPClient, HFCodecsConnectionEstablished){
} }
} }
// TEST(HFPClient, HFServiceLevelConnectionCommands){ TEST(HFPClient, HFServiceLevelConnectionCommands){
// setup_hfp_service_level_connection(default_slc_setup(), default_slc_setup_size()); setup_hfp_service_level_connection(default_slc_setup(), default_slc_setup_size());
// CHECK_EQUAL(service_level_connection_established, 1); CHECK_EQUAL(service_level_connection_established, 1);
// for (int i = 0; i < slc_cmds_tests_size(); i++){ for (int i = 0; i < slc_cmds_tests_size(); i++){
// simulate_test_sequence(hfp_slc_cmds_tests()[i].test, hfp_slc_cmds_tests()[i].len); simulate_test_sequence(hfp_slc_cmds_tests()[i].test, hfp_slc_cmds_tests()[i].len);
// } }
// } }
// TEST(HFPClient, HFServiceLevelConnectionEstablished){ TEST(HFPClient, HFServiceLevelConnectionEstablished){
// for (int i = 0; i < slc_tests_size(); i++){ for (int i = 0; i < slc_tests_size(); i++){
// setup_hfp_service_level_connection(hfp_slc_tests()[i].test, hfp_slc_tests()[i].len); setup_hfp_service_level_connection(hfp_slc_tests()[i].test, hfp_slc_tests()[i].len);
// CHECK_EQUAL(service_level_connection_established, 1); CHECK_EQUAL(service_level_connection_established, 1);
// } }
// } }
int main (int argc, const char * argv[]){ int main (int argc, const char * argv[]){

12
test/hfp/test_sequences.c

@ -136,18 +136,12 @@ const char * cc_test4[] = {
"OK" "OK"
}; };
const char * cc_test5[] = {
"+BCS:1",
"AT+BCS=1",
"OK"
};
hfp_test_item_t cc_tests[] = { hfp_test_item_t cc_tests[] = {
TEST_SEQUENCE(cc_test1), TEST_SEQUENCE(cc_test1),
// TEST_SEQUENCE(cc_test2), TEST_SEQUENCE(cc_test2),
// TEST_SEQUENCE(cc_test3), TEST_SEQUENCE(cc_test3),
// TEST_SEQUENCE(cc_test4), TEST_SEQUENCE(cc_test4)
// TEST_SEQUENCE(cc_test5)
}; };
/* Incoming call sequence */ /* Incoming call sequence */