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

port-serial: new internal method to run tcsetattr()

Browse Source 
The method takes care of looping if EAGAIN errors happen, as well as
checking whether all attributes were set or not.
This commit is contained in:
Aleksander Morgado
2017-04-18 18:08:57 +02:00
parent ff6726df11
commit 3223b56ba9
1 changed files with 57 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-port-serial.c
+57 -62
View File
@@ -346,10 +346,63 @@ parse_stopbits (guint i)
return stopbits;
}
static gboolean
internal_tcsetattr (MMPortSerial *self,
gint fd,
const struct termios *options,
GError **error)
{
guint count;
struct termios other;
#define MAX_TCSETATTR_RETRIES 4
for (count = 0; count < MAX_TCSETATTR_RETRIES; count++) {
/* try to set the new port attributes */
errno = 0;
if (tcsetattr (fd, TCSANOW, options) == 0)
break;
/* hard error if not EAGAIN */
if (errno != EAGAIN) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"couldn't set serial port attributes: %s", g_strerror (errno));
return FALSE;
}
/* try a few times if EAGAIN */
g_usleep (100000);
}
/* too many retries? */
if (count == MAX_TCSETATTR_RETRIES) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"couldn't set serial port attributes: too many retries (%u)", count);
return FALSE;
}
/* tcsetattr() returns 0 if any of the requested attributes could be set,
* so we should double-check that all were set and log if not. Just with
* debug level, as we're ignoring this issue all together anyway.
*/
memset (&other, 0, sizeof (struct termios));
errno = 0;
if (tcgetattr (fd, &other) != 0)
mm_dbg ("(%s): couldn't get serial port attributes after setting them: %s",
mm_port_get_device (MM_PORT (self)), g_strerror (errno));
else if (memcmp (options, &other, sizeof (struct termios)) != 0)
mm_dbg ("(%s): port attributes not fully set",
mm_port_get_device (MM_PORT (self)));
#undef MAX_TCSETATTR_RETRIES
return TRUE;
}
static gboolean
real_config_fd (MMPortSerial *self, int fd, GError **error)
{
struct termios stbuf, other;
struct termios stbuf;
guint speed;
gint bits;
gint parity;
@@ -416,32 +469,7 @@ real_config_fd (MMPortSerial *self, int fd, GError **error)
return FALSE;
}
if (tcsetattr (fd, TCSANOW, &stbuf) < 0) {
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"%s: failed to set serial port attributes; errno %d",
__func__, errno);
return FALSE;
}
/* tcsetattr() returns 0 if any of the requested attributes could be set,
* so we should double-check that all were set and log a warning if not.
*/
memset (&other, 0, sizeof (struct termios));
errno = 0;
if (tcgetattr (fd, &other) != 0) {
mm_warn ("(%s): tcgetattr() error: %d",
mm_port_get_device (MM_PORT (self)),
errno);
}
if (memcmp (&stbuf, &other, sizeof (other)) != 0) {
mm_warn ("(%s): port attributes not fully set",
mm_port_get_device (MM_PORT (self)));
}
return TRUE;
return internal_tcsetattr (self, fd, &stbuf, error);
}
static void
@@ -1576,15 +1604,11 @@ static gboolean
set_speed (MMPortSerial *self, speed_t speed, GError **error)
{
struct termios options;
int fd, count = 4;
gboolean success = FALSE;
g_assert (self->priv->fd >= 0);
fd = self->priv->fd;
memset (&options, 0, sizeof (struct termios));
if (tcgetattr (fd, &options) != 0) {
if (tcgetattr (self->priv->fd, &options) != 0) {
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
@@ -1601,36 +1625,7 @@ set_speed (MMPortSerial *self, speed_t speed, GError **error)
if (self->priv->rts_cts)
options.c_cflag |= (CRTSCTS);
while (count-- > 0) {
if (tcsetattr (fd, TCSANOW, &options) == 0) {
success = TRUE;
break; /* Operation successful */
}
/* Try a few times if EAGAIN */
if (errno == EAGAIN)
g_usleep (100000);
else {
/* If not EAGAIN, hard error */
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"%s: tcsetattr() error %d",
__func__, errno);
return FALSE;
}
}
if (!success) {
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"%s: tcsetattr() retry timeout",
__func__);
return FALSE;
}
return TRUE;
return internal_tcsetattr (self, self->priv->fd, &options, error);
}
/*****************************************************************************/