mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

Minor cosmetics.

Browse Source
This commit is contained in:
Uwe Hermann 2013-11-22 15:53:34 +01:00
parent 8645feda60
commit 24abdb680f
3 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libserialport.h.in
View File

@ -18,7 +18,6 @@
*/ */
/** /**
*
* @mainpage libserialport API * @mainpage libserialport API
* *
* Introduction * Introduction

3
linux_termios.c
View File

@ -99,8 +99,8 @@ int get_termiox_size(void)
int get_termiox_flow(void *data) int get_termiox_flow(void *data)
{ {
struct termiox *termx = (struct termiox *) data; struct termiox *termx = (struct termiox *) data;
int flags = 0; int flags = 0;
if (termx->x_cflag & RTSXOFF) if (termx->x_cflag & RTSXOFF)
flags |= RTS_FLOW; flags |= RTS_FLOW;
if (termx->x_cflag & CTSXON) if (termx->x_cflag & CTSXON)
@ -131,4 +131,3 @@ void set_termiox_flow(void *data, int flags)
#endif #endif
#endif #endif

48
serialport.c
View File

@ -1028,7 +1028,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
/* Non-standard baud rate */ /* Non-standard baud rate */
if (i == NUM_STD_BAUDRATES) { if (i == NUM_STD_BAUDRATES) {
#ifdef __APPLE__ #ifdef __APPLE__
/* Set "dummy" baud rate */ /* Set "dummy" baud rate. */
if (cfsetspeed(&data->term, B9600) < 0) if (cfsetspeed(&data->term, B9600) < 0)
return SP_ERR_FAIL; return SP_ERR_FAIL;
baud_nonstd = config->baudrate; 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 #ifdef USE_TERMIOX
data->flow &= ~(RTS_FLOW | CTS_FLOW); data->flow &= ~(RTS_FLOW | CTS_FLOW);
switch (config->rts) { switch (config->rts) {
case SP_RTS_OFF: case SP_RTS_OFF:
case SP_RTS_ON: case SP_RTS_ON:
controlbits = TIOCM_RTS; controlbits = TIOCM_RTS;
if (ioctl(port->fd, config->rts == SP_RTS_ON ? TIOCMBIS : TIOCMBIC, if (ioctl(port->fd, config->rts == SP_RTS_ON ? TIOCMBIS : TIOCMBIC, &controlbits) < 0)
&controlbits) < 0) return SP_ERR_FAIL;
return SP_ERR_FAIL; break;
break; case SP_RTS_FLOW_CONTROL:
case SP_RTS_FLOW_CONTROL: data->flow |= RTS_FLOW;
data->flow |= RTS_FLOW; break;
break; default:
default: break;
break;
} }
if (config->cts == SP_CTS_FLOW_CONTROL) if (config->cts == SP_CTS_FLOW_CONTROL)
data->flow |= CTS_FLOW; 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 #ifdef USE_TERMIOX
data->flow &= ~(DTR_FLOW | DSR_FLOW); data->flow &= ~(DTR_FLOW | DSR_FLOW);
switch (config->dtr) { switch (config->dtr) {
case SP_DTR_OFF: case SP_DTR_OFF:
case SP_DTR_ON: case SP_DTR_ON:
controlbits = TIOCM_DTR; controlbits = TIOCM_DTR;
if (ioctl(port->fd, config->dtr == SP_DTR_ON ? TIOCMBIS : TIOCMBIC, if (ioctl(port->fd, config->dtr == SP_DTR_ON ? TIOCMBIS : TIOCMBIC, &controlbits) < 0)
&controlbits) < 0) return SP_ERR_FAIL;
return SP_ERR_FAIL; break;
break; case SP_DTR_FLOW_CONTROL:
case SP_DTR_FLOW_CONTROL: data->flow |= DTR_FLOW;
data->flow |= DTR_FLOW; break;
break; default:
default: break;
break;
} }
if (config->dsr == SP_DSR_FLOW_CONTROL) if (config->dsr == SP_DSR_FLOW_CONTROL)
data->flow |= DSR_FLOW; data->flow |= DSR_FLOW;