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

stemodem: Fix handling of local_release 

- Reset local_release when call is disconnected.
- Change bitmap for affected types, ste_hangup is only called when
  call state is Incoming, Dialing, Alerting or Active.
- Used macros instead of numbers when creating bitmaps.
This commit is contained in:
Marit Henriksen 2011-02-03 14:15:45 +01:00 committed by Denis Kenzior
parent c1603c77cc
commit aad3b22924
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/stemodem/voicecall.c
View File

@ -254,7 +254,12 @@ static void ste_answer(struct ofono_voicecall *vc,
static void ste_hangup(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data)
{
ste_template("AT+CHUP", vc, ste_generic_cb, 0x3f, cb, data);
unsigned int active_dial_alert_or_incoming =
(0x1 << CALL_STATUS_ACTIVE) | (0x1 << CALL_STATUS_DIALING) |
(0x1 << CALL_STATUS_ALERTING) | (0x1 << CALL_STATUS_INCOMING);
ste_template("AT+CHUP", vc, ste_generic_cb,
active_dial_alert_or_incoming, cb, data);
}
static void ste_hold_all_active(struct ofono_voicecall *vc,
@ -266,14 +271,17 @@ static void ste_hold_all_active(struct ofono_voicecall *vc,
static void ste_release_all_held(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data)
{
unsigned int held_status = 0x1 << 1;
ste_template("AT+CHLD=0", vc, ste_generic_cb, held_status, cb, data);
unsigned int held = 0x1 << CALL_STATUS_HELD;
ste_template("AT+CHLD=0", vc, ste_generic_cb, held, cb, data);
}
static void ste_set_udub(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data)
{
unsigned int incoming_or_waiting = (0x1 << 4) | (0x1 << 5);
unsigned int incoming_or_waiting =
(0x1 << CALL_STATUS_INCOMING) | (0x1 << CALL_STATUS_WAITING);
ste_template("AT+CHLD=0", vc, ste_generic_cb, incoming_or_waiting,
cb, data);
}
@ -281,7 +289,9 @@ static void ste_set_udub(struct ofono_voicecall *vc,
static void ste_release_all_active(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data)
{
ste_template("AT+CHLD=1", vc, ste_generic_cb, 0x1, cb, data);
unsigned int active = 0x1 << CALL_STATUS_ACTIVE;
ste_template("AT+CHLD=1", vc, ste_generic_cb, active, cb, data);
}
static void ste_release_specific(struct ofono_voicecall *vc, int id,
@ -476,6 +486,7 @@ static void ecav_notify(GAtResult *result, gpointer user_data)
ofono_voicecall_disconnected(vc, existing_call->id,
reason, NULL);
vd->local_release &= ~(1 << existing_call->id);
vd->calls = g_slist_remove(vd->calls, l->data);
break;
}