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

hfpmodem: fix callheld indicator 

Callheld move from 1 (active and held calls) to 2 (all calls on hold) may
result of:
- active call has been dropped by remote,
- an intermediate state during a call swap which will be followed by a
  move back to 1.
So, wait a little before checking calls state.
This commit is contained in:
Frédéric Danis 2011-07-25 16:42:19 +02:00 committed by Denis Kenzior
parent 968efe08ba
commit 3b00f5aad7
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/hfpmodem/voicecall.c
View File

@ -42,6 +42,7 @@
#include "slc.h"
#define POLL_CLCC_INTERVAL 2000
#define POLL_CLCC_DELAY 50
#define CLIP_TIMEOUT 500
static const char *none_prefix[] = { NULL };
@ -1024,6 +1025,11 @@ static void ciev_callheld_notify(struct ofono_voicecall *vc,
break;
case 1:
if (vd->clcc_source) {
g_source_remove(vd->clcc_source);
vd->clcc_source = 0;
}
/* We have to poll here, we have no idea whether the call was
* accepted by CHLD=1 or swapped by CHLD=2 or one call was
* chosed for private chat by CHLD=2x
@ -1043,7 +1049,15 @@ static void ciev_callheld_notify(struct ofono_voicecall *vc,
ofono_voicecall_notify(vc, call);
}
} else if (callheld == 1) {
release_with_status(vc, CALL_STATUS_ACTIVE);
if (vd->clcc_source)
g_source_remove(vd->clcc_source);
/* We have to schedule a poll here, we have no idea
* whether active call was dropped by remote or if this
* is an intermediate state during call swap
*/
vd->clcc_source = g_timeout_add(POLL_CLCC_DELAY,
poll_clcc, vc);
}
}