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

port-serial: improve logging in mm_port_serial_set_flow_control()

Browse Source
This commit is contained in:
Aleksander Morgado
2018-09-10 23:15:26 +02:00
committed by Dan Williams
parent 727567cf58
commit fc1beefe92
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/mm-port-serial.c
View File

@@ -1846,20 +1846,40 @@ mm_port_serial_set_flow_control (MMPortSerial *self,
GError **error)
{
struct termios options;
gchar *flow_control_str = NULL;
GError *inner_error = NULL;
/* retrieve current settings */
memset (&options, 0, sizeof (struct termios));
if (tcgetattr (self->priv->fd, &options) != 0) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"couldn't get serial port attributes: %s", g_strerror (errno));
inner_error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"couldn't get serial port attributes: %s", g_strerror (errno));
goto out;
}
flow_control_str = mm_flow_control_build_string_from_mask (flow_control);
/* Return if current settings are already what we want */
if (!set_flow_control_termios (self, flow_control, &options)) {
mm_dbg ("(%s): no need to change flow control settings: already %s",
mm_port_get_device (MM_PORT (self)), flow_control_str);
goto out;
}
if (!internal_tcsetattr (self, self->priv->fd, &options, &inner_error))
goto out;
mm_dbg ("(%s): flow control settings updated to %s",
mm_port_get_device (MM_PORT (self)), flow_control_str);
out:
g_free (flow_control_str);
if (inner_error) {
g_propagate_error (error, inner_error);
return FALSE;
}
/* Return if current settings are already what we want */
if (!set_flow_control_termios (self, flow_control, &options))
return TRUE;
return internal_tcsetattr (self, self->priv->fd, &options, error);
return TRUE;
}
MMFlowControl