diff options
| author | Aki Niemi <aki.niemi@nokia.com> | 2009-08-21 10:06:40 +0300 |
|---|---|---|
| committer | Aki Niemi <aki.niemi@nokia.com> | 2009-08-21 10:06:40 +0300 |
| commit | a434d941693c4d9d4c099220f36f712738f5e4aa (patch) | |
| tree | ce2d7d6c70fa38509c91a9e985d105a25bddc22d /drivers | |
| parent | 28b9d5d74747126c932eb9743290a2f81b31d8f4 (diff) | |
| download | ofono-a434d941693c4d9d4c099220f36f712738f5e4aa.tar.bz2 | |
Pass modem instance to phonebook driver
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/isimodem/isimodem.c | 2 | ||||
| -rw-r--r-- | drivers/isimodem/isiphonebook.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index fc57db66..a7b339f8 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -72,7 +72,7 @@ static void netlink_status_cb(bool up, uint8_t addr, GIsiModem *idx, ofono_modem_set_data(isi->modem, isi); ofono_devinfo_create(isi->modem, "isi", idx); - ofono_phonebook_create(isi->modem, "isi", NULL); + ofono_phonebook_create(isi->modem, "isi", idx); } } else { if (isi->modem) { diff --git a/drivers/isimodem/isiphonebook.c b/drivers/isimodem/isiphonebook.c index 59c0d75f..6f82c81f 100644 --- a/drivers/isimodem/isiphonebook.c +++ b/drivers/isimodem/isiphonebook.c @@ -387,16 +387,18 @@ static gboolean isi_phonebook_register(gpointer user) static int isi_phonebook_probe(struct ofono_phonebook *pb) { + GIsiModem *idx = ofono_devinfo_get_data(info); + if (!client) { - /* FIXME: pass GIsiModem object */ - client = g_isi_client_create(NULL, PN_SIM); + client = g_isi_client_create(idx, PN_SIM); if (!client) return -ENOMEM; } ofono_phonebook_set_data(pb, phonebook_create()); - /* FIXME: If this is running on a phone itself, phonebook initialization needs to be done here */ + /* FIXME: If this is running on a phone itself, phonebook + * initialization needs to be done here */ g_idle_add(isi_phonebook_register, pb); |