diff options
| author | Aki Niemi <aki.niemi@nokia.com> | 2010-01-08 10:57:59 +0200 |
|---|---|---|
| committer | Aki Niemi <aki.niemi@nokia.com> | 2010-01-11 10:51:01 +0200 |
| commit | e55e324a94ce166406f814f47c3a996d5892c9d0 (patch) | |
| tree | a6c9b77f78fe86217395cb277458293f90523a9d | |
| parent | d277e0eb7373c1288c33cd3f729ce1d93528337f (diff) | |
| download | ofono-e55e324a94ce166406f814f47c3a996d5892c9d0.tar.bz2 | |
Refactor phonebook driver
| -rw-r--r-- | drivers/isimodem/phonebook.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c index f5c5e470..12a2c15a 100644 --- a/drivers/isimodem/phonebook.c +++ b/drivers/isimodem/phonebook.c @@ -193,7 +193,7 @@ static void read_next_entry(GIsiClient *client, int location, GIsiResponseFunc r if (!cbd) goto error; - if (g_isi_request_make(client, msg, sizeof(msg), PHONEBOOK_TIMEOUT, + if (g_isi_request_make(client, msg, sizeof(msg), SIM_TIMEOUT, read_cb, cbd)) return; @@ -262,7 +262,7 @@ static void isi_export_entries(struct ofono_phonebook *pb, const char *storage, if (strcmp(storage, "SM")) goto error; - if (g_isi_request_make(pbd->client, msg, sizeof(msg), PHONEBOOK_TIMEOUT, + if (g_isi_request_make(pbd->client, msg, sizeof(msg), SIM_TIMEOUT, read_resp_cb, cbd)) return; @@ -287,15 +287,17 @@ static void reachable_cb(GIsiClient *client, bool alive, uint16_t object, { struct ofono_phonebook *pb = opaque; - if (alive == true) { - DBG("Resource 0x%02X, with version %03d.%03d reachable", - g_isi_client_resource(client), - g_isi_version_major(client), - g_isi_version_minor(client)); - g_idle_add(isi_phonebook_register, pb); + if (!alive) { + DBG("Unable to bootsrap phonebook driver"); return; } - DBG("Unable to bootsrap phonebook driver"); + + DBG("%s (v.%03d.%03d) reachable", + pn_resource_name(g_isi_client_resource(client)), + g_isi_version_major(client), + g_isi_version_minor(client)); + + g_idle_add(isi_phonebook_register, pb); } static int isi_phonebook_probe(struct ofono_phonebook *pb, unsigned int vendor, |