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

rilmodem: Get rid of ril_voicecall_driver_data

This commit is contained in:
Denis Kenzior 2015-11-12 13:16:53 -06:00
parent d351e3ac03
commit 0b23b2b74b
3 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/rilmodem/rilutil.h
View File

@ -79,11 +79,6 @@ struct ril_gprs_context_data {
enum ofono_gprs_context_type type;
};
struct ril_voicecall_driver_data {
GRil *gril;
struct ofono_modem *modem;
};
struct ril_gprs_driver_data {
GRil *gril;
struct ofono_modem *modem;

25
drivers/rilmodem/voicecall.c
View File

@ -692,13 +692,13 @@ static gboolean ril_delayed_register(gpointer user_data)
return FALSE;
}
void ril_voicecall_start(struct ril_voicecall_driver_data *driver_data,
struct ofono_voicecall *vc,
unsigned int vendor,
struct ril_voicecall_data *vd)
int ril_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
void *data)
{
vd->ril = g_ril_clone(driver_data->gril);
vd->modem = driver_data->modem;
GRil *ril = data;
struct ril_voicecall_data *vd = g_new0(struct ril_voicecall_data, 1);
vd->ril = g_ril_clone(ril);
vd->vendor = vendor;
vd->cb = NULL;
vd->data = NULL;
@ -708,19 +708,6 @@ void ril_voicecall_start(struct ril_voicecall_driver_data *driver_data,
ofono_voicecall_set_data(vc, vd);
g_idle_add(ril_delayed_register, vc);
}
int ril_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
void *data)
{
struct ril_voicecall_driver_data *driver_data = data;
struct ril_voicecall_data *vd;
vd = g_try_new0(struct ril_voicecall_data, 1);
if (vd == NULL)
return -ENOMEM;
ril_voicecall_start(driver_data, vc, vendor, vd);
return 0;
}

4
drivers/rilmodem/voicecall.h
View File

@ -62,9 +62,5 @@ void ril_set_udub(struct ofono_voicecall *vc,
void ril_release_all_active(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);
void ril_voicecall_start(struct ril_voicecall_driver_data *driver_data,
struct ofono_voicecall *vc,
unsigned int vendor,
struct ril_voicecall_data *vd);
void ril_call_state_notify(struct ril_msg *message, gpointer user_data);
gboolean ril_poll_clcc(gpointer user_data);