diff options
Diffstat (limited to 'plugins/mm-modem-option.c')
| -rw-r--r-- | plugins/mm-modem-option.c | 142 |
1 files changed, 65 insertions, 77 deletions
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; } |