1 files changed, 127 insertions, 129 deletions

diff --git a/plugins/mm-modem-option.c b/plugins/mm-modem-option.c
index 2076ae6..ac04b0b 100644
--- a/plugins/mm-modem-option.c
+++ b/plugins/mm-modem-option.c
@@ -23,12 +23,15 @@
 #include "mm-callback-info.h"
 
 static void modem_init (MMModem *modem_class);
-static void modem_gsm_network_init (MMModemGsmNetwork *gsm_network_class);
 
 G_DEFINE_TYPE_EXTENDED (MMModemOption, mm_modem_option, MM_TYPE_GENERIC_GSM, 0,
-                        G_IMPLEMENT_INTERFACE (MM_TYPE_MODEM, modem_init)
-                        G_IMPLEMENT_INTERFACE (MM_TYPE_MODEM_GSM_NETWORK, modem_gsm_network_init))
+                        G_IMPLEMENT_INTERFACE (MM_TYPE_MODEM, modem_init))
 
+#define MM_MODEM_OPTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_MODEM_OPTION, MMModemOptionPrivate))
+
+typedef struct {
+    guint enable_wait_id;
+} MMModemOptionPrivate;
 
 MMModem *
 mm_modem_option_new (const char *device,
@@ -46,174 +49,156 @@ mm_modem_option_new (const char *device,
                                    NULL));
 }
 
+#include "mm-modem-option-utils.c"
+
 /*****************************************************************************/
 
-static void
-pin_check_done (MMModem *modem, GError *error, gpointer user_data)
+static gboolean
+option_enabled (gpointer user_data)
 {
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
+    MMCallbackInfo *info = user_data;
+    MMGenericGsm *modem;
+    MMModemOptionPrivate *priv;
 
-    mm_generic_gsm_enable_complete (MM_GENERIC_GSM (modem), error, info);
-}
+    /* 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_OPTION_GET_PRIVATE (modem);
+        priv->enable_wait_id = 0;
 
-static gboolean
-option_enabled (gpointer data)
-{
-    MMCallbackInfo *info = (MMCallbackInfo *) data;
+        option_change_unsolicited_messages (modem, TRUE, NULL, NULL);
 
-    /* Now check the PIN explicitly, option doesn't seem to report
-     * that it needs it otherwise.
-     */
-    mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
+        MM_GENERIC_GSM_CLASS (mm_modem_option_parent_class)->do_enable_power_up_done (modem, NULL, NULL, info);
+    }
     return FALSE;
 }
 
 static void
-parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
+real_do_enable_power_up_done (MMGenericGsm *gsm,
+                              GString *response,
+                              GError *error,
+                              MMCallbackInfo *info)
 {
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
+    MMModemOptionPrivate *priv = MM_MODEM_OPTION_GET_PRIVATE (gsm);
 
     if (error) {
-        mm_generic_gsm_enable_complete (MM_GENERIC_GSM (modem), error, info);
+        /* Chain up to parent */
+        MM_GENERIC_GSM_CLASS (mm_modem_option_parent_class)->do_enable_power_up_done (gsm, NULL, error, info);
         return;
     }
 
-    /* Option returns OK on +CFUN=1 right away but needs some time
-     * to finish initialization
+    /* Some Option devices return OK on +CFUN=1 right away but need some time
+     * to finish initialization.
      */
-    g_timeout_add_seconds (10, option_enabled, info);
+    g_warn_if_fail (priv->enable_wait_id == 0);
+    priv->enable_wait_id = g_timeout_add_seconds (10, option_enabled, info);
 }
 
+/*****************************************************************************/
+
 static void
-enable (MMModem *modem,
-        MMModemFn callback,
-        gpointer user_data)
+get_allowed_mode (MMGenericGsm *gsm,
+                  MMModemUIntFn callback,
+                  gpointer user_data)
 {
-    MMModem *parent_modem_iface;
-    MMCallbackInfo *info;
+    option_get_allowed_mode (gsm, callback, user_data);
+}
 
-    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);
+static void
+set_allowed_mode (MMGenericGsm *gsm,
+                  MMModemGsmAllowedMode mode,
+                  MMModemFn callback,
+                  gpointer user_data)
+{
+    option_set_allowed_mode (gsm, mode, callback, user_data);
 }
 
 static void
-get_network_mode_done (MMSerialPort *port,
-                       GString *response,
-                       GError *error,
+get_access_technology (MMGenericGsm *gsm,
+                       MMModemUIntFn callback,
                        gpointer user_data)
 {
+    option_get_access_technology (gsm, callback, user_data);
+}
+
+/*****************************************************************************/
+
+static void
+parent_disable_done (MMModem *modem, GError *error, gpointer user_data)
+{
     MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    gboolean parsed = FALSE;
 
     if (error)
         info->error = g_error_copy (error);
-    else if (!g_str_has_prefix (response->str, "_OPSYS: ")) {
-        int a, b;
-
-        if (sscanf (response->str + 8, "%d,%d", &a, &b)) {
-            MMModemGsmMode mode = MM_MODEM_GSM_MODE_ANY;
-
-            switch (a) {
-            case 0:
-                mode = MM_MODEM_GSM_MODE_2G_ONLY;
-                break;
-            case 1:
-                mode = MM_MODEM_GSM_MODE_3G_ONLY;
-                break;
-            case 2:
-                mode = MM_MODEM_GSM_MODE_2G_PREFERRED;
-                break;
-            case 3:
-                mode = MM_MODEM_GSM_MODE_3G_PREFERRED;
-                break;
-            default:
-                break;
-            }
-
-            mm_callback_info_set_result (info, GUINT_TO_POINTER (mode), NULL);
-            parsed = TRUE;
-        }
-    }
-
-    if (!error && !parsed)
-        info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
-                                           "Could not parse network mode results");
-
     mm_callback_info_schedule (info);
 }
 
 static void
-get_network_mode (MMModemGsmNetwork *modem,
-                  MMModemUIntFn callback,
-                  gpointer user_data)
+unsolicited_disable_done (MMModem *modem,
+                          GError *error,
+                          gpointer user_data)
 {
-    MMCallbackInfo *info;
-    MMSerialPort *primary;
+    MMCallbackInfo *info = user_data;
+    MMModem *parent_modem_iface;
+    GError *tmp_error = NULL;
+
+    /* Handle modem removal, but ignore other errors */
+    if (g_error_matches (error, MM_MODEM_ERROR, MM_MODEM_ERROR_REMOVED)) {
+        parent_disable_done (modem, error, user_data);
+        return;
+    } else if (!modem) {
+        tmp_error =  g_error_new_literal (MM_MODEM_ERROR,
+                                          MM_MODEM_ERROR_REMOVED,
+                                          "The modem was removed.");
+        parent_disable_done (modem, tmp_error, user_data);
+        g_error_free (tmp_error);
+        return;
+    }
 
-    info = mm_callback_info_uint_new (MM_MODEM (modem), callback, user_data);
-    primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
-    g_assert (primary);
-    mm_serial_port_queue_command (primary, "AT_OPSYS?", 3, get_network_mode_done, info);
+    /* Chain up to parent */
+    parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (modem));
+    parent_modem_iface->disable (info->modem, parent_disable_done, info);
 }
 
 static void
-set_network_mode_done (MMSerialPort *port,
-                       GString *response,
-                       GError *error,
-                       gpointer user_data)
+disable (MMModem *modem,
+         MMModemFn callback,
+         gpointer user_data)
 {
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
+    MMCallbackInfo *info;
 
-    if (error)
-        info->error = g_error_copy (error);
- 
-   mm_callback_info_schedule (info);
+    mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem));
+
+    info = mm_callback_info_new (modem, callback, user_data);
+
+    /* Turn off unsolicited messages so they don't pile up in the modem */
+    option_change_unsolicited_messages (MM_GENERIC_GSM (modem), FALSE, unsolicited_disable_done, info);
 }
 
-static void
-set_network_mode (MMModemGsmNetwork *modem,
-                  MMModemGsmMode mode,
-                  MMModemFn callback,
-                  gpointer user_data)
+static gboolean
+grab_port (MMModem *modem,
+           const char *subsys,
+           const char *name,
+           MMPortType suggested_type,
+           gpointer user_data,
+           GError **error)
 {
-    MMCallbackInfo *info;
-    MMSerialPort *primary;
-    char *command;
-    int i;
-
-    info = mm_callback_info_new (MM_MODEM (modem), callback, user_data);
-
-    switch (mode) {
-    case MM_MODEM_GSM_MODE_ANY:
-    case MM_MODEM_GSM_MODE_GPRS:
-    case MM_MODEM_GSM_MODE_EDGE:
-    case MM_MODEM_GSM_MODE_2G_ONLY:
-        i = 0;
-        break;
-    case MM_MODEM_GSM_MODE_UMTS:
-    case MM_MODEM_GSM_MODE_HSDPA:
-    case MM_MODEM_GSM_MODE_HSUPA:
-    case MM_MODEM_GSM_MODE_HSPA:
-    case MM_MODEM_GSM_MODE_3G_ONLY:
-        i = 1;
-        break;
-    case MM_MODEM_GSM_MODE_2G_PREFERRED:
-        i = 2;
-        break;
-    case MM_MODEM_GSM_MODE_3G_PREFERRED:
-        i = 3;
-        break;
-    default:
-        i = 5;
-        break;
+    MMGenericGsm *gsm = MM_GENERIC_GSM (modem);
+    MMPort *port = NULL;
+
+    port = mm_generic_gsm_grab_port (gsm, subsys, name, suggested_type, error);
+    if (port && MM_IS_AT_SERIAL_PORT (port)) {
+        if (mm_port_get_port_type (port) == MM_PORT_TYPE_PRIMARY) {
+            GRegex *regex;
+
+            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);
+        }
+        option_register_unsolicted_handlers (gsm, MM_AT_SERIAL_PORT (port));
     }
 
-    command = g_strdup_printf ("AT_OPSYS=%d,2", i);
-    primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
-    g_assert (primary);
-    mm_serial_port_queue_command (primary, command, 3, set_network_mode_done, info);
-    g_free (command);
+    return !!port;
 }
 
 /*****************************************************************************/
@@ -221,24 +206,37 @@ set_network_mode (MMModemGsmNetwork *modem,
 static void
 modem_init (MMModem *modem_class)
 {
-    modem_class->enable = enable;
+    modem_class->disable = disable;
+    modem_class->grab_port = grab_port;
 }
 
 static void
-modem_gsm_network_init (MMModemGsmNetwork *class)
+mm_modem_option_init (MMModemOption *self)
 {
-    class->set_network_mode = set_network_mode;
-    class->get_network_mode = get_network_mode;
 }
 
 static void
-mm_modem_option_init (MMModemOption *self)
+dispose (GObject *object)
 {
+    MMModemOptionPrivate *priv = MM_MODEM_OPTION_GET_PRIVATE (object);
+
+    if (priv->enable_wait_id)
+        g_source_remove (priv->enable_wait_id);
 }
 
 static void
 mm_modem_option_class_init (MMModemOptionClass *klass)
 {
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    MMGenericGsmClass *gsm_class = MM_GENERIC_GSM_CLASS (klass);
+
     mm_modem_option_parent_class = g_type_class_peek_parent (klass);
+    g_type_class_add_private (object_class, sizeof (MMModemOptionPrivate));
+
+    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;
 }