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

u-blox: don't run quick AT procedure if READY_DELAY not configured

Browse Source 
The quick AT probe procedure is only meaningful to avoid waiting the
+READY URC delay. If there is no such delay configured, we shouldn't
run the quick AT probe (as a failure in the AT probe may also
trigger a +READY URC delay).

Just read the udev tag value early and complete the task if the delay
is not configured.
This commit is contained in:
Aleksander Morgado
2018-05-08 09:49:11 +02:00
parent 1a56b97061
commit 3e469e7b80
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/ublox/mm-plugin-ublox.c
View File

@@ -202,19 +202,25 @@ ublox_custom_init (MMPortProbe *probe,
{ {
GTask *task; GTask *task;
CustomInitContext *ctx; CustomInitContext *ctx;
gint wait_timeout_secs;
task = g_task_new (probe, cancellable, callback, user_data); task = g_task_new (probe, cancellable, callback, user_data);
/* If no explicit READY_DELAY configured, we don't need a custom init procedure */
wait_timeout_secs = mm_kernel_device_get_property_as_int (mm_port_probe_peek_port (probe), "ID_MM_UBLOX_PORT_READY_DELAY");
if (wait_timeout_secs <= 0) {
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
}
ctx = g_slice_new0 (CustomInitContext); ctx = g_slice_new0 (CustomInitContext);
ctx->wait_timeout_secs = wait_timeout_secs;
ctx->port = g_object_ref (port); ctx->port = g_object_ref (port);
ctx->ready_regex = g_regex_new ("\\r\\n\\+AT:\\s*READY\\r\\n", ctx->ready_regex = g_regex_new ("\\r\\n\\+AT:\\s*READY\\r\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
g_task_set_task_data (task, ctx, (GDestroyNotify) custom_init_context_free); g_task_set_task_data (task, ctx, (GDestroyNotify) custom_init_context_free);
ctx->wait_timeout_secs = mm_kernel_device_get_property_as_int (mm_port_probe_peek_port(probe), "ID_MM_UBLOX_PORT_READY_DELAY");
if (ctx->wait_timeout_secs < 0)
ctx->wait_timeout_secs = 0;
/* If the device hasn't been plugged in right away, we assume it was already /* If the device hasn't been plugged in right away, we assume it was already
* running for some time. We validate the assumption with a quick AT probe, * running for some time. We validate the assumption with a quick AT probe,
* and if it times out, we run the explicit READY wait from scratch (e.g. * and if it times out, we run the explicit READY wait from scratch (e.g.
@@ -232,15 +238,8 @@ ublox_custom_init (MMPortProbe *probe,
return; return;
} }
if (ctx->wait_timeout_secs > 0) { /* Device hotplugged and has a defined ready delay, wait for READY URC */
/* Device hotplugged and has a defined ready delay, wait for READY URC */ wait_for_ready (task);
wait_for_ready (task);
return;
}
/* Otherwise, no need for any custom wait */
g_task_return_boolean (task, TRUE);
g_object_unref (task);
} }
/*****************************************************************************/ /*****************************************************************************/