Aleksander Morgado
4fe464f5f7
When the GCancellable is added to the GTask, we can use a single method call to check for the task being cancelled, and complete it right away if so. This patch also clears up the logic in the Novatel plugin, where the code was trying to return "TRUE" when the task was cancelled, but wouldn't work as the check-cancellable flag in the GTask is TRUE by default (i.e. when completing the GTask, if it was cancelled, a G_IO_ERROR_CANCELLED would be returned by default, regardless of any other return value set). This patch also introduces a small variation of the logic in the Cinterion plugin: instead of running SWWAN=0 before completing the async action, the command is now sent just after completion of the async action. This shouldn't be an issue, as the SWWAN result itself is ignored.
154 lines
4.5 KiB
C
154 lines
4.5 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details:
|
|
*
|
|
* Copyright (C) 2015 Aleksander Morgado <aleksander@aleksander.es>
|
|
*/
|
|
|
|
#include "mm-common-novatel.h"
|
|
#include "mm-log.h"
|
|
|
|
/*****************************************************************************/
|
|
/* Custom init */
|
|
|
|
typedef struct {
|
|
MMPortSerialAt *port;
|
|
guint nwdmat_retries;
|
|
guint wait_time;
|
|
} CustomInitContext;
|
|
|
|
static void
|
|
custom_init_context_free (CustomInitContext *ctx)
|
|
{
|
|
g_object_unref (ctx->port);
|
|
g_slice_free (CustomInitContext, ctx);
|
|
}
|
|
|
|
gboolean
|
|
mm_common_novatel_custom_init_finish (MMPortProbe *probe,
|
|
GAsyncResult *result,
|
|
GError **error)
|
|
{
|
|
return g_task_propagate_boolean (G_TASK (result), error);
|
|
}
|
|
|
|
static void custom_init_step (GTask *task);
|
|
|
|
static void
|
|
nwdmat_ready (MMPortSerialAt *port,
|
|
GAsyncResult *res,
|
|
GTask* task)
|
|
{
|
|
const gchar *response;
|
|
GError *error = NULL;
|
|
|
|
response = mm_port_serial_at_command_finish (port, res, &error);
|
|
if (error) {
|
|
if (g_error_matches (error,
|
|
MM_SERIAL_ERROR,
|
|
MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) {
|
|
custom_init_step (task);
|
|
goto out;
|
|
}
|
|
|
|
mm_dbg ("(Novatel) Error flipping secondary ports to AT mode: %s", error->message);
|
|
}
|
|
|
|
/* Finish custom_init */
|
|
g_task_return_boolean (task, TRUE);
|
|
g_object_unref (task);
|
|
|
|
out:
|
|
if (error)
|
|
g_error_free (error);
|
|
}
|
|
|
|
static gboolean
|
|
custom_init_wait_cb (GTask *task)
|
|
{
|
|
custom_init_step (task);
|
|
return G_SOURCE_REMOVE;
|
|
}
|
|
|
|
static void
|
|
custom_init_step (GTask *task)
|
|
{
|
|
CustomInitContext *ctx;
|
|
MMPortProbe *probe;
|
|
|
|
ctx = g_task_get_task_data (task);
|
|
|
|
/* If cancelled, end */
|
|
if (g_task_return_error_if_cancelled (task)) {
|
|
mm_dbg ("(Novatel) no need to keep on running custom init in (%s)",
|
|
mm_port_get_device (MM_PORT (ctx->port)));
|
|
g_object_unref (task);
|
|
return;
|
|
}
|
|
|
|
probe = g_task_get_source_object (task);
|
|
|
|
/* If device has a QMI port, don't run $NWDMAT */
|
|
if (mm_port_probe_list_has_qmi_port (mm_device_peek_port_probe_list (mm_port_probe_peek_device (probe)))) {
|
|
mm_dbg ("(Novatel) no need to run custom init in (%s): device has QMI port",
|
|
mm_port_get_device (MM_PORT (ctx->port)));
|
|
g_task_return_boolean (task, TRUE);
|
|
g_object_unref (task);
|
|
return;
|
|
}
|
|
|
|
if (ctx->wait_time > 0) {
|
|
ctx->wait_time--;
|
|
g_timeout_add_seconds (1, (GSourceFunc)custom_init_wait_cb, task);
|
|
return;
|
|
}
|
|
|
|
if (ctx->nwdmat_retries > 0) {
|
|
ctx->nwdmat_retries--;
|
|
mm_port_serial_at_command (ctx->port,
|
|
"$NWDMAT=1",
|
|
3,
|
|
FALSE, /* raw */
|
|
FALSE, /* allow_cached */
|
|
g_task_get_cancellable (task),
|
|
(GAsyncReadyCallback)nwdmat_ready,
|
|
task);
|
|
return;
|
|
}
|
|
|
|
/* Finish custom_init */
|
|
mm_dbg ("(Novatel) couldn't flip secondary port to AT in (%s): all retries consumed",
|
|
mm_port_get_device (MM_PORT (ctx->port)));
|
|
g_task_return_boolean (task, TRUE);
|
|
g_object_unref (task);
|
|
}
|
|
|
|
void
|
|
mm_common_novatel_custom_init (MMPortProbe *probe,
|
|
MMPortSerialAt *port,
|
|
GCancellable *cancellable,
|
|
GAsyncReadyCallback callback,
|
|
gpointer user_data)
|
|
{
|
|
CustomInitContext *ctx;
|
|
GTask *task;
|
|
|
|
ctx = g_slice_new (CustomInitContext);
|
|
ctx->port = g_object_ref (port);
|
|
ctx->nwdmat_retries = 3;
|
|
ctx->wait_time = 2;
|
|
|
|
task = g_task_new (probe, cancellable, callback, user_data);
|
|
g_task_set_task_data (task, ctx, (GDestroyNotify)custom_init_context_free);
|
|
|
|
custom_init_step (task);
|
|
}
|