From 2b231c3f8487f51ee0691e2e97ef1207bbf79e0d Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 12 Jan 2010 11:23:21 -0600 Subject: [PATCH] Rename: Rename CPHS Phase enums Be more consistent with the 3GPP Phase names --- include/sim.h | 10 +++------- src/sim.c | 7 +++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/sim.h b/include/sim.h index 53620b9..29a0847 100644 --- a/include/sim.h +++ b/include/sim.h @@ -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, diff --git a/src/sim.c b/src/sim.c index 0240682..502dd37 100644 --- a/src/sim.c +++ b/src/sim.c @@ -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]; -- 2.7.4