diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/modem.c | 4 | ||||
| -rw-r--r-- | src/modem.h | 2 | ||||
| -rw-r--r-- | src/ofono.h | 3 | ||||
| -rw-r--r-- | src/voicecall.c | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/modem.c b/src/modem.c index 631a1a1e..28d5cc4c 100644 --- a/src/modem.c +++ b/src/modem.c @@ -56,7 +56,7 @@ struct ofono_modem_data { guint interface_update; }; -unsigned int modem_alloc_callid(struct ofono_modem *modem) +unsigned int __ofono_modem_alloc_callid(struct ofono_modem *modem) { struct ofono_modem_data *d = modem->modem_info; unsigned int i; @@ -72,7 +72,7 @@ unsigned int modem_alloc_callid(struct ofono_modem *modem) return 0; } -void modem_release_callid(struct ofono_modem *modem, int id) +void __ofono_modem_release_callid(struct ofono_modem *modem, int id) { struct ofono_modem_data *d = modem->modem_info; diff --git a/src/modem.h b/src/modem.h index 4be4b9fe..abe44cc7 100644 --- a/src/modem.h +++ b/src/modem.h @@ -27,5 +27,3 @@ void modem_remove(struct ofono_modem *modem); void modem_add_interface(struct ofono_modem *modem, const char *interface); void modem_remove_interface(struct ofono_modem *modem, const char *interface); -unsigned int modem_alloc_callid(struct ofono_modem *modem); -void modem_release_callid(struct ofono_modem *modem, int id); diff --git a/src/ofono.h b/src/ofono.h index dbe99648..cb311e50 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -83,6 +83,9 @@ struct ofono_modem { GSList *history_contexts; }; +unsigned int __ofono_modem_alloc_callid(struct ofono_modem *modem); +void __ofono_modem_release_callid(struct ofono_modem *modem, int id); + #include <ofono/history.h> void __ofono_history_probe_drivers(struct ofono_modem *modem); diff --git a/src/voicecall.c b/src/voicecall.c index 07b254f1..3d33db39 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -1242,7 +1242,7 @@ void ofono_voicecall_disconnected(struct ofono_modem *modem, int id, calls->release_list = g_slist_remove(calls->release_list, call); - modem_release_callid(modem, id); + __ofono_modem_release_callid(modem, id); /* TODO: Emit disconnect reason */ voicecall_set_call_status(modem, call, CALL_STATUS_DISCONNECTED); @@ -1293,7 +1293,7 @@ void ofono_voicecall_notify(struct ofono_modem *modem, const struct ofono_call * memcpy(newcall, call, sizeof(struct ofono_call)); - if (modem_alloc_callid(modem) != call->id) { + if (__ofono_modem_alloc_callid(modem) != call->id) { ofono_error("Warning: Call id and internally tracked id" " do not correspond"); goto err; @@ -1391,7 +1391,7 @@ static struct ofono_call *synthesize_outgoing_call(struct ofono_modem *modem, if (!call) return call; - call->id = modem_alloc_callid(modem); + call->id = __ofono_modem_alloc_callid(modem); if (call->id == 0) { ofono_error("Failed to alloc callid, too many calls"); |