From: Uwe Hermann Date: Fri, 22 Nov 2013 14:53:34 +0000 (+0100) Subject: Minor cosmetics. X-Git-Tag: libserialport-0.1.0~76 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=24abdb680fa5ab99b2e58b0196082c111f5baabc;p=libserialport.git Minor cosmetics. --- diff --git a/libserialport.h.in b/libserialport.h.in index 85fd098..c24550e 100644 --- a/libserialport.h.in +++ b/libserialport.h.in @@ -18,7 +18,6 @@ */ /** - * * @mainpage libserialport API * * Introduction diff --git a/linux_termios.c b/linux_termios.c index 743af60..5343e6e 100644 --- a/linux_termios.c +++ b/linux_termios.c @@ -99,8 +99,8 @@ int get_termiox_size(void) int get_termiox_flow(void *data) { struct termiox *termx = (struct termiox *) data; - int flags = 0; + if (termx->x_cflag & RTSXOFF) flags |= RTS_FLOW; if (termx->x_cflag & CTSXON) @@ -131,4 +131,3 @@ void set_termiox_flow(void *data, int flags) #endif #endif - diff --git a/serialport.c b/serialport.c index 35bb09b..5e77607 100644 --- a/serialport.c +++ b/serialport.c @@ -1028,7 +1028,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data, /* Non-standard baud rate */ if (i == NUM_STD_BAUDRATES) { #ifdef __APPLE__ - /* Set "dummy" baud rate */ + /* Set "dummy" baud rate. */ if (cfsetspeed(&data->term, B9600) < 0) return SP_ERR_FAIL; baud_nonstd = config->baudrate; @@ -1096,18 +1096,17 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data, #ifdef USE_TERMIOX data->flow &= ~(RTS_FLOW | CTS_FLOW); switch (config->rts) { - case SP_RTS_OFF: - case SP_RTS_ON: - controlbits = TIOCM_RTS; - if (ioctl(port->fd, config->rts == SP_RTS_ON ? TIOCMBIS : TIOCMBIC, - &controlbits) < 0) - return SP_ERR_FAIL; - break; - case SP_RTS_FLOW_CONTROL: - data->flow |= RTS_FLOW; - break; - default: - break; + case SP_RTS_OFF: + case SP_RTS_ON: + controlbits = TIOCM_RTS; + if (ioctl(port->fd, config->rts == SP_RTS_ON ? TIOCMBIS : TIOCMBIC, &controlbits) < 0) + return SP_ERR_FAIL; + break; + case SP_RTS_FLOW_CONTROL: + data->flow |= RTS_FLOW; + break; + default: + break; } if (config->cts == SP_CTS_FLOW_CONTROL) data->flow |= CTS_FLOW; @@ -1152,18 +1151,17 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data, #ifdef USE_TERMIOX data->flow &= ~(DTR_FLOW | DSR_FLOW); switch (config->dtr) { - case SP_DTR_OFF: - case SP_DTR_ON: - controlbits = TIOCM_DTR; - if (ioctl(port->fd, config->dtr == SP_DTR_ON ? TIOCMBIS : TIOCMBIC, - &controlbits) < 0) - return SP_ERR_FAIL; - break; - case SP_DTR_FLOW_CONTROL: - data->flow |= DTR_FLOW; - break; - default: - break; + case SP_DTR_OFF: + case SP_DTR_ON: + controlbits = TIOCM_DTR; + if (ioctl(port->fd, config->dtr == SP_DTR_ON ? TIOCMBIS : TIOCMBIC, &controlbits) < 0) + return SP_ERR_FAIL; + break; + case SP_DTR_FLOW_CONTROL: + data->flow |= DTR_FLOW; + break; + default: + break; } if (config->dsr == SP_DSR_FLOW_CONTROL) data->flow |= DSR_FLOW;