aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mm-modem-hso.c52
-rw-r--r--plugins/mm-modem-mbm.c79
-rw-r--r--plugins/mm-modem-novatel-gsm.c44
-rw-r--r--plugins/mm-modem-option.c13
-rw-r--r--plugins/mm-modem-sierra.c62
-rw-r--r--plugins/mm-modem-zte.c44
6 files changed, 82 insertions, 212 deletions
diff --git a/plugins/mm-modem-hso.c b/plugins/mm-modem-hso.c
index f1132d43..be39529c 100644
--- a/plugins/mm-modem-hso.c
+++ b/plugins/mm-modem-hso.c
@@ -234,7 +234,7 @@ mm_hso_modem_authenticate (MMModemHso *self,
/*****************************************************************************/
static void
-pin_check_done (MMModem *modem, GError *error, gpointer user_data)
+generic_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
@@ -251,49 +251,56 @@ parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
if (error) {
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
- } else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "enable")) == FALSE) {
- /* Disable, we're done */
- mm_callback_info_schedule (info);
} else {
/* HSO needs manual PIN checking */
- mm_generic_gsm_check_pin (MM_GENERIC_GSM (modem), pin_check_done, info);
+ mm_generic_gsm_check_pin (MM_GENERIC_GSM (modem), generic_done, info);
}
}
static void
-modem_enable_done (MMSerialPort *port,
- GString *response,
- GError *error,
- gpointer user_data)
+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
+disable_done (MMSerialPort *port,
+ GString *response,
+ GError *error,
+ gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
MMModem *parent_modem_iface;
+ /* Do the normal disable stuff */
parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (info->modem));
- parent_modem_iface->enable (info->modem,
- GPOINTER_TO_INT (mm_callback_info_get_data (info, "enable")),
- parent_enable_done, info);
+ parent_modem_iface->enable (info->modem, generic_done, info);
}
static void
-enable (MMModem *modem,
- gboolean do_enable,
- MMModemFn callback,
- gpointer user_data)
+disable (MMModem *modem,
+ MMModemFn callback,
+ gpointer user_data)
{
MMCallbackInfo *info;
MMSerialPort *primary;
+ mm_generic_gsm_set_cid (MM_GENERIC_GSM (modem), 0);
+ mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem));
+
info = mm_callback_info_new (modem, callback, user_data);
- mm_callback_info_set_data (info, "enable", GINT_TO_POINTER (enable), NULL);
+ /* Kill any existing connection */
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary);
-
- if (do_enable)
- modem_enable_done (primary, NULL, NULL, info);
- else
- mm_serial_port_queue_command (primary, "AT_OWANCALL=1,0,0", 3, modem_enable_done, info);
+ mm_serial_port_queue_command (primary, "AT_OWANCALL=1,0,0", 3, disable_done, info);
}
static void
@@ -650,6 +657,7 @@ 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;
modem_class->disconnect = disconnect;
diff --git a/plugins/mm-modem-mbm.c b/plugins/mm-modem-mbm.c
index c352ecbe..fab56e0e 100644
--- a/plugins/mm-modem-mbm.c
+++ b/plugins/mm-modem-mbm.c
@@ -402,82 +402,64 @@ mbm_emrdy_done (MMSerialPort *port,
}
static void
-enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
+enable (MMModem *modem,
+ MMModemFn callback,
+ gpointer user_data)
{
- MMCallbackInfo *info = user_data;
- MMModemMbmPrivate *priv = MM_MODEM_MBM_GET_PRIVATE (info->modem);
+ MMModemMbmPrivate *priv = MM_MODEM_MBM_GET_PRIVATE (modem);
+ MMCallbackInfo *info;
+ MMSerialPort *primary;
- if (error) {
- info->error = g_error_copy (error);
+ mm_generic_gsm_set_cid (MM_GENERIC_GSM (modem), 0);
+
+ info = mm_callback_info_new (modem, callback, user_data);
+
+ primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
+ g_assert (primary);
+
+ if (!mm_serial_port_open (primary, &info->error)) {
+ g_assert (info->error);
mm_callback_info_schedule (info);
return;
}
if (priv->have_emrdy) {
/* Modem is ready, no need to check EMRDY */
- do_init (port, info);
+ do_init (primary, info);
} else
- mm_serial_port_queue_command (port, "*EMRDY?", 5, mbm_emrdy_done, info);
-}
-
-static void
-disable_done (MMSerialPort *port,
- GString *response,
- GError *error,
- gpointer user_data)
-{
- MMCallbackInfo *info = user_data;
-
- mm_serial_port_close (port);
- mm_callback_info_schedule (info);
+ mm_serial_port_queue_command (primary, "*EMRDY?", 5, mbm_emrdy_done, info);
}
static void
-disable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
+parent_disable_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
- if (error) {
+ if (error)
info->error = g_error_copy (error);
- mm_callback_info_schedule (info);
- return;
- }
-
- mm_serial_port_queue_command (port, "+CMER=0", 5, disable_done, user_data);
+ mm_callback_info_schedule (info);
}
static void
-enable (MMModem *modem,
- gboolean do_enable,
- MMModemFn callback,
- gpointer user_data)
+disable (MMModem *modem,
+ MMModemFn callback,
+ gpointer user_data)
{
+ MMModem *parent_modem_iface;
MMCallbackInfo *info;
MMSerialPort *primary;
- mm_generic_gsm_set_cid (MM_GENERIC_GSM (modem), 0);
-
info = mm_callback_info_new (modem, callback, user_data);
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary);
- if (do_enable) {
- if (!mm_serial_port_open (primary, &info->error)) {
- g_assert (info->error);
- mm_callback_info_schedule (info);
- return;
- }
+ /* Random stuff that mbm apparently wants. Are these really needed? */
+ mm_serial_port_queue_command (primary, "+CREG=0", 5, NULL, NULL);
+ mm_serial_port_queue_command (primary, "+CMER=0", 5, NULL, NULL);
- mm_serial_port_flash (primary, 100, enable_flash_done, info);
- } else {
- mm_serial_port_queue_command (primary, "+CREG=0", 100, NULL, NULL);
- mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem));
- if (mm_port_get_connected (MM_PORT (primary)))
- mm_serial_port_flash (primary, 1000, disable_flash_done, info);
- else
- disable_flash_done (primary, NULL, info);
- }
+ parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (modem));
+ parent_modem_iface->enable (modem, parent_disable_done, info);
}
static void
@@ -596,7 +578,7 @@ e2nap_done (MMSerialPort *port,
mm_callback_info_schedule (info);
} else {
guint32 cid = mm_generic_gsm_get_cid (MM_GENERIC_GSM (info->modem));
- command = g_strdup_printf ("AT*ENAP=1,%d",cid);
+ command = g_strdup_printf ("AT*ENAP=1,%d", cid);
mm_serial_port_queue_command (port, command, 3, NULL, NULL);
g_free (command);
}
@@ -761,6 +743,7 @@ modem_init (MMModem *modem_class)
{
modem_class->grab_port = grab_port;
modem_class->enable = enable;
+ modem_class->disable = disable;
modem_class->connect = do_connect;
modem_class->disconnect = disconnect;
}
diff --git a/plugins/mm-modem-novatel-gsm.c b/plugins/mm-modem-novatel-gsm.c
index c2533a1d..ddc63393 100644
--- a/plugins/mm-modem-novatel-gsm.c
+++ b/plugins/mm-modem-novatel-gsm.c
@@ -108,32 +108,7 @@ enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
}
static void
-disable_done (MMSerialPort *port,
- GString *response,
- GError *error,
- gpointer user_data)
-{
- mm_serial_port_close (port);
- mm_callback_info_schedule ((MMCallbackInfo *) user_data);
-}
-
-static void
-disable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = user_data;
-
- if (error) {
- info->error = g_error_copy (error);
- mm_callback_info_schedule (info);
- return;
- }
-
- mm_serial_port_queue_command (port, "+CFUN=0", 5, disable_done, user_data);
-}
-
-static void
enable (MMModem *modem,
- gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
@@ -148,20 +123,13 @@ enable (MMModem *modem,
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary);
- if (!do_enable) {
- if (mm_port_get_connected (MM_PORT (primary)))
- mm_serial_port_flash (primary, 1000, disable_flash_done, info);
- else
- disable_flash_done (primary, NULL, info);
- } else {
- if (!mm_serial_port_open (primary, &info->error)) {
- g_assert (info->error);
- mm_callback_info_schedule (info);
- return;
- }
-
- mm_serial_port_flash (primary, 100, enable_flash_done, info);
+ if (!mm_serial_port_open (primary, &info->error)) {
+ g_assert (info->error);
+ mm_callback_info_schedule (info);
+ return;
}
+
+ mm_serial_port_flash (primary, 100, enable_flash_done, info);
}
static void
diff --git a/plugins/mm-modem-option.c b/plugins/mm-modem-option.c
index b325aec9..8cbb6e04 100644
--- a/plugins/mm-modem-option.c
+++ b/plugins/mm-modem-option.c
@@ -69,21 +69,18 @@ parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
- if (error)
+ if (error) {
info->error = g_error_copy (error);
- else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "option-enable"))) {
+ mm_callback_info_schedule (info);
+ } else {
/* Option returns OK on +CFUN=1 right away but needs some time
to finish initialization */
g_timeout_add_seconds (10, option_enabled, info);
- return;
}
-
- mm_callback_info_schedule (info);
}
static void
enable (MMModem *modem,
- gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
@@ -91,10 +88,8 @@ enable (MMModem *modem,
MMCallbackInfo *info;
info = mm_callback_info_new (modem, callback, user_data);
- mm_callback_info_set_data (info, "option-enable", GINT_TO_POINTER (do_enable), NULL);
-
parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (modem));
- parent_modem_iface->enable (modem, do_enable, parent_enable_done, info);
+ parent_modem_iface->enable (modem, parent_enable_done, info);
}
static void
diff --git a/plugins/mm-modem-sierra.c b/plugins/mm-modem-sierra.c
index ed9b887b..aec1668e 100644
--- a/plugins/mm-modem-sierra.c
+++ b/plugins/mm-modem-sierra.c
@@ -67,83 +67,31 @@ sierra_enabled (gpointer data)
}
static void
-init_done (MMSerialPort *port,
- GString *response,
- GError *error,
- gpointer user_data)
+parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
if (error) {
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
- } else
+ } else {
/* Sierra returns OK on +CFUN=1 right away but needs some time
to finish initialization */
g_timeout_add_seconds (10, sierra_enabled, info);
-}
-
-static void
-enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = user_data;
-
- if (error) {
- info->error = g_error_copy (error);
- mm_callback_info_schedule (info);
- return;
- }
-
- mm_serial_port_queue_command (port, "Z E0 V1 X4 &C1 +CMEE=1", 3, init_done, user_data);
-}
-
-static void
-disable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = user_data;
-
- if (error) {
- info->error = g_error_copy (error);
- mm_callback_info_schedule (info);
- return;
}
-
- mm_serial_port_close (port);
- mm_callback_info_schedule (info);
}
static void
enable (MMModem *modem,
- gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
+ MMModem *parent_modem_iface;
MMCallbackInfo *info;
- MMSerialPort *primary;
-
- /* First, reset the previously used CID */
- mm_generic_gsm_set_cid (MM_GENERIC_GSM (modem), 0);
info = mm_callback_info_new (modem, callback, user_data);
- mm_callback_info_set_data (info, "sierra-enable", GINT_TO_POINTER (do_enable), NULL);
-
- primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
- g_assert (primary);
-
- if (!do_enable) {
- if (mm_port_get_connected (MM_PORT (primary)))
- mm_serial_port_flash (primary, 1000, disable_flash_done, info);
- else
- disable_flash_done (primary, NULL, info);
- } else {
- if (!mm_serial_port_open (primary, &info->error)) {
- g_assert (info->error);
- mm_callback_info_schedule (info);
- return;
- }
-
- mm_serial_port_flash (primary, 100, enable_flash_done, info);
- }
+ parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (modem));
+ parent_modem_iface->enable (modem, parent_enable_done, info);
}
static gboolean
diff --git a/plugins/mm-modem-zte.c b/plugins/mm-modem-zte.c
index 51e6e485..f71ecadc 100644
--- a/plugins/mm-modem-zte.c
+++ b/plugins/mm-modem-zte.c
@@ -109,32 +109,7 @@ enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
}
static void
-disable_done (MMSerialPort *port,
- GString *response,
- GError *error,
- gpointer user_data)
-{
- mm_serial_port_close (port);
- mm_callback_info_schedule ((MMCallbackInfo *) user_data);
-}
-
-static void
-disable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
-{
- MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-
- if (error) {
- info->error = g_error_copy (error);
- mm_callback_info_schedule (info);
- return;
- }
-
- mm_serial_port_queue_command (port, "+CFUN=0", 5, disable_done, user_data);
-}
-
-static void
enable (MMModem *modem,
- gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
@@ -149,20 +124,13 @@ enable (MMModem *modem,
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary);
- if (!do_enable) {
- if (mm_port_get_connected (MM_PORT (primary)))
- mm_serial_port_flash (primary, 1000, disable_flash_done, info);
- else
- disable_flash_done (primary, NULL, info);
- } else {
- if (!mm_serial_port_open (primary, &info->error)) {
- g_assert (info->error);
- mm_callback_info_schedule (info);
- return;
- }
-
- mm_serial_port_flash (primary, 100, enable_flash_done, info);
+ if (!mm_serial_port_open (primary, &info->error)) {
+ g_assert (info->error);
+ mm_callback_info_schedule (info);
+ return;
}
+
+ mm_serial_port_flash (primary, 100, enable_flash_done, info);
}
static gboolean
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-08 15:02:32 +0000