colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gsm: finish all disable commands before returning

Browse Source 
Rearrange the primary and secondary-port disable operations so that
there's a linear chain of callbacks rather than a second dangling
callback chain for the secondary port; it's possible for the primary
port operations to complete, and for the callback to finish and start
tearing down the entire device, before the secondary port commands
run.

Change-Id: Ia95a7eae574737cdec38b14d39786127be1b3184
This commit is contained in:
Nathan Williams
2011-11-03 16:13:07 -04:00
committed by Dan Williams
parent 87ec5e09a5
commit a027d27da8
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/mm-generic-gsm.c
View File

@@ -2026,6 +2026,22 @@ disable_flash_done (MMSerialPort *port,
g_free (cmd); g_free (cmd);
} }
static void
mark_disabled (gpointer user_data)
{
MMCallbackInfo *info = user_data;
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (info->modem);
mm_modem_set_state (MM_MODEM (info->modem),
MM_MODEM_STATE_DISABLING,
MM_MODEM_STATE_REASON_NONE);
if (mm_port_get_connected (MM_PORT (priv->primary)))
mm_serial_port_flash (MM_SERIAL_PORT (priv->primary), 1000, TRUE, disable_flash_done, info);
else
disable_flash_done (MM_SERIAL_PORT (priv->primary), NULL, info);
}
static void static void
secondary_unsolicited_done (MMAtSerialPort *port, secondary_unsolicited_done (MMAtSerialPort *port,
GString *response, GString *response,
@@ -2033,6 +2049,7 @@ secondary_unsolicited_done (MMAtSerialPort *port,
gpointer user_data) gpointer user_data)
{ {
mm_serial_port_close_force (MM_SERIAL_PORT (port)); mm_serial_port_close_force (MM_SERIAL_PORT (port));
mark_disabled (user_data);
} }
static void static void
@@ -2072,13 +2089,6 @@ disable (MMModem *modem,
update_lac_ci (self, 0, 0, 1); update_lac_ci (self, 0, 0, 1);
_internal_update_access_technology (self, MM_MODEM_GSM_ACCESS_TECH_UNKNOWN); _internal_update_access_technology (self, MM_MODEM_GSM_ACCESS_TECH_UNKNOWN);
/* Clean up the secondary port if it's open */
if (priv->secondary && mm_serial_port_is_open (MM_SERIAL_PORT (priv->secondary))) {
mm_at_serial_port_queue_command (priv->secondary, "+CREG=0", 3, NULL, NULL);
mm_at_serial_port_queue_command (priv->secondary, "+CGREG=0", 3, NULL, NULL);
mm_at_serial_port_queue_command (priv->secondary, "+CMER=0", 3, secondary_unsolicited_done, NULL);
}
info = mm_callback_info_new (modem, callback, user_data); info = mm_callback_info_new (modem, callback, user_data);
/* Cache the previous state so we can reset it if the operation fails */ /* Cache the previous state so we can reset it if the operation fails */
@@ -2088,14 +2098,14 @@ disable (MMModem *modem,
GUINT_TO_POINTER (state), GUINT_TO_POINTER (state),
NULL); NULL);
mm_modem_set_state (MM_MODEM (info->modem), /* Clean up the secondary port if it's open */
MM_MODEM_STATE_DISABLING, if (priv->secondary && mm_serial_port_is_open (MM_SERIAL_PORT (priv->secondary))) {
MM_MODEM_STATE_REASON_NONE); mm_dbg("Shutting down secondary port");
mm_at_serial_port_queue_command (priv->secondary, "+CREG=0", 3, NULL, NULL);
if (mm_port_get_connected (MM_PORT (priv->primary))) mm_at_serial_port_queue_command (priv->secondary, "+CGREG=0", 3, NULL, NULL);
mm_serial_port_flash (MM_SERIAL_PORT (priv->primary), 1000, TRUE, disable_flash_done, info); mm_at_serial_port_queue_command (priv->secondary, "+CMER=0", 3, secondary_unsolicited_done, info);
else } else
disable_flash_done (MM_SERIAL_PORT (priv->primary), NULL, info); mark_disabled (info);
} }
static void static void