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

voicecall: Check dial requests in voicecall_is_busy 

Return true if a call is being dialed by stk.

Use __ofono_voicecall_is_busy() in __ofono_voicecall_dial().
This commit is contained in:
Pekka Pessi 2010-10-06 17:52:17 +03:00 committed by Denis Kenzior
parent b654e723c7
commit e21ad3086f
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/voicecall.c
View File

@ -2171,7 +2171,7 @@ int ofono_voicecall_get_next_callid(struct ofono_voicecall *vc)
ofono_bool_t __ofono_voicecall_is_busy(struct ofono_voicecall *vc,
enum ofono_voicecall_interaction type)
{
if (vc->pending)
if (vc->pending || vc->dial_req)
return TRUE;
switch (type) {
@ -2272,7 +2272,7 @@ int __ofono_voicecall_dial(struct ofono_voicecall *vc,
vc->driver->release_all_active == NULL)
return -ENOSYS;
if (vc->dial_req || vc->pending)
if (__ofono_voicecall_is_busy(vc, interaction) == TRUE)
return -EBUSY;
/*
@ -2293,11 +2293,6 @@ int __ofono_voicecall_dial(struct ofono_voicecall *vc,
vc->dial_req = req;
if (__ofono_voicecall_is_busy(vc, interaction) == TRUE) {
dial_request_finish(vc, FALSE);
return -EBUSY;
}
switch (interaction) {
case OFONO_VOICECALL_INTERACTION_NONE:
dial_request(vc);