diff options
author | Denis Kenzior <denis.kenzior@intel.com> | 2009-09-01 17:18:42 -0500 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2009-09-01 18:14:58 -0500 |
commit | c7d35dd039b60670e4175b49f377275c6569953f (patch) | |
tree | d4394c376be96c9b8285a5221f6552d111d9e44d /drivers | |
parent | 933f803967c4b2062a6e2dfd075f400ffe29defd (diff) | |
download | ofono-c7d35dd039b60670e4175b49f377275c6569953f.tar.bz2 |
Add vendor flag capability to devinfo
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/atmodem/devinfo.c | 8 | ||||
-rw-r--r-- | drivers/isimodem/devinfo.c | 4 | ||||
-rw-r--r-- | drivers/isimodem/isimodem.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/drivers/atmodem/devinfo.c b/drivers/atmodem/devinfo.c index df43bc4d..8e3123af 100644 --- a/drivers/atmodem/devinfo.c +++ b/drivers/atmodem/devinfo.c @@ -189,10 +189,12 @@ static gboolean at_devinfo_register(gpointer user_data) return FALSE; } -static int at_devinfo_probe(struct ofono_devinfo *info) +static int at_devinfo_probe(struct ofono_devinfo *info, int vendor, void *data) { - /* There are no useful initializations we can do */ - g_timeout_add(0, at_devinfo_register, info); + GAtChat *chat = data; + + ofono_devinfo_set_data(info, chat); + g_idle_add(at_devinfo_register, info); return 0; } diff --git a/drivers/isimodem/devinfo.c b/drivers/isimodem/devinfo.c index 6c479bb4..7e503780 100644 --- a/drivers/isimodem/devinfo.c +++ b/drivers/isimodem/devinfo.c @@ -370,9 +370,9 @@ static gboolean isi_devinfo_register(gpointer user) return FALSE; } -static int isi_devinfo_probe(struct ofono_devinfo *info) +static int isi_devinfo_probe(struct ofono_devinfo *info, int vendor, void *user) { - GIsiModem *idx = ofono_devinfo_get_data(info); + GIsiModem *idx = user; struct devinfo_data *data = g_try_new0(struct devinfo_data, 1); if (!data) diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index c97eaee5..bac6167c 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -149,7 +149,7 @@ static int isi_modem_populate(struct ofono_modem *modem) { struct isi_data *isi = ofono_modem_get_data(modem); - ofono_devinfo_create(isi->modem, "isi", isi->idx); + 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_voicecall_create(isi->modem, "isi", isi->idx); |