summaryrefslogtreecommitdiffstats
path: root/src/sim.c
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2012-06-16 08:17:22 -0500
committerDenis Kenzior <denkenz@gmail.com>2012-06-16 09:50:05 -0500
commitbee063dd76ae15dc0f081904336a4d9a18f24bdb (patch)
treed0199aba1c0d30d461720c2192af377350f57dec /src/sim.c
parent0516aa81633e5bdaf7ff3d45719bd3ea58668f0c (diff)
downloadofono-bee063dd76ae15dc0f081904336a4d9a18f24bdb.tar.bz2
sim: Revert adding special callback for EFad
This reverts commit 5522df64fac7b57d3d9db2272fc9be97c8815b94.
Diffstat (limited to 'src/sim.c')
-rw-r--r--src/sim.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/sim.c b/src/sim.c
index afb94ff2..3d4eece4 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -1721,20 +1721,6 @@ static void sim_cphs_information_read_cb(int ok, int length, int record,
memcpy(sim->cphs_service_table, data + 1, 2);
}
-static void sim_mccmnc_cb(const struct ofono_error *error,
- const char *mcc, const char *mnc, void *userdata)
-{
- struct ofono_sim *sim = userdata;
-
- if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
- return;
-
- if (!mcc || !mnc)
- return;
-
- sim->mnc_length = strlen(mnc);
-}
-
static void sim_ad_read_cb(int ok, int length, int record,
const unsigned char *data,
int record_length, void *userdata)
@@ -1742,11 +1728,8 @@ static void sim_ad_read_cb(int ok, int length, int record,
struct ofono_sim *sim = userdata;
int new_mnc_length;
- if (!ok) {
- if (sim->driver->read_mccmnc)
- sim->driver->read_mccmnc(sim, sim_mccmnc_cb, sim);
+ if (!ok)
return;
- }
if (length < 4)
return;