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

sim: Read EFust and EFest after phase is known

This commit is contained in:
Denis Kenzior 2010-10-19 14:20:57 -05:00
parent cfb3cd9647
commit b92662634d
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sim.c
View File

@ -1359,6 +1359,11 @@ static void sim_efphase_read_cb(int ok, int length, int record,
if (!ok || length != 1) { if (!ok || length != 1) {
sim->phase = OFONO_SIM_PHASE_3G; sim->phase = OFONO_SIM_PHASE_3G;
ofono_sim_read(sim, SIM_EFUST_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_efust_read_cb, sim);
return; return;
} }
@ -1374,8 +1379,12 @@ static void sim_efphase_read_cb(int ok, int length, int record,
break; break;
default: default:
ofono_error("Unknown phase"); ofono_error("Unknown phase");
break; return;
} }
ofono_sim_read(sim, SIM_EFSST_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_efsst_read_cb, sim);
} }
static void sim_initialize_after_pin(struct ofono_sim *sim) static void sim_initialize_after_pin(struct ofono_sim *sim)
@ -1395,16 +1404,6 @@ static void sim_initialize_after_pin(struct ofono_sim *sim)
ofono_sim_read(sim, SIM_EF_CPHS_INFORMATION_FILEID, ofono_sim_read(sim, SIM_EF_CPHS_INFORMATION_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT, OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_cphs_information_read_cb, sim); sim_cphs_information_read_cb, sim);
/* Also retrieve the GSM service table */
if (sim->phase >= OFONO_SIM_PHASE_3G)
ofono_sim_read(sim, SIM_EFUST_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_efust_read_cb, sim);
else
ofono_sim_read(sim, SIM_EFSST_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_efsst_read_cb, sim);
} }
static void sim_pin_query_cb(const struct ofono_error *error, static void sim_pin_query_cb(const struct ofono_error *error,