mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-17 11:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

hfp gsm: remove status field from hfp_gsm_call_t, use enhanced_status instead

Browse Source
This commit is contained in:
Milanka Ringwald 2016-02-12 12:12:22 +01:00
parent 74ac0b6031
commit 65bb457efa
2 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/hfp_gsm_model.c
View File

@ -64,6 +64,13 @@
#define HFP_GSM_MAX_NR_CALLS 3 #define HFP_GSM_MAX_NR_CALLS 3
#define HFP_GSM_MAX_CALL_NUMBER_SIZE 25 #define HFP_GSM_MAX_CALL_NUMBER_SIZE 25
typedef enum{
CALL_INITIATED,
CALL_RESPONSE_HOLD,
CALL_ACTIVE,
CALL_HELD
} hfp_gsm_call_status_t;
static hfp_gsm_call_t gsm_calls[HFP_GSM_MAX_NR_CALLS]; static hfp_gsm_call_t gsm_calls[HFP_GSM_MAX_NR_CALLS];
static hfp_callsetup_status_t callsetup_status = HFP_CALLSETUP_STATUS_NO_CALL_SETUP_IN_PROGRESS; static hfp_callsetup_status_t callsetup_status = HFP_CALLSETUP_STATUS_NO_CALL_SETUP_IN_PROGRESS;
@ -76,6 +83,14 @@ static inline int get_number_active_calls(void);
static void set_callsetup_status(hfp_callsetup_status_t status){ static void set_callsetup_status(hfp_callsetup_status_t status){
callsetup_status = status; callsetup_status = status;
if (callsetup_status != HFP_CALLSETUP_STATUS_OUTGOING_CALL_SETUP_IN_ALERTING_STATE) return;
int i ;
for (i = 0; i < HFP_GSM_MAX_NR_CALLS; i++){
if (gsm_calls[i].direction == HFP_ENHANCED_CALL_DIR_OUTGOING){
gsm_calls[i].enhanced_status = HFP_ENHANCED_CALL_STATUS_OUTGOING_ALERTING;
}
}
} }
static void set_call_status(int index_in_table, hfp_gsm_call_status_t status){ static void set_call_status(int index_in_table, hfp_gsm_call_status_t status){
@ -103,7 +118,6 @@ static void set_call_status(int index_in_table, hfp_gsm_call_status_t status){
default: default:
break; break;
} }
gsm_calls[index_in_table].status = status;
gsm_calls[index_in_table].used_slot = 1; gsm_calls[index_in_table].used_slot = 1;
} }
@ -126,7 +140,7 @@ static int get_call_status_for_enhanced_status(hfp_enhanced_call_status_t enhanc
static int get_call_status(int index_in_table){ static int get_call_status(int index_in_table){
if (!gsm_calls[index_in_table].used_slot) return -1; if (!gsm_calls[index_in_table].used_slot) return -1;
return gsm_calls[index_in_table].status; return get_call_status_for_enhanced_status(gsm_calls[index_in_table].enhanced_status);
} }
static void free_call_slot(int index_in_table){ static void free_call_slot(int index_in_table){
@ -270,29 +284,7 @@ hfp_gsm_call_t * hfp_gsm_call(int call_index){
for (i = 0; i < HFP_GSM_MAX_NR_CALLS; i++){ for (i = 0; i < HFP_GSM_MAX_NR_CALLS; i++){
hfp_gsm_call_t * call = &gsm_calls[i]; hfp_gsm_call_t * call = &gsm_calls[i];
if (call->index != call_index) continue; if (call->index != call_index) continue;
switch (call->status){
case CALL_INITIATED:
if (call->direction == HFP_ENHANCED_CALL_DIR_OUTGOING){
if (callsetup_status == HFP_CALLSETUP_STATUS_OUTGOING_CALL_SETUP_IN_ALERTING_STATE){
call->enhanced_status = HFP_ENHANCED_CALL_STATUS_OUTGOING_ALERTING;
}
}
// } else {
// if (get_number_active_calls() > 0){
// call->enhanced_status = HFP_ENHANCED_CALL_STATUS_INCOMING_WAITING;
// } else {
// call->enhanced_status = HFP_ENHANCED_CALL_STATUS_INCOMING;
// }
// }
break;
default:
log_error("no call status");
break;
}
return call; return call;
} }
return NULL; return NULL;

17
src/hfp_gsm_model.h
View File

@ -54,25 +54,8 @@ extern "C" {
#endif #endif
/* API_START */ /* API_START */
typedef enum{
CALL_INITIATED,
// CALL_ENHANCED_CALL_STATUS_OUTGOING_DIALING,
// CALL_ENHANCED_CALL_STATUS_OUTGOING_ALERTING,
// CALL_ENHANCED_CALL_STATUS_INCOMING,
// CALL_ENHANCED_CALL_STATUS_INCOMING_WAITING,
CALL_RESPONSE_HOLD,
CALL_ACTIVE,
CALL_HELD
} hfp_gsm_call_status_t;
typedef struct { typedef struct {
uint8_t used_slot; uint8_t used_slot;
// TODO: use enhanced_status instead of status
hfp_gsm_call_status_t status;
hfp_enhanced_call_status_t enhanced_status; hfp_enhanced_call_status_t enhanced_status;
hfp_enhanced_call_dir_t direction; hfp_enhanced_call_dir_t direction;