aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mm-generic-cdma.c41
-rw-r--r--src/mm-generic-gsm.c55
-rw-r--r--src/mm-modem.c22
-rw-r--r--src/mm-modem.h10
4 files changed, 93 insertions, 35 deletions
diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c
index be1ad8e9..50200542 100644
--- a/src/mm-generic-cdma.c
+++ b/src/mm-generic-cdma.c
@@ -234,7 +234,6 @@ flash_done (MMSerialPort *port, GError *error, gpointer user_data)
static void
enable (MMModem *modem,
- gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
@@ -243,12 +242,6 @@ enable (MMModem *modem,
info = mm_callback_info_new (modem, callback, user_data);
- if (!do_enable) {
- mm_serial_port_close (priv->primary);
- mm_callback_info_schedule (info);
- return;
- }
-
if (!mm_serial_port_open (priv->primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
@@ -259,6 +252,37 @@ enable (MMModem *modem,
}
static void
+disable_flash_done (MMSerialPort *port,
+ GError *error,
+ gpointer user_data)
+{
+ MMCallbackInfo *info = user_data;
+
+ if (error)
+ info->error = g_error_copy (error);
+ else
+ mm_serial_port_close (port);
+
+ mm_callback_info_schedule (info);
+}
+
+static void
+disable (MMModem *modem,
+ MMModemFn callback,
+ gpointer user_data)
+{
+ MMGenericCdmaPrivate *priv = MM_GENERIC_CDMA_GET_PRIVATE (modem);
+ MMCallbackInfo *info;
+
+ info = mm_callback_info_new (modem, callback, user_data);
+
+ if (mm_port_get_connected (MM_PORT (priv->primary)))
+ mm_serial_port_flash (priv->primary, 1000, disable_flash_done, info);
+ else
+ disable_flash_done (priv->primary, NULL, info);
+}
+
+static void
dial_done (MMSerialPort *port,
GString *response,
GError *error,
@@ -657,7 +681,7 @@ simple_state_machine (MMModem *modem, GError *error, gpointer user_data)
switch (state) {
case SIMPLE_STATE_BEGIN:
state = SIMPLE_STATE_ENABLE;
- mm_modem_enable (modem, TRUE, simple_state_machine, info);
+ mm_modem_enable (modem, simple_state_machine, info);
break;
case SIMPLE_STATE_ENABLE:
str = simple_get_string_property (info, "number", &info->error);
@@ -769,6 +793,7 @@ modem_init (MMModem *modem_class)
modem_class->grab_port = grab_port;
modem_class->release_port = release_port;
modem_class->enable = enable;
+ modem_class->disable = disable;
modem_class->connect = connect;
modem_class->disconnect = disconnect;
modem_class->get_info = get_card_info;
diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c
index 87900ccc..a63c33a8 100644
--- a/src/mm-generic-gsm.c
+++ b/src/mm-generic-gsm.c
@@ -386,6 +386,28 @@ enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
}
static void
+enable (MMModem *modem,
+ MMModemFn callback,
+ gpointer user_data)
+{
+ MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem);
+ MMCallbackInfo *info;
+
+ /* 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);
+
+ if (!mm_serial_port_open (priv->primary, &info->error)) {
+ g_assert (info->error);
+ mm_callback_info_schedule (info);
+ return;
+ }
+
+ mm_serial_port_flash (priv->primary, 100, enable_flash_done, info);
+}
+
+static void
disable_done (MMSerialPort *port,
GString *response,
GError *error,
@@ -418,35 +440,23 @@ disable_flash_done (MMSerialPort *port,
}
static void
-enable (MMModem *modem,
- gboolean do_enable,
- MMModemFn callback,
- gpointer user_data)
+disable (MMModem *modem,
+ MMModemFn callback,
+ gpointer user_data)
{
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem);
MMCallbackInfo *info;
- /* First, reset the previously used CID */
+ /* First, reset the previously used CID and clean up registration */
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);
- if (!do_enable) {
- mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem));
-
- if (mm_port_get_connected (MM_PORT (priv->primary)))
- mm_serial_port_flash (priv->primary, 1000, disable_flash_done, info);
- else
- disable_flash_done (priv->primary, NULL, info);
- } else {
- if (!mm_serial_port_open (priv->primary, &info->error)) {
- g_assert (info->error);
- mm_callback_info_schedule (info);
- return;
- }
-
- mm_serial_port_flash (priv->primary, 100, enable_flash_done, info);
- }
+ if (mm_port_get_connected (MM_PORT (priv->primary)))
+ mm_serial_port_flash (priv->primary, 1000, disable_flash_done, info);
+ else
+ disable_flash_done (priv->primary, NULL, info);
}
static void
@@ -1542,7 +1552,7 @@ simple_state_machine (MMModem *modem, GError *error, gpointer user_data)
switch (state) {
case SIMPLE_STATE_BEGIN:
state = SIMPLE_STATE_ENABLE;
- mm_modem_enable (modem, TRUE, simple_state_machine, info);
+ mm_modem_enable (modem, simple_state_machine, info);
break;
case SIMPLE_STATE_ENABLE:
state = SIMPLE_STATE_CHECK_PIN;
@@ -1739,6 +1749,7 @@ modem_init (MMModem *modem_class)
modem_class->grab_port = grab_port;
modem_class->release_port = release_port;
modem_class->enable = enable;
+ modem_class->disable = disable;
modem_class->connect = connect;
modem_class->disconnect = disconnect;
modem_class->get_info = get_card_info;
diff --git a/src/mm-modem.c b/src/mm-modem.c
index 79a07939..ca2afbd7 100644
--- a/src/mm-modem.c
+++ b/src/mm-modem.c
@@ -54,7 +54,6 @@ async_call_done (MMModem *modem, GError *error, gpointer user_data)
void
mm_modem_enable (MMModem *self,
- gboolean enable,
MMModemFn callback,
gpointer user_data)
{
@@ -62,7 +61,21 @@ mm_modem_enable (MMModem *self,
g_return_if_fail (callback != NULL);
if (MM_MODEM_GET_INTERFACE (self)->enable)
- MM_MODEM_GET_INTERFACE (self)->enable (self, enable, callback, user_data);
+ MM_MODEM_GET_INTERFACE (self)->enable (self, callback, user_data);
+ else
+ async_op_not_supported (self, callback, user_data);
+}
+
+void
+mm_modem_disable (MMModem *self,
+ MMModemFn callback,
+ gpointer user_data)
+{
+ g_return_if_fail (MM_IS_MODEM (self));
+ g_return_if_fail (callback != NULL);
+
+ if (MM_MODEM_GET_INTERFACE (self)->disable)
+ MM_MODEM_GET_INTERFACE (self)->disable (self, callback, user_data);
else
async_op_not_supported (self, callback, user_data);
}
@@ -72,7 +85,10 @@ impl_modem_enable (MMModem *modem,
gboolean enable,
DBusGMethodInvocation *context)
{
- mm_modem_enable (modem, enable, async_call_done, context);
+ if (enable)
+ mm_modem_enable (modem, async_call_done, context);
+ else
+ mm_modem_disable (modem, async_call_done, context);
}
void
diff --git a/src/mm-modem.h b/src/mm-modem.h
index a1d7ffc8..29f72b43 100644
--- a/src/mm-modem.h
+++ b/src/mm-modem.h
@@ -103,10 +103,13 @@ struct _MMModem {
const char *name);
void (*enable) (MMModem *self,
- gboolean enable,
MMModemFn callback,
gpointer user_data);
+ void (*disable) (MMModem *self,
+ MMModemFn callback,
+ gpointer user_data);
+
void (*connect) (MMModem *self,
const char *number,
MMModemFn callback,
@@ -143,10 +146,13 @@ void mm_modem_release_port (MMModem *self,
const char *name);
void mm_modem_enable (MMModem *self,
- gboolean enable,
MMModemFn callback,
gpointer user_data);
+void mm_modem_disable (MMModem *self,
+ MMModemFn callback,
+ gpointer user_data);
+
void mm_modem_connect (MMModem *self,
const char *number,
MMModemFn callback,
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-08 17:54:22 +0000