summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAki Niemi <aki.niemi@nokia.com>2010-01-12 14:45:01 +0200
committerAki Niemi <aki.niemi@nokia.com>2010-01-14 10:33:48 +0200
commit8fe8220b236a68cb1ce4904c2549fecbd0417226 (patch)
tree40815b474ebddc7f96176e3c6e4fa607ab032ae2
parent65ce05d37ab5f32c5598167b3b56dc28228e1e73 (diff)
downloadofono-8fe8220b236a68cb1ce4904c2549fecbd0417226.tar.bz2
Refactor phonebook driver
-rw-r--r--drivers/isimodem/phonebook.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c
index 314babcf..d47f34c3 100644
--- a/drivers/isimodem/phonebook.c
+++ b/drivers/isimodem/phonebook.c
@@ -140,15 +140,16 @@ static int decode_read_response(const unsigned char *msg, size_t len,
break;
default:
- DBG("Skipping sub-block: 0x%04X (%zu bytes)",
- g_isi_sb_iter_get_id(&iter),
+ DBG("Skipping sub-block: %s (%zd bytes)",
+ sim_subblock_name(g_isi_sb_iter_get_id(&iter)),
g_isi_sb_iter_get_len(&iter));
break;
}
}
if (status != SIM_SERV_OK) {
- DBG("PB read returned status: 0x%02X", status);
+ DBG("Request failed: %s (0x%02X)",
+ sim_isi_cause_name(status), status);
goto error;
}
@@ -286,6 +287,7 @@ static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
void *opaque)
{
struct ofono_phonebook *pb = opaque;
+ const char *debug = NULL;
if (!alive) {
DBG("Unable to bootsrap phonebook driver");
@@ -297,6 +299,10 @@ static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
g_isi_version_major(client),
g_isi_version_minor(client));
+ debug = getenv("OFONO_ISI_DEBUG");
+ if (debug && (strcmp(debug, "all") == 0 || strcmp(debug, "sim") == 0))
+ g_isi_client_set_debug(client, sim_debug, NULL);
+
g_idle_add(isi_phonebook_register, pb);
}