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

cinterion: port setup_flow_control to GTask

Browse Source
This commit is contained in:
Aleksander Morgado
2017-09-20 21:54:04 -07:00
parent 926e0176fb
commit e1b2b88e68
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/cinterion/mm-broadband-modem-cinterion.c
View File

@@ -1384,45 +1384,40 @@ set_current_bands (MMIfaceModem *self,
} }
/*****************************************************************************/ /*****************************************************************************/
/* FLOW CONTROL */ /* Flow control */
static gboolean static gboolean
setup_flow_control_finish (MMIfaceModem *self, setup_flow_control_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); return g_task_propagate_boolean (G_TASK (res), error);
} }
static void static void
setup_flow_control_ready (MMBroadbandModemCinterion *self, setup_flow_control_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *operation_result) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
if (!mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error)) if (!mm_base_modem_at_command_finish (self, res, &error))
/* Let the error be critical. We DO need RTS/CTS in order to have /* Let the error be critical. We DO need RTS/CTS in order to have
* proper modem disabling. */ * proper modem disabling. */
g_simple_async_result_take_error (operation_result, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_op_res_gboolean (operation_result, TRUE); g_task_return_boolean (task, TRUE);
g_object_unref (task);
g_simple_async_result_complete (operation_result);
g_object_unref (operation_result);
} }
static void static void
setup_flow_control (MMIfaceModem *self, setup_flow_control (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
setup_flow_control);
/* We need to enable RTS/CTS so that CYCLIC SLEEP mode works */ /* We need to enable RTS/CTS so that CYCLIC SLEEP mode works */
mm_base_modem_at_command (MM_BASE_MODEM (self), mm_base_modem_at_command (MM_BASE_MODEM (self),
@@ -1430,7 +1425,7 @@ setup_flow_control (MMIfaceModem *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)setup_flow_control_ready, (GAsyncReadyCallback)setup_flow_control_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/