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

Rename: Rename CPHS Phase enums 

Be more consistent with the 3GPP Phase names
This commit is contained in:
Denis Kenzior 2010-01-12 11:23:21 -06:00
parent 96a93b5829
commit 2b231c3f84
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/sim.h
View File

@ -66,13 +66,9 @@ enum ofono_sim_phase {
};
enum ofono_sim_cphs_phase {
OFONO_SIM_CPHS_NONE,
OFONO_SIM_CPHS_PHASE1,
OFONO_SIM_CPHS_PHASE2,
};
enum ofono_sim_cphs_support_masks {
OFONO_SIM_CPHS_ST_MAILBOX_NUMBERS_MASK = 0x30,
OFONO_SIM_CPHS_PHASE_NONE,
OFONO_SIM_CPHS_PHASE_1G,
OFONO_SIM_CPHS_PHASE_2G,
};
typedef void (*ofono_sim_file_info_cb_t)(const struct ofono_error *error,

7
src/sim.c
View File

@ -959,16 +959,15 @@ static void sim_cphs_information_read_cb(int ok, int length, int record,
{
struct ofono_sim *sim = userdata;
sim->cphs_phase = OFONO_SIM_CPHS_NONE;
sim->cphs_support = 0;
sim->cphs_phase = OFONO_SIM_CPHS_PHASE_NONE;
if (!ok || length < 3)
goto ready;
if (data[0] == 0x01)
sim->cphs_phase = OFONO_SIM_CPHS_PHASE1;
sim->cphs_phase = OFONO_SIM_CPHS_PHASE_1G;
else if (data[0] >= 0x02)
sim->cphs_phase = OFONO_SIM_CPHS_PHASE2;
sim->cphs_phase = OFONO_SIM_CPHS_PHASE_2G;
sim->cphs_support = (data[2] << 8) | data[1];