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

hfp: remove indicator name for parser states

Browse Source
This commit is contained in:
Milanka Ringwald 2015-08-14 15:30:40 +02:00
parent d28abd08a7
commit 854e6efc25
2 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/hfp.c
View File

@ -529,9 +529,6 @@ static void hfp_parser_next_state(hfp_connection_t * context, uint8_t byte){
return; return;
} }
switch (context->parser_state){ switch (context->parser_state){
case HFP_PARSER_CMD_INDICATOR_NAME:
context->parser_state = HFP_PARSER_SECOND_ITEM;
break;
case HFP_PARSER_CMD_HEADER: case HFP_PARSER_CMD_HEADER:
case HFP_PARSER_SECOND_ITEM: case HFP_PARSER_SECOND_ITEM:
context->parser_state = (hfp_parser_state_t)((int)context->parser_state + 1); context->parser_state = (hfp_parser_state_t)((int)context->parser_state + 1);
@ -544,6 +541,10 @@ static void hfp_parser_next_state(hfp_connection_t * context, uint8_t byte){
context->parser_state = HFP_PARSER_CMD_HEADER; context->parser_state = HFP_PARSER_CMD_HEADER;
break; break;
case HFP_PARSER_CMD_SEQUENCE: case HFP_PARSER_CMD_SEQUENCE:
if (context->command == HFP_CMD_INDICATOR && context->retrieve_ag_indicators){
context->parser_state = HFP_PARSER_SECOND_ITEM;
break;
}
break; break;
} }
@ -605,11 +606,6 @@ void hfp_parse(hfp_connection_t * context, uint8_t byte){
break; break;
case HFP_PARSER_CMD_SEQUENCE: // parse comma separated sequence, ignore breacktes case HFP_PARSER_CMD_SEQUENCE: // parse comma separated sequence, ignore breacktes
if (byte == '"'){ // indicators
context->parser_state = HFP_PARSER_CMD_INDICATOR_NAME;
break;
}
if (!hfp_parser_found_separator(context, byte)){ if (!hfp_parser_found_separator(context, byte)){
hfp_parser_store_byte(context, byte); hfp_parser_store_byte(context, byte);
break; break;
@ -629,11 +625,20 @@ void hfp_parse(hfp_connection_t * context, uint8_t byte){
context->remote_codecs_nr = context->parser_item_index; context->remote_codecs_nr = context->parser_item_index;
break; break;
case HFP_CMD_INDICATOR: case HFP_CMD_INDICATOR:
if (context->retrieve_ag_indicators_status == 0) break; if (context->retrieve_ag_indicators == 1){
context->parser_state = HFP_PARSER_SECOND_ITEM;
strcpy((char *)context->ag_indicators[context->parser_item_index].name, (char *)context->line_buffer);
context->ag_indicators[context->parser_item_index].index = context->parser_item_index+1;
printf("Indicator %d: %s (", context->ag_indicators_nr+1, context->line_buffer);
}
if (context->retrieve_ag_indicators_status == 1){
printf("Parsed Indicator %d with status: %s\n", context->parser_item_index+1, context->line_buffer); printf("Parsed Indicator %d with status: %s\n", context->parser_item_index+1, context->line_buffer);
context->ag_indicators[context->parser_item_index].status = atoi((char *) context->line_buffer); context->ag_indicators[context->parser_item_index].status = atoi((char *) context->line_buffer);
context->parser_item_index++; context->parser_item_index++;
break; break;
}
break;
case HFP_CMD_ENABLE_INDICATOR_STATUS_UPDATE: case HFP_CMD_ENABLE_INDICATOR_STATUS_UPDATE:
if (context->parser_item_index == 3){ if (context->parser_item_index == 3){
printf("Parsed Enable indicators: %s\n", context->line_buffer); printf("Parsed Enable indicators: %s\n", context->line_buffer);
@ -790,28 +795,6 @@ void hfp_parse(hfp_connection_t * context, uint8_t byte){
} }
hfp_parser_next_state(context, byte); hfp_parser_next_state(context, byte);
break; break;
case HFP_PARSER_CMD_INDICATOR_NAME: // parse indicator name
if (!hfp_parser_found_separator(context, byte)){
hfp_parser_store_byte(context, byte);
break;
}
if (hfp_parser_buffer_empty(context)) break;
switch (context->command){
case HFP_CMD_INDICATOR:
if (context->retrieve_ag_indicators == 1){
strcpy((char *)context->ag_indicators[context->parser_item_index].name, (char *)context->line_buffer);
context->ag_indicators[context->parser_item_index].index = context->parser_item_index+1;
printf("Indicator %d: %s (", context->ag_indicators_nr+1, context->line_buffer);
}
break;
default:
break;
}
hfp_parser_next_state(context, byte);
break;
} }
} }

3
src/hfp.h
View File

@ -139,9 +139,6 @@ typedef enum {
typedef enum { typedef enum {
HFP_PARSER_CMD_HEADER = 0, HFP_PARSER_CMD_HEADER = 0,
HFP_PARSER_CMD_SEQUENCE, HFP_PARSER_CMD_SEQUENCE,
HFP_PARSER_CMD_INDICATOR_NAME,
HFP_PARSER_CMD_INDICATOR_MIN_RANGE,
HFP_PARSER_CMD_INDICATOR_MAX_RANGE,
HFP_PARSER_SECOND_ITEM, HFP_PARSER_SECOND_ITEM,
HFP_PARSER_THIRD_ITEM HFP_PARSER_THIRD_ITEM
} hfp_parser_state_t; } hfp_parser_state_t;