diff options
| -rw-r--r-- | drivers/atmodem/network-registration.c | 4 | ||||
| -rw-r--r-- | drivers/isimodem/isimodem.c | 2 | ||||
| -rw-r--r-- | drivers/isimodem/network-registration.c | 16 | ||||
| -rw-r--r-- | include/netreg.h | 4 | ||||
| -rw-r--r-- | plugins/generic_at.c | 2 | ||||
| -rw-r--r-- | src/network.c | 5 |
6 files changed, 16 insertions, 17 deletions
diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c index 10025193..79c59a08 100644 --- a/drivers/atmodem/network-registration.c +++ b/drivers/atmodem/network-registration.c @@ -636,9 +636,9 @@ static void at_network_registration_initialized(gboolean ok, GAtResult *result, ofono_netreg_register(netreg); } -static int at_netreg_probe(struct ofono_netreg *netreg) +static int at_netreg_probe(struct ofono_netreg *netreg, int vendor, void *data) { - GAtChat *chat = ofono_netreg_get_data(netreg); + GAtChat *chat = data; struct netreg_data *nd; nd = g_new0(struct netreg_data, 1); diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index bac6167c..f8cde0c5 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -151,7 +151,7 @@ static int isi_modem_populate(struct ofono_modem *modem) ofono_devinfo_create(isi->modem, 0, "isi", isi->idx); ofono_phonebook_create(isi->modem, "isi", isi->idx); - ofono_netreg_create(isi->modem, "isi", isi->idx); + ofono_netreg_create(isi->modem, 0, "isi", isi->idx); ofono_voicecall_create(isi->modem, "isi", isi->idx); ofono_sms_create(isi->modem, "isi", isi->idx); ofono_sim_create(isi->modem, "isi", isi->idx); diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c index 88483903..e00994bf 100644 --- a/drivers/isimodem/network-registration.c +++ b/drivers/isimodem/network-registration.c @@ -178,21 +178,21 @@ static gboolean isi_netreg_register(gpointer user) return FALSE; } -static int isi_netreg_probe(struct ofono_netreg *netreg) +static int isi_netreg_probe(struct ofono_netreg *netreg, int vendor, void *user) { - GIsiModem *idx = ofono_netreg_get_data(netreg); - struct netreg_data *user = g_try_new0(struct netreg_data, 1); + GIsiModem *idx = user; + struct netreg_data *data = g_try_new0(struct netreg_data, 1); - if (!user) + if (!data) return -ENOMEM; - user->client = g_isi_client_create(idx, PN_NETWORK); - if (!user->client) { - g_free(user); + data->client = g_isi_client_create(idx, PN_NETWORK); + if (!data->client) { + g_free(data); return -ENOMEM; } - ofono_netreg_set_data(netreg, user); + ofono_netreg_set_data(netreg, data); g_idle_add(isi_netreg_register, netreg); diff --git a/include/netreg.h b/include/netreg.h index d5247517..9bb94783 100644 --- a/include/netreg.h +++ b/include/netreg.h @@ -70,7 +70,7 @@ typedef void (*ofono_netreg_strength_cb_t)(const struct ofono_error *error, */ struct ofono_netreg_driver { const char *name; - int (*probe)(struct ofono_netreg *netreg); + int (*probe)(struct ofono_netreg *netreg, int vendor, void *data); int (*remove)(struct ofono_netreg *netreg); void (*registration_status)(struct ofono_netreg *netreg, ofono_netreg_status_cb_t cb, void *data); @@ -96,7 +96,7 @@ void ofono_netreg_status_notify(struct ofono_netreg *netreg, int status, int ofono_netreg_driver_register(const struct ofono_netreg_driver *d); void ofono_netreg_driver_unregister(const struct ofono_netreg_driver *d); -struct ofono_netreg *ofono_netreg_create(struct ofono_modem *modem, +struct ofono_netreg *ofono_netreg_create(struct ofono_modem *modem, int vendor, const char *driver, void *data); void ofono_netreg_register(struct ofono_netreg *netreg); diff --git a/plugins/generic_at.c b/plugins/generic_at.c index 94b66626..4d7b3007 100644 --- a/plugins/generic_at.c +++ b/plugins/generic_at.c @@ -514,7 +514,7 @@ static int generic_at_populate(struct ofono_modem *modem) ofono_sim_create(modem, "generic_at", chat); ofono_call_forwarding_create(modem, 0, "generic_at", chat); ofono_call_settings_create(modem, 0, "generic_at", chat); - ofono_netreg_create(modem, "generic_at", chat); + ofono_netreg_create(modem, 0, "generic_at", chat); ofono_voicecall_create(modem, "generic_at", chat); ofono_call_meter_create(modem, 0, "generic_at", chat); ofono_call_barring_create(modem, 0, "generic_at", chat); diff --git a/src/network.c b/src/network.c index 14fac71c..a4f7a062 100644 --- a/src/network.c +++ b/src/network.c @@ -1399,6 +1399,7 @@ static void netreg_remove(struct ofono_atom *atom) } struct ofono_netreg *ofono_netreg_create(struct ofono_modem *modem, + int vendor, const char *driver, void *data) { @@ -1419,8 +1420,6 @@ struct ofono_netreg *ofono_netreg_create(struct ofono_modem *modem, netreg->technology = -1; netreg->signal_strength = -1; - DBG("%p, %p", netreg, netreg->current_operator); - netreg->driver_data = data; netreg->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_NETREG, netreg_remove, netreg); @@ -1430,7 +1429,7 @@ struct ofono_netreg *ofono_netreg_create(struct ofono_modem *modem, if (g_strcmp0(drv->name, driver)) continue; - if (drv->probe(netreg) < 0) + if (drv->probe(netreg, vendor, data) < 0) continue; netreg->driver = drv; |