diff options
author | Denis Kenzior <denkenz@gmail.com> | 2012-06-16 08:18:16 -0500 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2012-06-16 09:50:05 -0500 |
commit | e0e6e2c439f62e101c4242b938c12cbbe826b49d (patch) | |
tree | f9f8f164321f1cf6e87f3d7481075886243f358b /src/sim.c | |
parent | a8247d17afe3f86f36966e7e4ca48dcbad30dae8 (diff) | |
download | ofono-e0e6e2c439f62e101c4242b938c12cbbe826b49d.tar.bz2 |
sim: Revert adding special callback for EFiccid
This reverts commit 1960dbbc79e43f33f23886c2a12e508a0350aad1.
Diffstat (limited to 'src/sim.c')
-rw-r--r-- | src/sim.c | 27 |
1 files changed, 1 insertions, 26 deletions
@@ -1965,25 +1965,6 @@ skip_efpl: sim->language_prefs_update = FALSE; } -static void sim_iccid_cb(const struct ofono_error *error, const char *iccid, - void *userdata) -{ - struct ofono_sim *sim = userdata; - const char *path = __ofono_atom_get_path(sim->atom); - DBusConnection *conn = ofono_dbus_get_connection(); - - if (error->type != OFONO_ERROR_TYPE_NO_ERROR) - return; - - sim->iccid = g_strdup(iccid); - - ofono_dbus_signal_property_changed(conn, path, - OFONO_SIM_MANAGER_INTERFACE, - "CardIdentifier", - DBUS_TYPE_STRING, - &sim->iccid); -} - static void sim_iccid_read_cb(int ok, int length, int record, const unsigned char *data, int record_length, void *userdata) @@ -1993,13 +1974,7 @@ static void sim_iccid_read_cb(int ok, int length, int record, DBusConnection *conn = ofono_dbus_get_connection(); char iccid[21]; /* ICCID max length is 20 + 1 for NULL */ - if (!ok) { - if (sim->driver->read_iccid) - sim->driver->read_iccid(sim, sim_iccid_cb, sim); - return; - } - - if (length < 10) + if (!ok || length < 10) return; extract_bcd_number(data, length, iccid); |