Rename: Rename CPHS Phase enums

Be more consistent with the 3GPP Phase names

2 files changed, 6 insertions, 11 deletions

diff --git a/include/sim.h b/include/sim.h
index 53620b9a..29a0847f 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 02406823..502dd372 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];