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

Retrieve CPHS phase (if any) from SIM.

This commit is contained in:
Andrzej Zaborowski 2010-01-07 12:38:47 +01:00 committed by Denis Kenzior
parent 8f99e50ce5
commit 637ca18af4
3 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/sim.h
View File

@ -65,6 +65,12 @@ enum ofono_sim_phase {
OFONO_SIM_PHASE_UNKNOWN,
};
enum ofono_sim_cphs_phase {
OFONO_SIM_CPHS_NONE,
OFONO_SIM_CPHS_PHASE1,
OFONO_SIM_CPHS_PHASE2,
};
typedef void (*ofono_sim_file_info_cb_t)(const struct ofono_error *error,
int filelength,
enum ofono_sim_file_structure structure,
@ -164,6 +170,9 @@ void *ofono_sim_get_data(struct ofono_sim *sim);
const char *ofono_sim_get_imsi(struct ofono_sim *sim);
enum ofono_sim_phase ofono_sim_get_phase(struct ofono_sim *sim);
enum ofono_sim_cphs_phase ofono_sim_get_cphs_phase(struct ofono_sim *sim);
unsigned short ofono_sim_get_cphs_support(struct ofono_sim *sim);
unsigned int ofono_sim_add_ready_watch(struct ofono_sim *sim,
ofono_sim_ready_notify_cb_t cb,
void *data, ofono_destroy_func destroy);

47
src/sim.c
View File

@ -88,6 +88,8 @@ struct ofono_sim {
unsigned char efmsisdn_records;
unsigned char *efli;
unsigned char efli_length;
enum ofono_sim_cphs_phase cphs_phase;
unsigned short cphs_support;
struct ofono_watchlist *ready_watches;
const struct ofono_sim_driver *driver;
void *driver_data;
@ -951,6 +953,29 @@ static void sim_ready(void *user)
sim_sdn_read_cb, sim);
}
static void sim_cphs_information_read_cb(int ok, int length, int record,
const unsigned char *data,
int record_length, void *userdata)
{
struct ofono_sim *sim = userdata;
sim->cphs_phase = OFONO_SIM_CPHS_NONE;
sim->cphs_support = 0;
if (!ok || length < 3)
goto ready;
if (data[0] == 0x01)
sim->cphs_phase = OFONO_SIM_CPHS_PHASE1;
else if (data[0] >= 0x02)
sim->cphs_phase = OFONO_SIM_CPHS_PHASE2;
sim->cphs_support = (data[2] << 8) | data[1];
ready:
ofono_sim_set_ready(sim);
}
static void sim_imsi_cb(const struct ofono_error *error, const char *imsi,
void *data)
{
@ -963,7 +988,11 @@ static void sim_imsi_cb(const struct ofono_error *error, const char *imsi,
sim->imsi = g_strdup(imsi);
ofono_sim_set_ready(sim);
/* Read CPHS-support bits, this is still part of the SIM
* initialisation but no order is specified for it. */
ofono_sim_read(sim, SIM_EF_CPHS_INFORMATION_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_cphs_information_read_cb, sim);
}
static void sim_retrieve_imsi(struct ofono_sim *sim)
@ -1698,6 +1727,22 @@ enum ofono_sim_phase ofono_sim_get_phase(struct ofono_sim *sim)
return sim->phase;
}
enum ofono_sim_cphs_phase ofono_sim_get_cphs_phase(struct ofono_sim *sim)
{
if (sim == NULL)
return OFONO_SIM_CPHS_NONE;
return sim->cphs_phase;
}
unsigned short ofono_sim_get_cphs_support(struct ofono_sim *sim)
{
if (sim == NULL)
return 0;
return sim->cphs_support;
}
unsigned int ofono_sim_add_ready_watch(struct ofono_sim *sim,
ofono_sim_ready_notify_cb_t notify,
void *data, ofono_destroy_func destroy)

1
src/simutil.h
View File

@ -22,6 +22,7 @@
enum sim_fileid {
SIM_EFPL_FILEID = 0x2f05,
SIM_EFLI_FILEID = 0x6f05,
SIM_EF_CPHS_INFORMATION_FILEID = 0x6f16,
SIM_EFMSISDN_FILEID = 0x6f40,
SIM_EFSPN_FILEID = 0x6f46,
SIM_EFSDN_FILEID = 0x6f49,