colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sim-qmi: try to gather from the optional TLV whether MNC is 2 or 3 digits

Browse Source 
We bump libqmi requiremetn to 1.13.5, which is the one with support for the new TLV.
This commit is contained in:
Aleksander Morgado
2015-10-25 15:36:14 +01:00
parent 77b6b02fd3
commit 35ab3dedd6
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -291,7 +291,7 @@ AC_ARG_WITH(qmi, AS_HELP_STRING([--without-qmi], [Build without QMI support]), [
AM_CONDITIONAL(WITH_QMI, test "x$with_qmi" = "xyes") AM_CONDITIONAL(WITH_QMI, test "x$with_qmi" = "xyes")
case $with_qmi in case $with_qmi in
yes) yes)
PKG_CHECK_MODULES(QMI, [qmi-glib >= 1.13.4], [have_qmi=yes],[have_qmi=no]) PKG_CHECK_MODULES(QMI, [qmi-glib >= 1.13.5], [have_qmi=yes],[have_qmi=no])
if test "x$have_qmi" = "xno"; then if test "x$have_qmi" = "xno"; then
AC_MSG_ERROR([Couldn't find libqmi-glib. Install it, or otherwise configure using --without-qmi to disable QMI support.]) AC_MSG_ERROR([Couldn't find libqmi-glib. Install it, or otherwise configure using --without-qmi to disable QMI support.])
else else

28
src/mm-sim-qmi.c
View File

@@ -238,6 +238,7 @@ get_home_network (QmiClientNas *client,
GAsyncResult *res, GAsyncResult *res,
guint16 *out_mcc, guint16 *out_mcc,
guint16 *out_mnc, guint16 *out_mnc,
gboolean *out_mnc_with_pcs,
gchar **out_operator_name, gchar **out_operator_name,
GError **error) GError **error)
{ {
@@ -260,6 +261,26 @@ get_home_network (QmiClientNas *client,
NULL); NULL);
if (out_operator_name) if (out_operator_name)
*out_operator_name = g_strdup (name); *out_operator_name = g_strdup (name);
if (out_mnc_with_pcs) {
gboolean is_3gpp;
gboolean mnc_includes_pcs_digit;
if (qmi_message_nas_get_home_network_output_get_home_network_3gpp_mnc (
output,
&is_3gpp,
&mnc_includes_pcs_digit,
NULL) &&
is_3gpp &&
mnc_includes_pcs_digit) {
/* MNC should include PCS digit */
*out_mnc_with_pcs = TRUE;
} else {
/* We default to NO PCS digit, unless of course the MNC is already > 99 */
*out_mnc_with_pcs = FALSE;
}
}
success = TRUE; success = TRUE;
} }
@@ -290,16 +311,17 @@ load_operator_identifier_ready (QmiClientNas *client,
GSimpleAsyncResult *simple) GSimpleAsyncResult *simple)
{ {
guint16 mcc, mnc; guint16 mcc, mnc;
gboolean mnc_with_pcs;
GError *error = NULL; GError *error = NULL;
if (get_home_network (client, res, &mcc, &mnc, NULL, &error)) { if (get_home_network (client, res, &mcc, &mnc, &mnc_with_pcs, NULL, &error)) {
GString *aux; GString *aux;
aux = g_string_new (""); aux = g_string_new ("");
/* MCC always 3 digits */ /* MCC always 3 digits */
g_string_append_printf (aux, "%.3" G_GUINT16_FORMAT, mcc); g_string_append_printf (aux, "%.3" G_GUINT16_FORMAT, mcc);
/* Guess about MNC, if < 100 assume it's 2 digits, no PCS info here */ /* Guess about MNC, if < 100 assume it's 2 digits, no PCS info here */
if (mnc >= 100) if (mnc >= 100 || mnc_with_pcs)
g_string_append_printf (aux, "%.3" G_GUINT16_FORMAT, mnc); g_string_append_printf (aux, "%.3" G_GUINT16_FORMAT, mnc);
else else
g_string_append_printf (aux, "%.2" G_GUINT16_FORMAT, mnc); g_string_append_printf (aux, "%.2" G_GUINT16_FORMAT, mnc);
@@ -367,7 +389,7 @@ load_operator_name_ready (QmiClientNas *client,
gchar *operator_name = NULL; gchar *operator_name = NULL;
GError *error = NULL; GError *error = NULL;
if (get_home_network (client, res, NULL, NULL, &operator_name, &error)) { if (get_home_network (client, res, NULL, NULL, NULL, &operator_name, &error)) {
g_simple_async_result_set_op_res_gpointer (simple, g_simple_async_result_set_op_res_gpointer (simple,
operator_name, operator_name,
(GDestroyNotify)g_free); (GDestroyNotify)g_free);