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

Rename modem_alloc_callid, modem_release_callid

This commit is contained in:
Denis Kenzior 2009-07-29 14:05:33 -05:00
parent 47dab3468e
commit be064f92a5
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modem.c
View File

@ -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;

2
src/modem.h
View File

@ -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);

3
src/ofono.h
View File

@ -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);

6
src/voicecall.c
View File

@ -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");