---
src/network.c | 46 +++++++---------------------------------------
1 files changed, 7 insertions(+), 39 deletions(-)
diff --git a/src/network.c b/src/network.c
index b5450ee..f602db4 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1507,51 +1507,21 @@ static void sim_spdi_read_cb(int ok, int length, int
record,
}
}
-static void sim_spn_read_cb(int ok, int length, int record,
- const unsigned char *data,
- int record_length, void *user_data)
+static void get_spn(struct ofono_netreg *netreg)
{
- struct ofono_netreg *netreg = user_data;
unsigned char dcbyte;
- char *spn;
-
- if (!ok)
- return;
-
- dcbyte = data[0];
+ const char *spn = ofono_sim_get_spn(netreg->sim);
- /*
- * TS 31.102 says:
- *
- * the string shall use:
- *
- * - either the SMS default 7-bit coded alphabet as defined in
- * TS 23.038 [5] with bit 8 set to 0. The string shall be left
- * justified. Unused bytes shall be set to 'FF'.
- *
- * - or one of the UCS2 code options defined in the annex of TS
- * 31.101 [11].
- *
- * 31.101 has no such annex though. 51.101 refers to Annex B of
- * itself which is not there either. 11.11 contains the same
- * paragraph as 51.101 and has an Annex B which we implement.
- */
- spn = sim_string_to_utf8(data + 1, length - 1);
- if (spn == NULL) {
- ofono_error("EFspn read successfully, but couldn't parse");
+ if (spn == NULL)
return;
- }
- if (strlen(spn) == 0) {
- g_free(spn);
- return;
- }
-
- netreg->spname = spn;
+ netreg->spname = g_strdup(spn);
ofono_sim_read(netreg->sim, SIM_EFSPDI_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_spdi_read_cb, netreg);
+ dcbyte = ofono_sim_get_spn_dc(netreg->sim);
+
if (dcbyte & SIM_EFSPN_DC_HOME_PLMN_BIT)
netreg->flags |= NETWORK_REGISTRATION_FLAG_HOME_SHOW_PLMN;
@@ -1816,9 +1786,7 @@ void ofono_netreg_register(struct ofono_netreg *netreg)
ofono_sim_read(netreg->sim, SIM_EFPNN_FILEID,
OFONO_SIM_FILE_STRUCTURE_FIXED,
sim_pnn_read_cb, netreg);
- ofono_sim_read(netreg->sim, SIM_EFSPN_FILEID,
- OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
- sim_spn_read_cb, netreg);
+ get_spn(netreg);
}
__ofono_atom_register(netreg->atom, netreg_unregister);
--
1.7.1
_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono
