aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mm-modem-hso.c37
-rw-r--r--plugins/mm-modem-huawei-gsm.c200
-rw-r--r--plugins/mm-modem-mbm.c136
-rw-r--r--plugins/mm-modem-novatel-gsm.c76
-rw-r--r--plugins/mm-modem-option.c142
-rw-r--r--plugins/mm-modem-sierra-gsm.c75
-rw-r--r--plugins/mm-modem-zte.c23
-rw-r--r--plugins/mm-plugin-huawei.c15
8 files changed, 295 insertions, 409 deletions
diff --git a/plugins/mm-modem-hso.c b/plugins/mm-modem-hso.c
index aedb02fc..7548f125 100644
--- a/plugins/mm-modem-hso.c
+++ b/plugins/mm-modem-hso.c
@@ -288,40 +288,6 @@ mm_hso_modem_authenticate (MMModemHso *self,
/*****************************************************************************/
static void
-enable_done (MMModem *modem, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-
- mm_generic_gsm_enable_complete (MM_GENERIC_GSM (modem), error, info);
-}
-
-static void
-parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = (MMCallbackInfo *) user_data;
- MMGenericGsm *self = MM_GENERIC_GSM (modem);
-
- if (error) {
- mm_generic_gsm_enable_complete (self, error, info);
- return;
- }
-
- /* HSO needs manual PIN checking */
- mm_generic_gsm_check_pin (self, enable_done, info);
-}
-
-static void
-enable (MMModem *modem, MMModemFn callback, gpointer user_data)
-{
- MMModem *parent_modem_iface;
- MMCallbackInfo *info;
-
- info = mm_callback_info_new (modem, callback, user_data);
- parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (info->modem));
- parent_modem_iface->enable (info->modem, parent_enable_done, info);
-}
-
-static void
parent_disable_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
@@ -681,8 +647,6 @@ grab_port (MMModem *modem,
if (ptype == MM_PORT_TYPE_PRIMARY) {
GRegex *regex;
- mm_generic_gsm_set_unsolicited_registration (gsm, TRUE);
-
regex = g_regex_new ("_OWANCALL: (\\d),\\s*(\\d)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (port), regex, connection_enabled, modem, NULL);
g_regex_unref (regex);
@@ -712,7 +676,6 @@ modem_simple_init (MMModemSimple *class)
static void
modem_init (MMModem *modem_class)
{
- modem_class->enable = enable;
modem_class->disable = disable;
modem_class->connect = do_connect;
modem_class->get_ip4_config = get_ip4_config;
diff --git a/plugins/mm-modem-huawei-gsm.c b/plugins/mm-modem-huawei-gsm.c
index c2d913cd..78424863 100644
--- a/plugins/mm-modem-huawei-gsm.c
+++ b/plugins/mm-modem-huawei-gsm.c
@@ -11,7 +11,7 @@
* 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 <stdlib.h>
@@ -41,7 +41,6 @@ G_DEFINE_TYPE_EXTENDED (MMModemHuaweiGsm, mm_modem_huawei_gsm, MM_TYPE_GENERIC_G
typedef struct {
/* Cached state */
guint signal_quality;
- MMModemGsmMode mode;
MMModemGsmBand band;
} MMModemHuaweiGsmPrivate;
@@ -68,23 +67,28 @@ parse_syscfg (MMModemHuaweiGsm *self,
int *mode_b,
guint32 *band,
int *unknown1,
- int *unknown2)
+ int *unknown2,
+ MMModemGsmAllowedMode *out_mode)
{
if (reply == NULL || strncmp (reply, "^SYSCFG:", 8))
return FALSE;
if (sscanf (reply + 8, "%d,%d,%x,%d,%d", mode_a, mode_b, band, unknown1, unknown2)) {
MMModemHuaweiGsmPrivate *priv = MM_MODEM_HUAWEI_GSM_GET_PRIVATE (self);
-
+ MMModemGsmAllowedMode new_mode = MM_MODEM_GSM_ALLOWED_MODE_ANY;
+
/* Network mode */
if (*mode_a == 2 && *mode_b == 1)
- priv->mode = MM_MODEM_GSM_MODE_2G_PREFERRED;
+ new_mode = MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED;
else if (*mode_a == 2 && *mode_b == 2)
- priv->mode = MM_MODEM_GSM_MODE_3G_PREFERRED;
+ new_mode = MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED;
else if (*mode_a == 13 && *mode_b == 1)
- priv->mode = MM_MODEM_GSM_MODE_2G_ONLY;
+ new_mode = MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY;
else if (*mode_a == 14 && *mode_b == 2)
- priv->mode = MM_MODEM_GSM_MODE_3G_ONLY;
+ new_mode = MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY;
+
+ if (out_mode)
+ *out_mode = new_mode;
/* Band */
if (*band == 0x3FFFFFFF)
@@ -101,26 +105,21 @@ parse_syscfg (MMModemHuaweiGsm *self,
}
static void
-set_network_mode_done (MMAtSerialPort *port,
+set_allowed_mode_done (MMAtSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
- MMModemHuaweiGsm *self = MM_MODEM_HUAWEI_GSM (info->modem);
- MMModemHuaweiGsmPrivate *priv = MM_MODEM_HUAWEI_GSM_GET_PRIVATE (self);
if (error)
info->error = g_error_copy (error);
- else
- /* Success, cache the value */
- priv->mode = GPOINTER_TO_UINT (mm_callback_info_get_data (info, "mode"));
mm_callback_info_schedule (info);
}
static void
-set_network_mode_get_done (MMAtSerialPort *port,
+set_allowed_mode_get_done (MMAtSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
@@ -134,33 +133,29 @@ set_network_mode_get_done (MMAtSerialPort *port,
int a, b, u1, u2;
guint32 band;
- if (parse_syscfg (MM_MODEM_HUAWEI_GSM (info->modem), response->str, &a, &b, &band, &u1, &u2)) {
+ if (parse_syscfg (MM_MODEM_HUAWEI_GSM (info->modem), response->str, &a, &b, &band, &u1, &u2, NULL)) {
+ MMModemGsmAllowedMode mode;
char *command;
- switch (GPOINTER_TO_UINT (mm_callback_info_get_data (info, "mode"))) {
- case MM_MODEM_GSM_MODE_ANY:
+ mode = GPOINTER_TO_UINT (mm_callback_info_get_data (info, "mode"));
+ switch (mode) {
+ case MM_MODEM_GSM_ALLOWED_MODE_ANY:
a = 2;
b = 0;
break;
- case MM_MODEM_GSM_MODE_GPRS:
- case MM_MODEM_GSM_MODE_EDGE:
- case MM_MODEM_GSM_MODE_2G_ONLY:
+ case MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY:
a = 13;
b = 1;
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:
+ case MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY:
a = 14;
b = 2;
break;
- case MM_MODEM_GSM_MODE_2G_PREFERRED:
+ case MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED:
a = 2;
b = 1;
break;
- case MM_MODEM_GSM_MODE_3G_PREFERRED:
+ case MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED:
a = 2;
b = 2;
break;
@@ -169,93 +164,65 @@ set_network_mode_get_done (MMAtSerialPort *port,
}
command = g_strdup_printf ("AT^SYSCFG=%d,%d,%X,%d,%d", a, b, band, u1, u2);
- mm_at_serial_port_queue_command (port, command, 3, set_network_mode_done, info);
+ mm_at_serial_port_queue_command (port, command, 3, set_allowed_mode_done, info);
g_free (command);
}
}
}
static void
-set_network_mode (MMModemGsmNetwork *modem,
- MMModemGsmMode mode,
+set_allowed_mode (MMGenericGsm *gsm,
+ MMModemGsmAllowedMode mode,
MMModemFn callback,
gpointer user_data)
{
MMCallbackInfo *info;
MMAtSerialPort *primary;
- info = mm_callback_info_new (MM_MODEM (modem), callback, user_data);
+ info = mm_callback_info_new (MM_MODEM (gsm), 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_UMTS:
- case MM_MODEM_GSM_MODE_HSDPA:
- case MM_MODEM_GSM_MODE_HSUPA:
- case MM_MODEM_GSM_MODE_HSPA:
- case MM_MODEM_GSM_MODE_2G_PREFERRED:
- case MM_MODEM_GSM_MODE_3G_PREFERRED:
- case MM_MODEM_GSM_MODE_2G_ONLY:
- case MM_MODEM_GSM_MODE_3G_ONLY:
- /* Allowed values */
- mm_callback_info_set_data (info, "mode", GUINT_TO_POINTER (mode), NULL);
- primary = mm_generic_gsm_get_at_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
- g_assert (primary);
- mm_at_serial_port_queue_command (primary, "AT^SYSCFG?", 3, set_network_mode_get_done, info);
- return;
- default:
- info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "Invalid mode.");
- break;
- }
+ mm_callback_info_set_data (info, "mode", GUINT_TO_POINTER (mode), NULL);
+ primary = mm_generic_gsm_get_at_port (MM_GENERIC_GSM (gsm), MM_PORT_TYPE_PRIMARY);
+ g_assert (primary);
- mm_callback_info_schedule (info);
+ /* Get current configuration first so we don't change band and other
+ * stuff when updating the mode.
+ */
+ mm_at_serial_port_queue_command (primary, "AT^SYSCFG?", 3, set_allowed_mode_get_done, info);
}
static void
-get_network_mode_done (MMAtSerialPort *port,
+get_allowed_mode_done (MMAtSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
MMModemHuaweiGsm *self = MM_MODEM_HUAWEI_GSM (info->modem);
- MMModemHuaweiGsmPrivate *priv = MM_MODEM_HUAWEI_GSM_GET_PRIVATE (self);
int mode_a, mode_b, u1, u2;
guint32 band;
+ MMModemGsmAllowedMode mode = MM_MODEM_GSM_ALLOWED_MODE_ANY;
if (error)
info->error = g_error_copy (error);
- else if (parse_syscfg (self, response->str, &mode_a, &mode_b, &band, &u1, &u2))
- mm_callback_info_set_result (info, GUINT_TO_POINTER (priv->mode), NULL);
+ else if (parse_syscfg (self, response->str, &mode_a, &mode_b, &band, &u1, &u2, &mode))
+ mm_callback_info_set_result (info, GUINT_TO_POINTER (mode), NULL);
mm_callback_info_schedule (info);
}
static void
-get_network_mode (MMModemGsmNetwork *modem,
+get_allowed_mode (MMGenericGsm *gsm,
MMModemUIntFn callback,
gpointer user_data)
{
- MMModemHuaweiGsmPrivate *priv = MM_MODEM_HUAWEI_GSM_GET_PRIVATE (modem);
-
- if (priv->mode != MM_MODEM_GSM_MODE_ANY) {
- /* have cached mode (from an unsolicited message). Use that */
- MMCallbackInfo *info;
-
- info = mm_callback_info_uint_new (MM_MODEM (modem), callback, user_data);
- mm_callback_info_set_result (info, GUINT_TO_POINTER (priv->mode), NULL);
- mm_callback_info_schedule (info);
- } else {
- /* Get it from modem */
- MMCallbackInfo *info;
- MMAtSerialPort *primary;
+ MMCallbackInfo *info;
+ MMAtSerialPort *primary;
- info = mm_callback_info_uint_new (MM_MODEM (modem), callback, user_data);
- primary = mm_generic_gsm_get_at_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
- g_assert (primary);
- mm_at_serial_port_queue_command (primary, "AT^SYSCFG?", 3, get_network_mode_done, info);
- }
+ info = mm_callback_info_uint_new (MM_MODEM (gsm), callback, user_data);
+ primary = mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY);
+ g_assert (primary);
+ mm_at_serial_port_queue_command (primary, "AT^SYSCFG?", 3, get_allowed_mode_done, info);
}
static void
@@ -293,7 +260,7 @@ set_band_get_done (MMAtSerialPort *port,
int a, b, u1, u2;
guint32 band;
- if (parse_syscfg (self, response->str, &a, &b, &band, &u1, &u2)) {
+ if (parse_syscfg (self, response->str, &a, &b, &band, &u1, &u2, NULL)) {
char *command;
switch (GPOINTER_TO_UINT (mm_callback_info_get_data (info, "band"))) {
@@ -370,7 +337,7 @@ get_band_done (MMAtSerialPort *port,
if (error)
info->error = g_error_copy (error);
- else if (parse_syscfg (self, response->str, &mode_a, &mode_b, &band, &u1, &u2))
+ else if (parse_syscfg (self, response->str, &mode_a, &mode_b, &band, &u1, &u2, NULL))
mm_callback_info_set_result (info, GUINT_TO_POINTER (priv->band), NULL);
mm_callback_info_schedule (info);
@@ -459,7 +426,7 @@ handle_mode_change (MMAtSerialPort *port,
gpointer user_data)
{
MMModemHuaweiGsm *self = MM_MODEM_HUAWEI_GSM (user_data);
- MMModemHuaweiGsmPrivate *priv = MM_MODEM_HUAWEI_GSM_GET_PRIVATE (self);
+ MMModemGsmAccessTech act = MM_MODEM_GSM_ACCESS_TECH_UNKNOWN;
char *str;
int a;
int b;
@@ -472,25 +439,29 @@ handle_mode_change (MMAtSerialPort *port,
b = atoi (str);
g_free (str);
- if (a == 3 && b == 2)
- priv->mode = MM_MODEM_GSM_MODE_GPRS;
- else if (a == 3 && b == 3)
- priv->mode = MM_MODEM_GSM_MODE_EDGE;
- else if (a == 5 && b == 4)
- priv->mode = MM_MODEM_GSM_MODE_UMTS;
- else if (a == 5 && b == 5)
- priv->mode = MM_MODEM_GSM_MODE_HSDPA;
- else if (a == 5 && b == 6)
- priv->mode = MM_MODEM_GSM_MODE_HSUPA;
- else if (a == 5 && b == 7)
- priv->mode = MM_MODEM_GSM_MODE_HSPA;
- else {
+ if (a == 3) { /* GSM/GPRS mode */
+ if (b == 1)
+ act = MM_MODEM_GSM_ACCESS_TECH_GSM;
+ else if (b == 2)
+ act = MM_MODEM_GSM_ACCESS_TECH_GPRS;
+ else if (b == 3)
+ act = MM_MODEM_GSM_ACCESS_TECH_EDGE;
+ } else if (a == 5) { /* WCDMA mode */
+ if (b == 4)
+ act = MM_MODEM_GSM_ACCESS_TECH_UMTS;
+ else if (b == 5)
+ act = MM_MODEM_GSM_ACCESS_TECH_HSDPA;
+ else if (b == 6)
+ act = MM_MODEM_GSM_ACCESS_TECH_HSUPA;
+ else if (b == 7)
+ act = MM_MODEM_GSM_ACCESS_TECH_HSPA;
+ } else {
g_warning ("Couldn't parse mode change value: '%s'", str);
return;
}
- g_debug ("Mode: %d", priv->mode);
- mm_modem_gsm_network_mode (MM_MODEM_GSM_NETWORK (self), priv->mode);
+ g_debug ("Access Technology: %d", act);
+ mm_generic_gsm_update_access_technology (MM_GENERIC_GSM (self), act);
}
static void
@@ -556,28 +527,25 @@ grab_port (MMModem *modem,
port = mm_generic_gsm_grab_port (gsm, subsys, name, ptype, error);
if (port && MM_IS_AT_SERIAL_PORT (port)) {
- g_object_set (G_OBJECT (port), MM_PORT_CARRIER_DETECT, FALSE, NULL);
- if (ptype == MM_PORT_TYPE_SECONDARY) {
- GRegex *regex;
+ GRegex *regex;
- mm_generic_gsm_set_unsolicited_registration (MM_GENERIC_GSM (modem), TRUE);
+ g_object_set (G_OBJECT (port), MM_PORT_CARRIER_DETECT, FALSE, NULL);
- regex = g_regex_new ("\\r\\n\\^RSSI:(\\d+)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
- mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (port), regex, handle_signal_quality_change, modem, NULL);
- g_regex_unref (regex);
+ regex = g_regex_new ("\\r\\n\\^RSSI:(\\d+)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
+ mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (port), regex, handle_signal_quality_change, modem, NULL);
+ g_regex_unref (regex);
- regex = g_regex_new ("\\r\\n\\^MODE:(\\d),(\\d)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
- mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (port), regex, handle_mode_change, modem, NULL);
- g_regex_unref (regex);
+ regex = g_regex_new ("\\r\\n\\^MODE:(\\d),(\\d)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
+ mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (port), regex, handle_mode_change, modem, NULL);
+ g_regex_unref (regex);
- regex = g_regex_new ("\\r\\n\\^DSFLOWRPT:(.+)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
- mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (port), regex, handle_status_change, modem, NULL);
- g_regex_unref (regex);
+ regex = g_regex_new ("\\r\\n\\^DSFLOWRPT:(.+)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
+ mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (port), regex, handle_status_change, modem, NULL);
+ g_regex_unref (regex);
- regex = g_regex_new ("\\r\\n\\^BOOT:.+\\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, modem, NULL);
- g_regex_unref (regex);
- }
+ regex = g_regex_new ("\\r\\n\\^BOOT:.+\\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, modem, NULL);
+ g_regex_unref (regex);
}
out:
@@ -598,8 +566,6 @@ modem_init (MMModem *modem_class)
static void
modem_gsm_network_init (MMModemGsmNetwork *class)
{
- class->set_network_mode = set_network_mode;
- class->get_network_mode = get_network_mode;
class->set_band = set_band;
class->get_band = get_band;
class->get_signal_quality = get_signal_quality;
@@ -614,8 +580,12 @@ static void
mm_modem_huawei_gsm_class_init (MMModemHuaweiGsmClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ MMGenericGsmClass *gsm_class = MM_GENERIC_GSM_CLASS (klass);
mm_modem_huawei_gsm_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (object_class, sizeof (MMModemHuaweiGsmPrivate));
+
+ gsm_class->set_allowed_mode = set_allowed_mode;
+ gsm_class->get_allowed_mode = get_allowed_mode;
}
diff --git a/plugins/mm-modem-mbm.c b/plugins/mm-modem-mbm.c
index a6231325..f0e764aa 100644
--- a/plugins/mm-modem-mbm.c
+++ b/plugins/mm-modem-mbm.c
@@ -1,11 +1,13 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
- * Copyright (C) 2008 Ericsson AB
+ * Copyright (C) 2008 - 2010 Ericsson AB
+ * Copyright (C) 2009 - 2010 Red Hat, Inc.
*
* Author: Per Hallsmark <per.hallsmark@ericsson.com>
* Bjorn Runaker <bjorn.runaker@ericsson.com>
* Torgny Johansson <torgny.johansson@ericsson.com>
* Jonas Sjöquist <jonas.sjoquist@ericsson.com>
+ * Dan Williams <dcbw@redhat.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -163,21 +165,16 @@ do_register (MMModemGsmNetwork *modem,
}
static int
-mbm_parse_network_mode (MMModemGsmMode network_mode)
+mbm_parse_allowed_mode (MMModemGsmAllowedMode network_mode)
{
switch (network_mode) {
- case MM_MODEM_GSM_MODE_ANY:
- case MM_MODEM_GSM_MODE_3G_PREFERRED:
- case MM_MODEM_GSM_MODE_2G_PREFERRED:
+ case MM_MODEM_GSM_ALLOWED_MODE_ANY:
+ case MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED:
+ case MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED:
return MBM_NETWORK_MODE_ANY;
- case MM_MODEM_GSM_MODE_GPRS:
- case MM_MODEM_GSM_MODE_EDGE:
- case MM_MODEM_GSM_MODE_2G_ONLY:
+ case MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY:
return MBM_NETWORK_MODE_2G;
- case MM_MODEM_GSM_MODE_3G_ONLY:
- case MM_MODEM_GSM_MODE_HSDPA:
- case MM_MODEM_GSM_MODE_HSUPA:
- case MM_MODEM_GSM_MODE_HSPA:
+ case MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY:
return MBM_NETWORK_MODE_3G;
default:
return MBM_NETWORK_MODE_ANY;
@@ -185,7 +182,7 @@ mbm_parse_network_mode (MMModemGsmMode network_mode)
}
static void
-mbm_set_network_mode_done (MMAtSerialPort *port,
+mbm_set_allowed_mode_done (MMAtSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
@@ -199,8 +196,8 @@ mbm_set_network_mode_done (MMAtSerialPort *port,
}
static void
-set_network_mode (MMModemGsmNetwork *modem,
- MMModemGsmMode mode,
+set_allowed_mode (MMGenericGsm *gsm,
+ MMModemGsmAllowedMode mode,
MMModemFn callback,
gpointer user_data)
{
@@ -208,15 +205,16 @@ set_network_mode (MMModemGsmNetwork *modem,
char *command;
MMAtSerialPort *primary;
- info = mm_callback_info_new (MM_MODEM (modem), callback, user_data);
- primary = mm_generic_gsm_get_at_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
+ info = mm_callback_info_new (MM_MODEM (gsm), callback, user_data);
+ primary = mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY);
g_assert (primary);
- command = g_strdup_printf ("+CFUN=%d", mbm_parse_network_mode (mode));
- mm_at_serial_port_queue_command (primary, command, 3, mbm_set_network_mode_done, info);
+ command = g_strdup_printf ("+CFUN=%d", mbm_parse_allowed_mode (mode));
+ mm_at_serial_port_queue_command (primary, command, 3, mbm_set_allowed_mode_done, info);
g_free (command);
}
+#if 0
static void
get_network_mode_done (MMAtSerialPort *port,
GString *response,
@@ -266,19 +264,52 @@ done:
mm_callback_info_schedule (info);
}
+#endif
+
+static void
+get_allowed_mode_done (MMAtSerialPort *port,
+ GString *response,
+ 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, "CFUN: ")) {
+ MMModemGsmAllowedMode mode = MM_MODEM_GSM_ALLOWED_MODE_ANY;
+ int a;
+
+ a = atoi (response->str + 6);
+ if (a == MBM_NETWORK_MODE_2G)
+ mode = MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY;
+ else if (a == MBM_NETWORK_MODE_3G)
+ mode = MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY;
+
+ 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 allowed mode results");
+
+ mm_callback_info_schedule (info);
+}
static void
-get_network_mode (MMModemGsmNetwork *modem,
+get_allowed_mode (MMGenericGsm *gsm,
MMModemUIntFn callback,
gpointer user_data)
{
MMCallbackInfo *info;
MMAtSerialPort *primary;
- info = mm_callback_info_uint_new (MM_MODEM (modem), callback, user_data);
- primary = mm_generic_gsm_get_at_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
+ info = mm_callback_info_uint_new (MM_MODEM (gsm), callback, user_data);
+ primary = mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY);
g_assert (primary);
- mm_at_serial_port_queue_command (primary, "*ERINFO?", 3, get_network_mode_done, info);
+ mm_at_serial_port_queue_command (primary, "CFUN?", 3, get_allowed_mode_done, info);
}
/*****************************************************************************/
@@ -300,7 +331,22 @@ simple_connect (MMModemSimple *simple,
priv->password = mbm_simple_get_string_property (properties, "password", &info->error);
network_mode = mbm_simple_get_uint_property (properties, "network_mode", &info->error);
- priv->network_mode = mbm_parse_network_mode (network_mode);
+ switch (network_mode) {
+ case MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_ANY:
+ case MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_3G_PREFERRED:
+ case MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_2G_PREFERRED:
+ priv->network_mode = MBM_NETWORK_MODE_ANY;
+ break;
+ case MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_2G_ONLY:
+ priv->network_mode = MBM_NETWORK_MODE_2G;
+ break;
+ case MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_3G_ONLY:
+ priv->network_mode = MBM_NETWORK_MODE_3G;
+ break;
+ default:
+ priv->network_mode = MBM_NETWORK_MODE_ANY;
+ break;
+ }
parent_iface = g_type_interface_peek_parent (MM_MODEM_SIMPLE_GET_INTERFACE (simple));
parent_iface->connect (MM_MODEM_SIMPLE (simple), properties, callback, info);
@@ -521,14 +567,23 @@ mbm_ciev_received (MMAtSerialPort *port,
}
static void
-mbm_do_connect_done (MMModemMbm *self)
+mbm_do_connect_done (MMModemMbm *self, gboolean success)
{
MMModemMbmPrivate *priv = MM_MODEM_MBM_GET_PRIVATE (self);
- if (priv->pending_connect_info) {
+ if (!priv->pending_connect_info)
+ return;
+
+ if (success)
mm_generic_gsm_connect_complete (MM_GENERIC_GSM (self), NULL, priv->pending_connect_info);
- priv->pending_connect_info = NULL;
+ else {
+ GError *connect_error;
+
+ connect_error = mm_modem_connect_error_for_code (MM_MODEM_CONNECT_ERROR_BUSY);
+ mm_generic_gsm_connect_complete (MM_GENERIC_GSM (self), connect_error, priv->pending_connect_info);
+ g_error_free (connect_error);
}
+ priv->pending_connect_info = NULL;
}
static void
@@ -543,17 +598,18 @@ mbm_e2nap_received (MMAtSerialPort *port,
if (str)
state = atoi (str);
- if (MBM_E2NAP_DISCONNECTED == state)
- g_debug ("%s, disconnected", __func__);
- else if (MBM_E2NAP_CONNECTED == state) {
- g_debug ("%s, connected", __func__);
- mbm_do_connect_done (MM_MODEM_MBM (user_data));
+ if (MBM_E2NAP_DISCONNECTED == state) {
+ g_debug ("%s: disconnected", __func__);
+ mbm_do_connect_done (MM_MODEM_MBM (user_data), FALSE);
+ } else if (MBM_E2NAP_CONNECTED == state) {
+ g_debug ("%s: connected", __func__);
+ mbm_do_connect_done (MM_MODEM_MBM (user_data), TRUE);
} else if (MBM_E2NAP_CONNECTING == state)
- g_debug("%s, connecting", __func__);
+ g_debug("%s: connecting", __func__);
else {
/* Should not happen */
- g_debug("%s, undefined e2nap status",__FUNCTION__);
- g_assert_not_reached ();
+ g_debug("%s: unhandled E2NAP state %d", __func__, state);
+ mbm_do_connect_done (MM_MODEM_MBM (user_data), FALSE);
}
}
@@ -620,7 +676,6 @@ enap_done (MMAtSerialPort *port,
tid = g_timeout_add_seconds (1, enap_poll, user_data);
/* remember poll id as callback info object, with source_remove as free func */
mm_callback_info_set_data (info, "mbm-enap-poll-id", GUINT_TO_POINTER (tid), (GFreeFunc) g_source_remove);
- mm_at_serial_port_queue_command (port, "AT*E2NAP=1", 3, NULL, NULL);
}
static void
@@ -640,6 +695,9 @@ mbm_auth_done (MMAtSerialPort *port,
}
cid = mm_generic_gsm_get_cid (modem);
+
+ mm_at_serial_port_queue_command (port, "AT*E2NAP=1", 3, NULL, NULL);
+
command = g_strdup_printf ("AT*ENAP=1,%d", cid);
mm_at_serial_port_queue_command (port, command, 3, enap_done, user_data);
g_free (command);
@@ -736,8 +794,6 @@ grab_port (MMModem *modem,
if (port && MM_IS_AT_SERIAL_PORT (port) && (ptype == MM_PORT_TYPE_PRIMARY)) {
GRegex *regex;
- mm_generic_gsm_set_unsolicited_registration (MM_GENERIC_GSM (modem), TRUE);
-
regex = g_regex_new ("\\r\\n\\*EMRDY: \\d\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (port), regex, mbm_emrdy_received, modem, NULL);
g_regex_unref (regex);
@@ -773,8 +829,6 @@ static void
modem_gsm_network_init (MMModemGsmNetwork *class)
{
class->do_register = do_register;
- class->get_network_mode = get_network_mode;
- class->set_network_mode = set_network_mode;
}
static void
@@ -823,5 +877,7 @@ mm_modem_mbm_class_init (MMModemMbmClass *klass)
object_class->finalize = finalize;
gsm_class->do_enable = do_enable;
+ gsm_class->get_allowed_mode = get_allowed_mode;
+ gsm_class->set_allowed_mode = set_allowed_mode;
}
diff --git a/plugins/mm-modem-novatel-gsm.c b/plugins/mm-modem-novatel-gsm.c
index 98d39d15..61f933ac 100644
--- a/plugins/mm-modem-novatel-gsm.c
+++ b/plugins/mm-modem-novatel-gsm.c
@@ -49,78 +49,6 @@ mm_modem_novatel_gsm_new (const char *device,
/*****************************************************************************/
static void
-init_modem_done (MMAtSerialPort *port,
- GString *response,
- GError *error,
- gpointer user_data)
-{
- MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-
- mm_generic_gsm_enable_complete (MM_GENERIC_GSM (info->modem), error, info);
-}
-
-static void
-pin_check_done (MMModem *modem, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = (MMCallbackInfo *) user_data;
- MMGenericGsm *self = MM_GENERIC_GSM (modem);
- MMAtSerialPort *primary;
-
- if (error) {
- mm_generic_gsm_enable_complete (self, error, info);
- return;
- }
-
- /* Finish the initialization */
- primary = mm_generic_gsm_get_at_port (self, MM_PORT_TYPE_PRIMARY);
- g_assert (primary);
- mm_at_serial_port_queue_command (primary, "Z E0 V1 X4 &C1 +CMEE=1;+CFUN=1", 10, init_modem_done, info);
-}
-
-static void
-pre_init_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 (info->modem), error, info);
- return;
- }
-
- /* Now check the PIN explicitly, novatel doesn't seem to report
- * that it needs it otherwise.
- */
- mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
-}
-
-static void
-enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = user_data;
-
- if (error)
- mm_generic_gsm_enable_complete (MM_GENERIC_GSM (info->modem), error, info);
- else
- mm_at_serial_port_queue_command (MM_AT_SERIAL_PORT (port), "E0 V1", 3, pre_init_done, user_data);
-}
-
-static void
-do_enable (MMGenericGsm *modem, MMModemFn callback, gpointer user_data)
-{
- MMCallbackInfo *info;
- MMAtSerialPort *primary;
-
- primary = mm_generic_gsm_get_at_port (modem, MM_PORT_TYPE_PRIMARY);
- g_assert (primary);
-
- info = mm_callback_info_new (MM_MODEM (modem), callback, user_data);
- mm_serial_port_flash (MM_SERIAL_PORT (primary), 100, enable_flash_done, info);
-}
-
-static void
dmat_callback (MMAtSerialPort *port,
GString *response,
GError *error,
@@ -175,10 +103,6 @@ mm_modem_novatel_gsm_init (MMModemNovatelGsm *self)
static void
mm_modem_novatel_gsm_class_init (MMModemNovatelGsmClass *klass)
{
- MMGenericGsmClass *gsm_class = MM_GENERIC_GSM_CLASS (klass);
-
mm_modem_novatel_gsm_parent_class = g_type_class_peek_parent (klass);
-
- gsm_class->do_enable = do_enable;
}
diff --git a/plugins/mm-modem-option.c b/plugins/mm-modem-option.c
index 02285529..42cd927c 100644
--- a/plugins/mm-modem-option.c
+++ b/plugins/mm-modem-option.c
@@ -22,13 +22,13 @@
#include "mm-errors.h"
#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 (MMModemOption, mm_modem_option, MM_TYPE_GENERIC_GSM)
-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))
+#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,
@@ -48,57 +48,46 @@ mm_modem_option_new (const char *device,
/*****************************************************************************/
-static void
-pin_check_done (MMModem *modem, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-
- mm_generic_gsm_enable_complete (MM_GENERIC_GSM (modem), error, info);
-}
-
static gboolean
-option_enabled (gpointer data)
+option_enabled (gpointer user_data)
{
- MMCallbackInfo *info = (MMCallbackInfo *) data;
-
- /* 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);
+ MMCallbackInfo *info = user_data;
+ MMGenericGsm *modem;
+ MMModemOptionPrivate *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_OPTION_GET_PRIVATE (modem);
+ priv->enable_wait_id = 0;
+ 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);
-}
-
-static void
-enable (MMModem *modem,
- MMModemFn callback,
- gpointer user_data)
-{
- MMModem *parent_modem_iface;
- 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);
+ g_warn_if_fail (priv->enable_wait_id == 0);
+ priv->enable_wait_id = g_timeout_add_seconds (10, option_enabled, info);
}
static void
-get_network_mode_done (MMAtSerialPort *port,
+get_allowed_mode_done (MMAtSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
@@ -112,20 +101,20 @@ get_network_mode_done (MMAtSerialPort *port,
int a, b;
if (sscanf (response->str + 8, "%d,%d", &a, &b)) {
- MMModemGsmMode mode = MM_MODEM_GSM_MODE_ANY;
+ MMModemGsmAllowedMode mode = MM_MODEM_GSM_ALLOWED_MODE_ANY;
switch (a) {
case 0:
- mode = MM_MODEM_GSM_MODE_2G_ONLY;
+ mode = MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY;
break;
case 1:
- mode = MM_MODEM_GSM_MODE_3G_ONLY;
+ mode = MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY;
break;
case 2:
- mode = MM_MODEM_GSM_MODE_2G_PREFERRED;
+ mode = MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED;
break;
case 3:
- mode = MM_MODEM_GSM_MODE_3G_PREFERRED;
+ mode = MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED;
break;
default:
break;
@@ -138,27 +127,27 @@ get_network_mode_done (MMAtSerialPort *port,
if (!error && !parsed)
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
- "Could not parse network mode results");
+ "Could not parse allowed mode results");
mm_callback_info_schedule (info);
}
static void
-get_network_mode (MMModemGsmNetwork *modem,
+get_allowed_mode (MMGenericGsm *gsm,
MMModemUIntFn callback,
gpointer user_data)
{
MMCallbackInfo *info;
MMAtSerialPort *primary;
- info = mm_callback_info_uint_new (MM_MODEM (modem), callback, user_data);
- primary = mm_generic_gsm_get_at_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
+ info = mm_callback_info_uint_new (MM_MODEM (gsm), callback, user_data);
+ primary = mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY);
g_assert (primary);
- mm_at_serial_port_queue_command (primary, "AT_OPSYS?", 3, get_network_mode_done, info);
+ mm_at_serial_port_queue_command (primary, "AT_OPSYS?", 3, get_allowed_mode_done, info);
}
static void
-set_network_mode_done (MMAtSerialPort *port,
+set_allowed_mode_done (MMAtSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
@@ -167,13 +156,13 @@ set_network_mode_done (MMAtSerialPort *port,
if (error)
info->error = g_error_copy (error);
-
+
mm_callback_info_schedule (info);
}
static void
-set_network_mode (MMModemGsmNetwork *modem,
- MMModemGsmMode mode,
+set_allowed_mode (MMGenericGsm *gsm,
+ MMModemGsmAllowedMode mode,
MMModemFn callback,
gpointer user_data)
{
@@ -182,63 +171,62 @@ set_network_mode (MMModemGsmNetwork *modem,
char *command;
int i;
- info = mm_callback_info_new (MM_MODEM (modem), callback, user_data);
+ info = mm_callback_info_new (MM_MODEM (gsm), 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:
+ case MM_MODEM_GSM_ALLOWED_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:
+ case MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY:
i = 1;
break;
- case MM_MODEM_GSM_MODE_2G_PREFERRED:
+ case MM_MODEM_GSM_ALLOWED_MODE_2G_PREFERRED:
i = 2;
break;
- case MM_MODEM_GSM_MODE_3G_PREFERRED:
+ case MM_MODEM_GSM_ALLOWED_MODE_3G_PREFERRED:
i = 3;
break;
+ case MM_MODEM_GSM_ALLOWED_MODE_ANY:
default:
i = 5;
break;
}
command = g_strdup_printf ("AT_OPSYS=%d,2", i);
- primary = mm_generic_gsm_get_at_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
+ primary = mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY);
g_assert (primary);
- mm_at_serial_port_queue_command (primary, command, 3, set_network_mode_done, info);
+ mm_at_serial_port_queue_command (primary, command, 3, set_allowed_mode_done, info);
g_free (command);
}
/*****************************************************************************/
static void
-modem_init (MMModem *modem_class)
+mm_modem_option_init (MMModemOption *self)
{
- modem_class->enable = enable;
}
static void
-modem_gsm_network_init (MMModemGsmNetwork *class)
+dispose (GObject *object)
{
- class->set_network_mode = set_network_mode;
- class->get_network_mode = get_network_mode;
-}
+ MMModemOptionPrivate *priv = MM_MODEM_OPTION_GET_PRIVATE (object);
-static void
-mm_modem_option_init (MMModemOption *self)
-{
+ 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;
}
diff --git a/plugins/mm-modem-sierra-gsm.c b/plugins/mm-modem-sierra-gsm.c
index 7ba6293a..02be144f 100644
--- a/plugins/mm-modem-sierra-gsm.c
+++ b/plugins/mm-modem-sierra-gsm.c
@@ -27,6 +27,11 @@ 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,
@@ -48,51 +53,42 @@ mm_modem_sierra_gsm_new (const char *device,
/* Modem class override functions */
/*****************************************************************************/
-static void
-pin_check_done (MMModem *modem, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-
- mm_generic_gsm_enable_complete (MM_GENERIC_GSM (modem), error, info);
-}
-
static gboolean
-sierra_enabled (gpointer data)
+sierra_enabled (gpointer user_data)
{
- MMCallbackInfo *info = (MMCallbackInfo *) data;
-
- /* 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);
+ 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
-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;
+ MMModemSierraGsmPrivate *priv = MM_MODEM_SIERRA_GSM_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_sierra_gsm_parent_class)->do_enable_power_up_done (gsm, NULL, error, info);
return;
}
- /* Sierra returns OK on +CFUN=1 right away but needs some time
+ /* Some Sierra devices return OK on +CFUN=1 right away but need some time
* to finish initialization.
*/
- g_timeout_add_seconds (10, sierra_enabled, info);
-}
-
-static void
-enable (MMModem *modem, MMModemFn callback, gpointer user_data)
-{
- MMModem *parent_modem_iface;
- 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);
+ g_warn_if_fail (priv->enable_wait_id == 0);
+ priv->enable_wait_id = g_timeout_add_seconds (10, sierra_enabled, info);
}
static gboolean
@@ -135,7 +131,6 @@ grab_port (MMModem *modem,
static void
modem_init (MMModem *modem_class)
{
- modem_class->enable = enable;
modem_class->grab_port = grab_port;
}
@@ -145,8 +140,24 @@ 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;
}
diff --git a/plugins/mm-modem-zte.c b/plugins/mm-modem-zte.c
index fcd97f27..d4418000 100644
--- a/plugins/mm-modem-zte.c
+++ b/plugins/mm-modem-zte.c
@@ -118,23 +118,6 @@ init_modem_done (MMAtSerialPort *port,
mm_at_serial_port_queue_command (port, "+CPMS?", 10, cpms_try_done, info);
}
-static void
-pin_check_done (MMModem *modem, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = (MMCallbackInfo *) user_data;
- MMAtSerialPort *primary;
-
- if (error) {
- mm_generic_gsm_enable_complete (MM_GENERIC_GSM (modem), error, info);
- return;
- }
-
- /* Finish the initialization */
- primary = mm_generic_gsm_get_at_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
- g_assert (primary);
- mm_at_serial_port_queue_command (primary, "Z E0 V1 X4 &C1 +CMEE=1;+CFUN=1;", 10, init_modem_done, info);
-}
-
static void enable_flash_done (MMSerialPort *port,
GError *error,
gpointer user_data);
@@ -157,9 +140,8 @@ pre_init_done (MMAtSerialPort *port,
} else
mm_generic_gsm_enable_complete (MM_GENERIC_GSM (info->modem), error, info);
} else {
- /* Now check the PIN explicitly, zte doesn't seem to report
- that it needs it otherwise */
- mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
+ /* Finish the initialization */
+ mm_at_serial_port_queue_command (port, "Z E0 V1 X4 &C1 +CMEE=1;+CFUN=1;", 10, init_modem_done, info);
}
}
@@ -229,7 +211,6 @@ grab_port (MMModem *modem,
if (port && MM_IS_AT_SERIAL_PORT (port)) {
GRegex *regex;
- mm_generic_gsm_set_unsolicited_registration (gsm, TRUE);
g_object_set (port, MM_PORT_CARRIER_DETECT, FALSE, NULL);
regex = g_regex_new ("\\r\\n\\+ZUSIMR:(.*)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
diff --git a/plugins/mm-plugin-huawei.c b/plugins/mm-plugin-huawei.c
index 51d171f6..bee7d40f 100644
--- a/plugins/mm-plugin-huawei.c
+++ b/plugins/mm-plugin-huawei.c
@@ -284,16 +284,9 @@ grab_port (MMPluginBase *base,
caps = mm_plugin_base_supports_task_get_probed_capabilities (task);
if (!existing) {
if (caps & MM_PLUGIN_BASE_PORT_CAP_GSM) {
- if (product == 0x1001) {
- /* This modem is handled by generic GSM driver */
- modem = mm_generic_gsm_new (sysfs_path,
- mm_plugin_base_supports_task_get_driver (task),
- mm_plugin_get_name (MM_PLUGIN (base)));
- } else {
- modem = mm_modem_huawei_gsm_new (sysfs_path,
- mm_plugin_base_supports_task_get_driver (task),
- mm_plugin_get_name (MM_PLUGIN (base)));
- }
+ modem = mm_modem_huawei_gsm_new (sysfs_path,
+ mm_plugin_base_supports_task_get_driver (task),
+ mm_plugin_get_name (MM_PLUGIN (base)));
} else if (caps & CAP_CDMA) {
modem = mm_modem_huawei_cdma_new (sysfs_path,
mm_plugin_base_supports_task_get_driver (task),
@@ -313,7 +306,7 @@ grab_port (MMPluginBase *base,
MMPortType ptype = MM_PORT_TYPE_UNKNOWN;
info = g_object_get_data (G_OBJECT (task), TAG_SUPPORTS_INFO);
- if (info && info->secondary && (product != 0x1001))
+ if (info && info->secondary)
ptype = MM_PORT_TYPE_SECONDARY;
modem = existing;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-10 05:34:37 +0000