sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Fix: The use of cind_val / cind_pos was wrong

This commit is contained in:
Zhenhua Zhang 2009-11-03 11:26:08 -06:00 committed by Denis Kenzior
parent 2185106b32
commit ff2a8e6f7c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/hfpmodem/voicecall.c
View File

@ -350,7 +350,6 @@ static void ciev_call_notify(struct ofono_voicecall *vc,
unsigned int value)
{
struct voicecall_data *vd = ofono_voicecall_get_data(vc);
unsigned int call_pos = vd->cind_pos[HFP_INDICATOR_CALL];
if (g_slist_length(vd->calls) == 1) {
switch (value) {
@ -366,7 +365,7 @@ static void ciev_call_notify(struct ofono_voicecall *vc,
}
}
vd->cind_val[call_pos] = value;
vd->cind_val[HFP_INDICATOR_CALL] = value;
}
static void ciev_callsetup_notify(struct ofono_voicecall *vc,
@ -374,8 +373,8 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc,
unsigned int value)
{
struct voicecall_data *vd = ofono_voicecall_get_data(vc);
unsigned int callsetup_pos = vd->cind_pos[HFP_INDICATOR_CALLSETUP];
unsigned int call_pos = vd->cind_pos[HFP_INDICATOR_CALL];
unsigned int ciev_callsetup = vd->cind_val[HFP_INDICATOR_CALLSETUP];
unsigned int ciev_call = vd->cind_val[HFP_INDICATOR_CALL];
if (g_slist_length(vd->calls) == 1) {
switch (value) {
@ -383,8 +382,7 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc,
/* call=0 and callsetup=1: reject an incoming call
* call=0 and callsetup=2,3: interrupt an outgoing call
*/
if ((vd->cind_val[call_pos] == 0) &&
(vd->cind_val[callsetup_pos] > 0))
if (ciev_call == 0 && ciev_callsetup > 0)
release_call(vc, call);
break;
case 1:
@ -398,7 +396,7 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc,
}
}
vd->cind_val[callsetup_pos] = value;
vd->cind_val[HFP_INDICATOR_CALLSETUP] = value;
}
static void ciev_notify(GAtResult *result, gpointer user_data)