diff options
| -rw-r--r-- | include/sim.h | 6 | ||||
| -rw-r--r-- | src/sim.c | 19 |
2 files changed, 1 insertions, 24 deletions
diff --git a/include/sim.h b/include/sim.h index 3e135640..8b5ff659 100644 --- a/include/sim.h +++ b/include/sim.h @@ -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, @@ -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; |