diff options
| author | Alfonso Sánchez-Beato <alfonso.sanchez-beato@canonical.com> | 2018-09-03 09:06:27 +0200 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2018-09-12 17:15:46 +0000 |
| commit | 94879ce1ce7c04060d74e6dcca610e2f239b5820 (patch) | |
| tree | 90e9369404a69ff7e0fd3857a9eacaf1cd0bce4c | |
| parent | 4e69c10c2dd1409eb8e1b82051e758ff13164f35 (diff) | |
| download | ModemManager-94879ce1ce7c04060d74e6dcca610e2f239b5820.tar.gz | |
base-modem,port-probe: set serial port flow control from udev tag
Set the serial port flow control from the udev tag
ID_MM_TTY_FLOW_CONTROL before accessing the port.
| -rw-r--r-- | src/mm-base-modem.c | 10 | ||||
| -rw-r--r-- | src/mm-port-probe.c | 16 |
2 files changed, 25 insertions, 1 deletions
diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c index 2fa39b329..cb044419e 100644 --- a/src/mm-base-modem.c +++ b/src/mm-base-modem.c @@ -151,6 +151,7 @@ mm_base_modem_grab_port (MMBaseModem *self, gchar *key; const gchar *subsys; const gchar *name; + const gchar *flow_control_tag; g_return_val_if_fail (MM_IS_BASE_MODEM (self), FALSE); g_return_val_if_fail (MM_IS_KERNEL_DEVICE (kernel_device), FALSE); @@ -246,11 +247,18 @@ mm_base_modem_grab_port (MMBaseModem *self, G_CALLBACK (serial_port_timed_out_cb), self); - /* For serial ports, optionally use a specific baudrate */ + /* For serial ports, optionally use a specific baudrate and flow control */ if (mm_kernel_device_has_property (kernel_device, "ID_MM_TTY_BAUDRATE")) g_object_set (port, MM_PORT_SERIAL_BAUD, mm_kernel_device_get_property_as_int (kernel_device, "ID_MM_TTY_BAUDRATE"), NULL); + flow_control_tag = mm_kernel_device_get_property (kernel_device, + "ID_MM_TTY_FLOW_CONTROL"); + if (flow_control_tag) + g_object_set (port, + MM_PORT_SERIAL_FLOW_CONTROL, + mm_parse_flow_control_tag (flow_control_tag), + NULL); } /* Net ports... */ else if (g_str_equal (subsys, "net")) { diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index 329e35cb5..84a56761e 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -711,6 +711,7 @@ serial_probe_qcdm (MMPortProbe *self) gint len; guint8 marker = 0x7E; PortProbeRunContext *ctx; + const gchar *flow_control_tag; g_assert (self->priv->task); ctx = g_task_get_task_data (self->priv->task); @@ -751,6 +752,13 @@ serial_probe_qcdm (MMPortProbe *self) g_object_set (ctx->serial, MM_PORT_SERIAL_BAUD, mm_kernel_device_get_property_as_int (self->priv->port, "ID_MM_TTY_BAUDRATE"), NULL); + flow_control_tag = mm_kernel_device_get_property (self->priv->port, + "ID_MM_TTY_FLOW_CONTROL"); + if (flow_control_tag) + g_object_set (ctx->serial, + MM_PORT_SERIAL_FLOW_CONTROL, + mm_parse_flow_control_tag (flow_control_tag), + NULL); /* Try to open the port */ if (!mm_port_serial_open (ctx->serial, &error)) { @@ -1256,6 +1264,7 @@ serial_open_at (MMPortProbe *self) { GError *error = NULL; PortProbeRunContext *ctx; + const gchar *flow_control_tag; g_assert (self->priv->task); ctx = g_task_get_task_data (self->priv->task); @@ -1295,6 +1304,13 @@ serial_open_at (MMPortProbe *self) g_object_set (ctx->serial, MM_PORT_SERIAL_BAUD, mm_kernel_device_get_property_as_int (self->priv->port, "ID_MM_TTY_BAUDRATE"), NULL); + flow_control_tag = mm_kernel_device_get_property (self->priv->port, + "ID_MM_TTY_FLOW_CONTROL"); + if (flow_control_tag) + g_object_set (ctx->serial, + MM_PORT_SERIAL_FLOW_CONTROL, + mm_parse_flow_control_tag (flow_control_tag), + NULL); parser = mm_serial_parser_v1_new (); mm_serial_parser_v1_add_filter (parser, |