sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

sim: Revert adding special callback for EFad 

This reverts commit 5522df64fa.
This commit is contained in:
Denis Kenzior 2012-06-16 08:17:22 -05:00
parent 0516aa8163
commit bee063dd76
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sim.h
View File

@ -104,10 +104,6 @@ typedef void (*ofono_sim_iccid_cb_t)(const struct ofono_error *error,
typedef void (*ofono_sim_imsi_cb_t)(const struct ofono_error *error,
const char *imsi, void *data);
typedef void (*ofono_sim_mccmnc_cb_t)(const struct ofono_error *error,
const char *mcc, const char *mnc,
void *data);
typedef void (*ofono_sim_state_event_cb_t)(enum ofono_sim_state new_state,
void *data);
@ -161,8 +157,6 @@ struct ofono_sim_driver {
ofono_sim_iccid_cb_t cb, void *data);
void (*read_imsi)(struct ofono_sim *sim,
ofono_sim_imsi_cb_t cb, void *data);
void (*read_mccmnc)(struct ofono_sim *sim,
ofono_sim_mccmnc_cb_t cb, void *data);
void (*query_passwd_state)(struct ofono_sim *sim,
ofono_sim_passwd_cb_t cb, void *data);
void (*send_passwd)(struct ofono_sim *sim, const char *passwd,

19
src/sim.c
View File

@ -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;