core: don't allow concurrent flashes on the same device

Previously, a few operations (like disable) could trigger a modem
flash in parallel with another flash.  That's wrong, don't allow
that.  At the same time, add in finer-grained error checking on
serial port speed operations, and fix a GSM generic bug that would
send the POWER_UP string on disable.

4 files changed, 99 insertions, 29 deletions

diff --git a/plugins/mm-modem-mbm.c b/plugins/mm-modem-mbm.c
index 5a8aa2ef..3267402c 100644
--- a/plugins/mm-modem-mbm.c
+++ b/plugins/mm-modem-mbm.c
@@ -402,11 +402,17 @@ mbm_emrdy_done (MMSerialPort *port,
 }
 
 static void
-enable_flash_done (MMSerialPort *port, gpointer user_data)
+enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
 {
     MMCallbackInfo *info = user_data;
     MMModemMbmPrivate *priv = MM_MODEM_MBM_GET_PRIVATE (info->modem);
 
+    if (error) {
+        info->error = g_error_copy (error);
+        mm_callback_info_schedule (info);
+        return;
+    }
+
     if (priv->have_emrdy) {
         /* Modem is ready, no need to check EMRDY */
         do_init (port, info);
@@ -427,8 +433,16 @@ disable_done (MMSerialPort *port,
 }
 
 static void
-disable_flash_done (MMSerialPort *port, gpointer user_data)
+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, "+CMER=0", 5, disable_done, user_data);
 }
 
@@ -449,18 +463,20 @@ enable (MMModem *modem,
     g_assert (primary);
 
     if (do_enable) {
-        if (mm_serial_port_open (primary, &info->error))
-            mm_serial_port_flash (primary, 100, enable_flash_done, info);
-
-        if (info->error)
+        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);
     } 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, info);
+            disable_flash_done (primary, NULL, info);
     }
 }
 
diff --git a/plugins/mm-modem-novatel-gsm.c b/plugins/mm-modem-novatel-gsm.c
index 1e3392ec..c2533a1d 100644
--- a/plugins/mm-modem-novatel-gsm.c
+++ b/plugins/mm-modem-novatel-gsm.c
@@ -94,8 +94,16 @@ pre_init_done (MMSerialPort *port,
 }
 
 static void
-enable_flash_done (MMSerialPort *port, gpointer user_data)
+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, "E0 V1", 3, pre_init_done, user_data);
 }
 
@@ -110,8 +118,16 @@ disable_done (MMSerialPort *port,
 }
 
 static void
-disable_flash_done (MMSerialPort *port, gpointer user_data)
+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);
 }
 
@@ -136,13 +152,15 @@ enable (MMModem *modem,
         if (mm_port_get_connected (MM_PORT (primary)))
             mm_serial_port_flash (primary, 1000, disable_flash_done, info);
         else
-            disable_flash_done (primary, info);
+            disable_flash_done (primary, NULL, info);
     } else {
-        if (mm_serial_port_open (primary, &info->error))
-            mm_serial_port_flash (primary, 100, enable_flash_done, info);
-
-        if (info->error)
+        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);
     }
 }
 
diff --git a/plugins/mm-modem-sierra.c b/plugins/mm-modem-sierra.c
index 79b7ec30..ed9b887b 100644
--- a/plugins/mm-modem-sierra.c
+++ b/plugins/mm-modem-sierra.c
@@ -84,16 +84,32 @@ init_done (MMSerialPort *port,
 }
 
 static void
-enable_flash_done (MMSerialPort *port, gpointer user_data)
+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, gpointer user_data)
+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 ((MMCallbackInfo *) user_data);
+    mm_callback_info_schedule (info);
 }
 
 static void
@@ -118,13 +134,15 @@ enable (MMModem *modem,
         if (mm_port_get_connected (MM_PORT (primary)))
             mm_serial_port_flash (primary, 1000, disable_flash_done, info);
         else
-            disable_flash_done (primary, info);
+            disable_flash_done (primary, NULL, info);
     } else {
-        if (mm_serial_port_open (primary, &info->error))
-            mm_serial_port_flash (primary, 100, enable_flash_done, info);
-
-        if (info->error)
+        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);
     }
 }
 
diff --git a/plugins/mm-modem-zte.c b/plugins/mm-modem-zte.c
index 0bec7f60..51e6e485 100644
--- a/plugins/mm-modem-zte.c
+++ b/plugins/mm-modem-zte.c
@@ -95,8 +95,16 @@ pre_init_done (MMSerialPort *port,
 }
 
 static void
-enable_flash_done (MMSerialPort *port, gpointer user_data)
+enable_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, "E0 V1", 3, pre_init_done, user_data);
 }
 
@@ -111,8 +119,16 @@ disable_done (MMSerialPort *port,
 }
 
 static void
-disable_flash_done (MMSerialPort *port, gpointer user_data)
+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);
 }
 
@@ -137,13 +153,15 @@ enable (MMModem *modem,
         if (mm_port_get_connected (MM_PORT (primary)))
             mm_serial_port_flash (primary, 1000, disable_flash_done, info);
         else
-            disable_flash_done (primary, info);
+            disable_flash_done (primary, NULL, info);
     } else {
-        if (mm_serial_port_open (primary, &info->error))
-            mm_serial_port_flash (primary, 100, enable_flash_done, info);
-
-        if (info->error)
+        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);
     }
 }