aboutsummaryrefslogtreecommitdiff
path: root/src/mm-port-probe.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mm-port-probe.c')
-rw-r--r--src/mm-port-probe.c153
1 files changed, 85 insertions, 68 deletions
diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c
index ed7d36ab..650a05c5 100644
--- a/src/mm-port-probe.c
+++ b/src/mm-port-probe.c
@@ -380,6 +380,9 @@ typedef struct {
/* ---- MBIM probing specific context ---- */
MMPortMbim *mbim_port;
#endif
+
+ /* ---- QCDM probing specific context ---- */
+ gboolean qcdm_required;
} PortProbeRunContext;
static gboolean serial_probe_at (MMPortProbe *self);
@@ -756,84 +759,96 @@ serial_probe_qcdm (MMPortProbe *self)
if (port_probe_task_return_error_if_cancelled (self))
return G_SOURCE_REMOVE;
- mm_obj_dbg (self, "probing QCDM...");
+ /* Check if port requires QCDM probing */
+ if (!ctx->qcdm_required) {
+ /* Ok, this is probably a QCDM port */
+ mm_obj_dbg (self, "Likely a QCDM port, but plugin does not require probing and grabbing...");
+ mm_port_probe_set_result_qcdm (self, TRUE);
+ self->priv->is_ignored = TRUE;
+ /* Reschedule probing */
+ serial_probe_schedule (self);
- /* If open, close the AT port */
- if (ctx->serial) {
- /* Explicitly clear the buffer full signal handler */
- if (ctx->buffer_full_id) {
- g_signal_handler_disconnect (ctx->serial, ctx->buffer_full_id);
- ctx->buffer_full_id = 0;
+ return G_SOURCE_REMOVE;
+ } else {
+ mm_obj_dbg (self, "probing QCDM...");
+
+ /* If open, close the AT port */
+ if (ctx->serial) {
+ /* Explicitly clear the buffer full signal handler */
+ if (ctx->buffer_full_id) {
+ g_signal_handler_disconnect (ctx->serial, ctx->buffer_full_id);
+ ctx->buffer_full_id = 0;
+ }
+ mm_port_serial_close (ctx->serial);
+ g_object_unref (ctx->serial);
}
- mm_port_serial_close (ctx->serial);
- g_object_unref (ctx->serial);
- }
- if (g_str_equal (mm_kernel_device_get_subsystem (self->priv->port), "wwan"))
- subsys = MM_PORT_SUBSYS_WWAN;
+ if (g_str_equal (mm_kernel_device_get_subsystem (self->priv->port), "wwan"))
+ subsys = MM_PORT_SUBSYS_WWAN;
- /* Open the QCDM port */
- ctx->serial = MM_PORT_SERIAL (mm_port_serial_qcdm_new (mm_kernel_device_get_name (self->priv->port), subsys));
- if (!ctx->serial) {
- port_probe_task_return_error (self,
- g_error_new (MM_CORE_ERROR,
- MM_CORE_ERROR_FAILED,
- "(%s/%s) Couldn't create QCDM port",
- mm_kernel_device_get_subsystem (self->priv->port),
- mm_kernel_device_get_name (self->priv->port)));
- return G_SOURCE_REMOVE;
- }
+ /* Open the QCDM port */
+ ctx->serial = MM_PORT_SERIAL (mm_port_serial_qcdm_new (mm_kernel_device_get_name (self->priv->port), subsys));
+ if (!ctx->serial) {
+ port_probe_task_return_error (self,
+ g_error_new (MM_CORE_ERROR,
+ MM_CORE_ERROR_FAILED,
+ "(%s/%s) Couldn't create QCDM port",
+ mm_kernel_device_get_subsystem (self->priv->port),
+ mm_kernel_device_get_name (self->priv->port)));
+ return G_SOURCE_REMOVE;
+ }
- /* Setup port if needed */
- common_serial_port_setup (self, ctx->serial);
+ /* Setup port if needed */
+ common_serial_port_setup (self, ctx->serial);
- /* Try to open the port */
- if (!mm_port_serial_open (ctx->serial, &error)) {
- port_probe_task_return_error (self,
- g_error_new (MM_SERIAL_ERROR,
- MM_SERIAL_ERROR_OPEN_FAILED,
- "(%s/%s) Failed to open QCDM port: %s",
- mm_kernel_device_get_subsystem (self->priv->port),
- mm_kernel_device_get_name (self->priv->port),
- (error ? error->message : "unknown error")));
- g_clear_error (&error);
- return G_SOURCE_REMOVE;
- }
+ /* Try to open the port */
+ if (!mm_port_serial_open (ctx->serial, &error)) {
+ port_probe_task_return_error (self,
+ g_error_new (MM_SERIAL_ERROR,
+ MM_SERIAL_ERROR_OPEN_FAILED,
+ "(%s/%s) Failed to open QCDM port: %s",
+ mm_kernel_device_get_subsystem (self->priv->port),
+ mm_kernel_device_get_name (self->priv->port),
+ (error ? error->message : "unknown error")));
+ g_clear_error (&error);
+ return G_SOURCE_REMOVE;
+ }
- /* Build up the probe command; 0x7E is the frame marker, so put one at the
- * beginning of the buffer to ensure that the device discards any AT
- * commands that probing might have sent earlier. Should help devices
- * respond more quickly and speed up QCDM probing.
- */
- verinfo = g_byte_array_sized_new (10);
- g_byte_array_append (verinfo, &marker, 1);
- len = qcdm_cmd_version_info_new ((char *) (verinfo->data + 1), 9);
- if (len <= 0) {
+ /* Build up the probe command; 0x7E is the frame marker, so put one at the
+ * beginning of the buffer to ensure that the device discards any AT
+ * commands that probing might have sent earlier. Should help devices
+ * respond more quickly and speed up QCDM probing.
+ */
+ verinfo = g_byte_array_sized_new (10);
+ g_byte_array_append (verinfo, &marker, 1);
+ len = qcdm_cmd_version_info_new ((char *) (verinfo->data + 1), 9);
+ if (len <= 0) {
+ g_byte_array_unref (verinfo);
+ port_probe_task_return_error (self,
+ g_error_new (MM_SERIAL_ERROR,
+ MM_SERIAL_ERROR_OPEN_FAILED,
+ "(%s/%s) Failed to create QCDM version info command",
+ mm_kernel_device_get_subsystem (self->priv->port),
+ mm_kernel_device_get_name (self->priv->port)));
+ return G_SOURCE_REMOVE;
+ }
+ verinfo->len = len + 1;
+
+ /* Queuing the command takes ownership over it; save it for the second try */
+ verinfo2 = g_byte_array_sized_new (verinfo->len);
+ g_byte_array_append (verinfo2, verinfo->data, verinfo->len);
+ g_object_set_data_full (G_OBJECT (self), "cmd2", verinfo2, (GDestroyNotify) g_byte_array_unref);
+
+ mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (ctx->serial),
+ verinfo,
+ 3,
+ NULL,
+ (GAsyncReadyCallback) serial_probe_qcdm_parse_response,
+ self);
g_byte_array_unref (verinfo);
- port_probe_task_return_error (self,
- g_error_new (MM_SERIAL_ERROR,
- MM_SERIAL_ERROR_OPEN_FAILED,
- "(%s/%s) Failed to create QCDM version info command",
- mm_kernel_device_get_subsystem (self->priv->port),
- mm_kernel_device_get_name (self->priv->port)));
+
return G_SOURCE_REMOVE;
}
- verinfo->len = len + 1;
-
- /* Queuing the command takes ownership over it; save it for the second try */
- verinfo2 = g_byte_array_sized_new (verinfo->len);
- g_byte_array_append (verinfo2, verinfo->data, verinfo->len);
- g_object_set_data_full (G_OBJECT (self), "cmd2", verinfo2, (GDestroyNotify) g_byte_array_unref);
-
- mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (ctx->serial),
- verinfo,
- 3,
- NULL,
- (GAsyncReadyCallback) serial_probe_qcdm_parse_response,
- self);
- g_byte_array_unref (verinfo);
-
- return G_SOURCE_REMOVE;
}
/***************************************************************/
@@ -1428,6 +1443,7 @@ mm_port_probe_run (MMPortProbe *self,
gboolean at_send_lf,
const MMPortProbeAtCommand *at_custom_probe,
const MMAsyncMethod *at_custom_init,
+ gboolean qcdm_required,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -1453,6 +1469,7 @@ mm_port_probe_run (MMPortProbe *self,
ctx->at_custom_probe = at_custom_probe;
ctx->at_custom_init = at_custom_init ? (MMPortProbeAtCustomInit)at_custom_init->async : NULL;
ctx->at_custom_init_finish = at_custom_init ? (MMPortProbeAtCustomInitFinish)at_custom_init->finish : NULL;
+ ctx->qcdm_required = qcdm_required;
ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
/* The context will be owned by the task */
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-07 19:09:57 +0000