ofono_voicecall_register(vc);
}
-static int at_voicecall_probe(struct ofono_voicecall *vc)
+static int at_voicecall_probe(struct ofono_voicecall *vc, int vendor,
+ void *data)
{
- GAtChat *chat = ofono_voicecall_get_data(vc);
+ GAtChat *chat = data;
struct voicecall_data *vd;
vd = g_new0(struct voicecall_data, 1);
ofono_devinfo_create(isi->modem, 0, "isi", isi->idx);
ofono_phonebook_create(isi->modem, 0, "isi", isi->idx);
ofono_netreg_create(isi->modem, 0, "isi", isi->idx);
- ofono_voicecall_create(isi->modem, "isi", isi->idx);
+ ofono_voicecall_create(isi->modem, 0, "isi", isi->idx);
ofono_sms_create(isi->modem, 0, "isi", isi->idx);
ofono_sim_create(isi->modem, 0, "isi", isi->idx);
ofono_ssn_create(isi->modem, 0, "isi", isi->idx);
{
}
-static int isi_voicecall_probe(struct ofono_voicecall *call)
+static int isi_voicecall_probe(struct ofono_voicecall *call, int vendor,
+ void *user)
{
- GIsiModem *idx = ofono_voicecall_get_data(call);
+ GIsiModem *idx = user;
struct voicecall_data *data = g_try_new0(struct voicecall_data, 1);
if (!data)
*/
struct ofono_voicecall_driver {
const char *name;
- int (*probe)(struct ofono_voicecall *vc);
+ int (*probe)(struct ofono_voicecall *vc, int vendor, void *data);
int (*remove)(struct ofono_voicecall *vc);
void (*dial)(struct ofono_voicecall *vc,
const struct ofono_phone_number *number,
void ofono_voicecall_driver_unregister(const struct ofono_voicecall_driver *d);
struct ofono_voicecall *ofono_voicecall_create(struct ofono_modem *modem,
+ int vendor,
const char *driver, void *data);
void ofono_voicecall_register(struct ofono_voicecall *vc);
ofono_call_forwarding_create(modem, 0, "generic_at", chat);
ofono_call_settings_create(modem, 0, "generic_at", chat);
ofono_netreg_create(modem, 0, "generic_at", chat);
- ofono_voicecall_create(modem, "generic_at", chat);
+ ofono_voicecall_create(modem, 0, "generic_at", chat);
ofono_call_meter_create(modem, 0, "generic_at", chat);
ofono_call_barring_create(modem, 0, "generic_at", chat);
ofono_ssn_create(modem, 0, "generic_at", chat);
}
struct ofono_voicecall *ofono_voicecall_create(struct ofono_modem *modem,
- const char *driver,
- void *data)
+ int vendor,
+ const char *driver,
+ void *data)
{
struct ofono_voicecall *vc;
GSList *l;
if (vc == NULL)
return NULL;
- vc->driver_data = data;
vc->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_VOICECALL,
voicecall_remove, vc);
if (g_strcmp0(drv->name, driver))
continue;
- if (drv->probe(vc) < 0)
+ if (drv->probe(vc, vendor, data) < 0)
continue;
vc->driver = drv;