mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-07 06:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

hfp: streamline handling of +CIND:

Browse Source
This commit is contained in:
Matthias Ringwald 2020-06-12 11:25:15 +02:00
parent 94a2779227
commit 84a0c24e57
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/classic/hfp.c
View File

@ -862,6 +862,7 @@ static hfp_command_entry_t hfp_hf_commmand_table[] = {
{ "+BTRH:", HFP_CMD_RESPONSE_AND_HOLD_STATUS }, { "+BTRH:", HFP_CMD_RESPONSE_AND_HOLD_STATUS },
{ "+CHLD:", HFP_CMD_SUPPORT_CALL_HOLD_AND_MULTIPARTY_SERVICES }, { "+CHLD:", HFP_CMD_SUPPORT_CALL_HOLD_AND_MULTIPARTY_SERVICES },
{ "+COPS:", HFP_CMD_QUERY_OPERATOR_SELECTION_NAME }, { "+COPS:", HFP_CMD_QUERY_OPERATOR_SELECTION_NAME },
{ "+CIND:", HFP_CMD_RETRIEVE_AG_INDICATORS_GENERIC },
}; };
typedef struct { typedef struct {
@ -1052,26 +1053,18 @@ static bool hfp_parse_byte(hfp_connection_t * hfp_connection, uint8_t byte, int
// parse // parse
hfp_connection->command = parse_command((char *)hfp_connection->line_buffer, isHandsFree); hfp_connection->command = parse_command((char *)hfp_connection->line_buffer, isHandsFree);
// resolve command name according to hfp_connection // pick +CIND version based on connection state: descriptions during SLC vs. states later
if (hfp_connection->command == HFP_CMD_UNKNOWN){ if (hfp_connection->command == HFP_CMD_RETRIEVE_AG_INDICATORS_GENERIC){
switch(hfp_connection->state){ switch(hfp_connection->state){
case HFP_W4_LIST_GENERIC_STATUS_INDICATORS:
hfp_connection->command = HFP_CMD_LIST_GENERIC_STATUS_INDICATORS;
break;
case HFP_W4_RETRIEVE_GENERIC_STATUS_INDICATORS:
hfp_connection->command = HFP_CMD_RETRIEVE_GENERIC_STATUS_INDICATORS;
break;
case HFP_W4_RETRIEVE_INITITAL_STATE_GENERIC_STATUS_INDICATORS:
hfp_connection->command = HFP_CMD_RETRIEVE_GENERIC_STATUS_INDICATORS_STATE;
break;
case HFP_W4_RETRIEVE_INDICATORS_STATUS: case HFP_W4_RETRIEVE_INDICATORS_STATUS:
hfp_connection->command = HFP_CMD_RETRIEVE_AG_INDICATORS_STATUS; hfp_connection->command = HFP_CMD_RETRIEVE_AG_INDICATORS_STATUS;
break; break;
case HFP_W4_RETRIEVE_INDICATORS: case HFP_W4_RETRIEVE_INDICATORS:
hfp_connection->send_ag_indicators_segment = 0;
hfp_connection->command = HFP_CMD_RETRIEVE_AG_INDICATORS; hfp_connection->command = HFP_CMD_RETRIEVE_AG_INDICATORS;
break; break;
default: default:
btstack_assert(false);
hfp_connection->command = HFP_CMD_UNKNOWN;
break; break;
} }
} }

1
src/classic/hfp.h
View File

@ -169,6 +169,7 @@ typedef enum {
HFP_CMD_SUPPORTED_FEATURES, HFP_CMD_SUPPORTED_FEATURES,
HFP_CMD_AVAILABLE_CODECS, HFP_CMD_AVAILABLE_CODECS,
HFP_CMD_RETRIEVE_AG_INDICATORS_GENERIC,
HFP_CMD_RETRIEVE_AG_INDICATORS, HFP_CMD_RETRIEVE_AG_INDICATORS,
HFP_CMD_RETRIEVE_AG_INDICATORS_STATUS, HFP_CMD_RETRIEVE_AG_INDICATORS_STATUS,

1
src/classic/hfp_ag.c
View File

@ -640,6 +640,7 @@ static int hfp_ag_run_for_context_service_level_connection(hfp_connection_t * hf
case HFP_CMD_RETRIEVE_AG_INDICATORS: case HFP_CMD_RETRIEVE_AG_INDICATORS:
if (hfp_connection->state == HFP_W4_RETRIEVE_INDICATORS) { if (hfp_connection->state == HFP_W4_RETRIEVE_INDICATORS) {
// HF requested AG Indicators and we did expect it // HF requested AG Indicators and we did expect it
hfp_connection->send_ag_indicators_segment = 0;
hfp_connection->state = HFP_RETRIEVE_INDICATORS; hfp_connection->state = HFP_RETRIEVE_INDICATORS;
// continue below in state switch // continue below in state switch
} }