1 files changed, 239 insertions, 29 deletions

diff --git a/plugins/mm-modem-sierra-gsm.c b/plugins/mm-modem-sierra-gsm.c
index ee82234..bf5df31 100644
--- a/plugins/mm-modem-sierra-gsm.c
+++ b/plugins/mm-modem-sierra-gsm.c
@@ -11,9 +11,10 @@
  * GNU General Public License for more details:
  *
  * Copyright (C) 2008 - 2009 Novell, Inc.
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 2009 - 2010 Red Hat, Inc.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -21,12 +22,18 @@
 #include "mm-modem-sierra-gsm.h"
 #include "mm-errors.h"
 #include "mm-callback-info.h"
+#include "mm-modem-helpers.h"
 
 static void modem_init (MMModem *modem_class);
 
 G_DEFINE_TYPE_EXTENDED (MMModemSierraGsm, mm_modem_sierra_gsm, MM_TYPE_GENERIC_GSM, 0,
                         G_IMPLEMENT_INTERFACE (MM_TYPE_MODEM, modem_init))
 
+#define MM_MODEM_SIERRA_GSM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_MODEM_SIERRA_GSM, MMModemSierraGsmPrivate))
+
+typedef struct {
+    guint enable_wait_id;
+} MMModemSierraGsmPrivate;
 
 MMModem *
 mm_modem_sierra_gsm_new (const char *device,
@@ -45,54 +52,232 @@ mm_modem_sierra_gsm_new (const char *device,
 }
 
 /*****************************************************************************/
-/*    Modem class override functions                                         */
-/*****************************************************************************/
 
 static void
-pin_check_done (MMModem *modem, GError *error, gpointer user_data)
+get_allowed_mode_done (MMAtSerialPort *port,
+                       GString *response,
+                       GError *error,
+                       gpointer user_data)
 {
     MMCallbackInfo *info = (MMCallbackInfo *) user_data;
+    GRegex *r = NULL;
+    GMatchInfo *match_info;
+
+    info->error = mm_modem_check_removed (info->modem, error);
+    if (info->error)
+        goto done;
+
+    /* Example response: !SELRAT: 03, UMTS 3G Preferred */
+    r = g_regex_new ("!SELRAT:\\s*(\\d+).*$", 0, 0, NULL);
+    if (!r) {
+        info->error = g_error_new_literal (MM_MODEM_ERROR,
+                                           MM_MODEM_ERROR_GENERAL,
+                                           "Failed to parse the allowed mode response");
+        goto done;
+    }
+
+    if (g_regex_match_full (r, response->str, response->len, 0, 0, &match_info, &info->error)) {
+        MMModemGsmAllowedMode mode = MM_MODEM_GSM_ALLOWED_MODE_ANY;
+        char *str;
+
+        str = g_match_info_fetch (match_info, 1);
+        switch (atoi (str)) {
+        case 0:
+            mode = MM_MODEM_GSM_ALLOWED_MODE_ANY;
+            break;
+        case 1:
+            mode = MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY;
+            break;
+        case 2:
+            mode = MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY;
+            break;
+        case 3:
+            mode = MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED;
+            break;
+        case 4:
+            mode = MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED;
+            break;
+        default:
+            info->error = g_error_new (MM_MODEM_ERROR,
+                                       MM_MODEM_ERROR_GENERAL,
+                                       "Failed to parse the allowed mode response: '%s'",
+                                       response->str);
+            break;
+        }
+        g_free (str);
+
+        mm_callback_info_set_result (info, GUINT_TO_POINTER (mode), NULL);
+    }
 
-    mm_generic_gsm_enable_complete (MM_GENERIC_GSM (modem), error, info);
+done:
+    if (r)
+        g_regex_unref (r);
+    mm_callback_info_schedule (info);
 }
 
-static gboolean
-sierra_enabled (gpointer data)
+static void
+get_allowed_mode (MMGenericGsm *gsm,
+                  MMModemUIntFn callback,
+                  gpointer user_data)
 {
-    MMCallbackInfo *info = (MMCallbackInfo *) data;
+    MMCallbackInfo *info;
+    MMAtSerialPort *primary;
 
-    /* Now check the PIN explicitly, sierra doesn't seem to report
-     * that it needs it otherwise.
-     */
-    mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
-    return FALSE;
+    info = mm_callback_info_uint_new (MM_MODEM (gsm), callback, user_data);
+
+    /* Sierra secondary ports don't have full AT command interpreters */
+    primary = mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY);
+    if (!primary || mm_port_get_connected (MM_PORT (primary))) {
+        g_set_error_literal (&info->error, MM_MODEM_ERROR, MM_MODEM_ERROR_CONNECTED,
+                             "Cannot perform this operation while connected");
+        mm_callback_info_schedule (info);
+        return;
+    }
+
+    mm_at_serial_port_queue_command (primary, "!SELRAT?", 3, get_allowed_mode_done, info);
 }
 
 static void
-parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
+set_allowed_mode_done (MMAtSerialPort *port,
+                       GString *response,
+                       GError *error,
+                       gpointer user_data)
 {
     MMCallbackInfo *info = (MMCallbackInfo *) user_data;
 
-    if (error) {
-        mm_generic_gsm_enable_complete (MM_GENERIC_GSM (modem), error, info);
+    if (error)
+        info->error = g_error_copy (error);
+
+   mm_callback_info_schedule (info);
+}
+
+static void
+set_allowed_mode (MMGenericGsm *gsm,
+                  MMModemGsmAllowedMode mode,
+                  MMModemFn callback,
+                  gpointer user_data)
+{
+    MMCallbackInfo *info;
+    MMAtSerialPort *primary;
+    char *command;
+    int idx = 0;
+
+    info = mm_callback_info_new (MM_MODEM (gsm), callback, user_data);
+
+    /* Sierra secondary ports don't have full AT command interpreters */
+    primary = mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY);
+    if (!primary || mm_port_get_connected (MM_PORT (primary))) {
+        g_set_error_literal (&info->error, MM_MODEM_ERROR, MM_MODEM_ERROR_CONNECTED,
+                             "Cannot perform this operation while connected");
+        mm_callback_info_schedule (info);
         return;
     }
 
-    /* Sierra returns OK on +CFUN=1 right away but needs some time
-     * to finish initialization.
-     */
-    g_timeout_add_seconds (10, sierra_enabled, info);
+    switch (mode) {
+    case MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY:
+        idx = 2;
+        break;
+    case MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY:
+        idx = 1;
+        break;
+    case MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED:
+        idx = 4;
+        break;
+    case MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED:
+        idx = 3;
+        break;
+    case MM_MODEM_GSM_ALLOWED_MODE_ANY:
+    default:
+        break;
+    }
+
+    command = g_strdup_printf ("!SELRAT=%d", idx);
+    mm_at_serial_port_queue_command (primary, command, 3, set_allowed_mode_done, info);
+    g_free (command);
 }
 
 static void
