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

iface-modem: flash primary port during disable

Browse Source
This commit is contained in:
Aleksander Morgado
2011-11-25 15:12:37 +01:00
parent f3b6bfeb8f
commit 5e3ad0fe58
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/mm-iface-modem.c
View File

@@ -754,6 +754,7 @@ mm_iface_modem_signal_quality_check (MMIfaceModem *self,
typedef enum { typedef enum {
DISABLING_STEP_FIRST, DISABLING_STEP_FIRST,
DISABLING_STEP_FLASH_PORT,
DISABLING_STEP_LAST DISABLING_STEP_LAST
} DisablingStep; } DisablingStep;
@@ -825,6 +826,24 @@ mm_iface_modem_disable_finish (MMIfaceModem *self,
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
} }
static void
interface_disabling_flash_done (MMSerialPort *port,
GError *error,
gpointer user_data)
{
DisablingContext *ctx = user_data;
if (error) {
g_simple_async_result_set_from_error (ctx->result, error);
disabling_context_complete_and_free (ctx);
return;
}
/* Go on to next step */
ctx->step++;
interface_disabling_step (ctx);
}
static void static void
interface_disabling_step (DisablingContext *ctx) interface_disabling_step (DisablingContext *ctx)
{ {
@@ -833,6 +852,19 @@ interface_disabling_step (DisablingContext *ctx)
/* Fall down to next step */ /* Fall down to next step */
ctx->step++; ctx->step++;
case DISABLING_STEP_FLASH_PORT:
/* If primary port connected, flash port */
if (mm_port_get_connected (MM_PORT (ctx->primary))) {
mm_serial_port_flash (MM_SERIAL_PORT (ctx->primary),
100,
TRUE,
interface_disabling_flash_done,
ctx);
return;
}
/* Fall down to next step */
ctx->step++;
case DISABLING_STEP_LAST: case DISABLING_STEP_LAST:
/* We are done without errors! */ /* We are done without errors! */
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);