diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2011-12-09 16:43:42 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:33 +0100 |
| commit | c15181ae37a7ef9a4ae6e95c3bc3372b1a9d740b (patch) | |
| tree | f45844114259f5d5a1dca1448d530e3da6a27924 | |
| parent | ed83d540873a8818fe4b28a859740eb1665e40cf (diff) | |
port-probe: always complete probing task in idle
| -rw-r--r-- | src/mm-port-probe.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index 6b214083..e56f1879 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -115,7 +115,6 @@ port_probe_run_task_free (PortProbeRunTask *task) static void port_probe_run_task_complete (PortProbeRunTask *task, - gboolean complete_in_idle, gboolean result, GError *error) { @@ -131,10 +130,8 @@ port_probe_run_task_complete (PortProbeRunTask *task, else g_simple_async_result_set_op_res_gboolean (task->result, result); - if (complete_in_idle) - g_simple_async_result_complete_in_idle (task->result); - else - g_simple_async_result_complete (task->result); + /* Always complete in idle */ + g_simple_async_result_complete_in_idle (task->result); } static gboolean @@ -150,7 +147,6 @@ port_probe_run_is_cancelled (MMPortProbe *self) if (g_cancellable_is_cancelled (task->cancellable)) { port_probe_run_task_complete ( task, - TRUE, /* in idle */ FALSE, g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED, @@ -236,7 +232,6 @@ serial_probe_qcdm (MMPortProbe *self) port_probe_run_task_complete ( task, FALSE, - FALSE, g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "(%s) Couldn't create QCDM port", @@ -249,7 +244,6 @@ serial_probe_qcdm (MMPortProbe *self) port_probe_run_task_complete ( task, FALSE, - FALSE, g_error_new (MM_SERIAL_ERROR, MM_SERIAL_ERROR_OPEN_FAILED, "(%s) Failed to open QCDM port: %s", @@ -267,7 +261,6 @@ serial_probe_qcdm (MMPortProbe *self) port_probe_run_task_complete ( task, FALSE, - FALSE, g_error_new (MM_SERIAL_ERROR, MM_SERIAL_ERROR_OPEN_FAILED, "(%s) Failed to create QCDM versin info command", @@ -398,7 +391,6 @@ serial_probe_at_parse_response (MMAtSerialPort *port, port_probe_run_task_complete ( task, FALSE, - FALSE, g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED, "(%s) error while probing AT features: %s", @@ -513,7 +505,7 @@ serial_probe_schedule (MMPortProbe *self) } /* All done! Finish asynchronously */ - port_probe_run_task_complete (task, TRUE, TRUE, NULL); + port_probe_run_task_complete (task, TRUE, NULL); } static void @@ -555,7 +547,7 @@ serial_buffer_full (MMSerialPort *serial, if ( (buffer->len >= sizeof (zerobuf)) && (memcmp (buffer->data, zerobuf, sizeof (zerobuf)) == 0)) { mm_serial_port_close (serial); - port_probe_run_task_complete (task, FALSE, FALSE, NULL); + port_probe_run_task_complete (task, FALSE, NULL); return; } @@ -576,7 +568,7 @@ serial_buffer_full (MMSerialPort *serial, if (!memcmp (&buffer->data[i], *iter, iter_len)) { /* Immediately close the port and complete probing */ mm_serial_port_close (serial); - port_probe_run_task_complete (task, FALSE, FALSE, NULL); + port_probe_run_task_complete (task, FALSE, NULL); return; } } @@ -603,7 +595,6 @@ serial_open_at (MMPortProbe *self) port_probe_run_task_complete ( task, FALSE, - FALSE, g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "(%s) couldn't create AT port", @@ -631,7 +622,6 @@ serial_open_at (MMPortProbe *self) port_probe_run_task_complete ( task, FALSE, - FALSE, g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "(%s) failed to open port after 4 tries", @@ -647,7 +637,6 @@ serial_open_at (MMPortProbe *self) port_probe_run_task_complete ( task, FALSE, - FALSE, g_error_new (MM_SERIAL_ERROR, MM_SERIAL_ERROR_OPEN_FAILED, "(%s) failed to open port: %s", @@ -749,10 +738,7 @@ mm_port_probe_run (MMPortProbe *self, /* All requested probings already available? If so, we're done */ if (!task->flags) { - port_probe_run_task_complete (task, - TRUE, /* in idle */ - TRUE, - NULL); + port_probe_run_task_complete (task, TRUE, NULL); return; } |