-enable (MMModem *modem, MMModemFn callback, gpointer user_data)
+get_act_request_done (MMAtSerialPort *port,
+                      GString *response,
+                      GError *error,
+                      gpointer user_data)
 {
-    MMModem *parent_modem_iface;
+    MMCallbackInfo *info = user_data;
+    MMModemGsmAccessTech act = MM_MODEM_GSM_ACCESS_TECH_UNKNOWN;
+    const char *p;
+
+    if (error)
+        info->error = g_error_copy (error);
+    else {
+        p = mm_strip_tag (response->str, "*CNTI:");
+        p = strchr (p, ',');
+        if (p)
+            act = mm_gsm_string_to_access_tech (p + 1);
+    }
+
+    mm_callback_info_set_result (info, GUINT_TO_POINTER (act), NULL);
+    mm_callback_info_schedule (info);
+}
+
+static void
+get_access_technology (MMGenericGsm *modem,
+                       MMModemUIntFn callback,
+                       gpointer user_data)
+{
+    MMAtSerialPort *port;
     MMCallbackInfo *info;
 
-    info = mm_callback_info_new (modem, callback, user_data);
-    parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (modem));
-    parent_modem_iface->enable (modem, parent_enable_done, info);
+    info = mm_callback_info_uint_new (MM_MODEM (modem), callback, user_data);
+
+    port = mm_generic_gsm_get_best_at_port (modem, &info->error);
+    if (!port) {
+        mm_callback_info_schedule (info);
+        return;
+    }
+
+    mm_at_serial_port_queue_command (port, "*CNTI=0", 3, get_act_request_done, info);
+}
+
+/*****************************************************************************/
+/*    Modem class override functions                                         */
+/*****************************************************************************/
+
+static gboolean
+sierra_enabled (gpointer user_data)
+{
+    MMCallbackInfo *info = user_data;
+    MMGenericGsm *modem;
+    MMModemSierraGsmPrivate *priv;
+
+    /* Make sure we don't use an invalid modem that may have been removed */
+    if (info->modem) {
+        modem = MM_GENERIC_GSM (info->modem);
+        priv = MM_MODEM_SIERRA_GSM_GET_PRIVATE (modem);
+        priv->enable_wait_id = 0;
+        MM_GENERIC_GSM_CLASS (mm_modem_sierra_gsm_parent_class)->do_enable_power_up_done (modem, NULL, NULL, info);
+    }
+    return FALSE;
+}
+
+static void
+real_do_enable_power_up_done (MMGenericGsm *gsm,
+                              GString *response,
+                              GError *error,
+                              MMCallbackInfo *info)
+{
+    MMModemSierraGsmPrivate *priv = MM_MODEM_SIERRA_GSM_GET_PRIVATE (gsm);
+
+    if (error) {
+        /* Chain up to parent */
+        MM_GENERIC_GSM_CLASS (mm_modem_sierra_gsm_parent_class)->do_enable_power_up_done (gsm, NULL, error, info);
+        return;
+    }
+
+    /* Some Sierra devices return OK on +CFUN=1 right away but need some time
+     * to finish initialization.
+     */
+    g_warn_if_fail (priv->enable_wait_id == 0);
+    priv->enable_wait_id = g_timeout_add_seconds (10, sierra_enabled, info);
 }
 
 static gboolean
@@ -108,18 +293,25 @@ grab_port (MMModem *modem,
     MMPort *port;
 
     if (suggested_type == MM_PORT_TYPE_UNKNOWN) {
-        if (!mm_generic_gsm_get_port (gsm, MM_PORT_TYPE_PRIMARY))
+        if (!mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY))
                 ptype = MM_PORT_TYPE_PRIMARY;
-        else if (!mm_generic_gsm_get_port (gsm, MM_PORT_TYPE_SECONDARY))
+        else if (!mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_SECONDARY))
             ptype = MM_PORT_TYPE_SECONDARY;
     } else
         ptype = suggested_type;
 
     port = mm_generic_gsm_grab_port (gsm, subsys, name, ptype, error);
 
-    if (port && MM_IS_SERIAL_PORT (port))
+    if (port && MM_IS_AT_SERIAL_PORT (port)) {
+        GRegex *regex;
+
         g_object_set (G_OBJECT (port), MM_PORT_CARRIER_DETECT, FALSE, NULL);
 
+        regex = g_regex_new ("\\r\\n\\+PACSP0\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
+        mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (port), regex, NULL, NULL, NULL);
+        g_regex_unref (regex);
+    }
+
     return !!port;
 }
 
@@ -128,7 +320,6 @@ grab_port (MMModem *modem,
 static void
 modem_init (MMModem *modem_class)
 {
-    modem_class->enable = enable;
     modem_class->grab_port = grab_port;
 }
 
@@ -138,8 +329,27 @@ mm_modem_sierra_gsm_init (MMModemSierraGsm *self)
 }
 
 static void
+dispose (GObject *object)
+{
+    MMModemSierraGsmPrivate *priv = MM_MODEM_SIERRA_GSM_GET_PRIVATE (object);
+
+    if (priv->enable_wait_id)
+        g_source_remove (priv->enable_wait_id);
+}
+
+static void
 mm_modem_sierra_gsm_class_init (MMModemSierraGsmClass *klass)
 {
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    MMGenericGsmClass *gsm_class = MM_GENERIC_GSM_CLASS (klass);
+
     mm_modem_sierra_gsm_parent_class = g_type_class_peek_parent (klass);
+    g_type_class_add_private (object_class, sizeof (MMModemSierraGsmPrivate));
+
+    object_class->dispose = dispose;
+    gsm_class->do_enable_power_up_done = real_do_enable_power_up_done;
+    gsm_class->set_allowed_mode = set_allowed_mode;
+    gsm_class->get_allowed_mode = get_allowed_mode;
+    gsm_class->get_access_technology = get_access_technology;
 }