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

Remove need to include linux_termios.h on non-Linux.

Browse Source
This commit is contained in:
Martin Ling 2014-01-03 12:16:41 +01:00
parent 27e231ff35
commit bd791fe121
4 changed files with 51 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -24,9 +24,9 @@ AM_CPPFLAGS = -I$(top_srcdir)
lib_LTLIBRARIES = libserialport.la lib_LTLIBRARIES = libserialport.la
libserialport_la_SOURCES = serialport.c linux_termios.h libserialport_la_SOURCES = serialport.c
if LINUX if LINUX
libserialport_la_SOURCES += linux_termios.c libserialport_la_SOURCES += linux_termios.c linux_termios.h
endif endif
libserialport_la_LIBADD = $(LIBOBJS) libserialport_la_LIBADD = $(LIBOBJS)

24
linux_termios.c
View File

@ -96,36 +96,32 @@ int get_termiox_size(void)
return sizeof(struct termiox); return sizeof(struct termiox);
} }
int get_termiox_flow(void *data) int get_termiox_flow(void *data, int *rts, int *cts, int *dtr, int *dsr)
{ {
struct termiox *termx = (struct termiox *) data; struct termiox *termx = (struct termiox *) data;
int flags = 0; int flags = 0;
if (termx->x_cflag & RTSXOFF) *rts = (termx->x_cflag & RTSXOFF);
flags |= RTS_FLOW; *cts = (termx->x_cflag & CTSXON);
if (termx->x_cflag & CTSXON) *dtr = (termx->x_cflag & DTRXOFF);
flags |= CTS_FLOW; *dsr = (termx->x_cflag & DSRXON);
if (termx->x_cflag & DTRXOFF)
flags |= DTR_FLOW;
if (termx->x_cflag & DSRXON)
flags |= DSR_FLOW;
return flags; return flags;
} }
void set_termiox_flow(void *data, int flags) void set_termiox_flow(void *data, int rts, int cts, int dtr, int dsr)
{ {
struct termiox *termx = (struct termiox *) data; struct termiox *termx = (struct termiox *) data;
termx->x_cflag &= ~(RTSXOFF | CTSXON | DTRXOFF | DSRXON); termx->x_cflag &= ~(RTSXOFF | CTSXON | DTRXOFF | DSRXON);
if (flags & RTS_FLOW) if (rts)
termx->x_cflag |= RTSXOFF; termx->x_cflag |= RTSXOFF;
if (flags & CTS_FLOW) if (cts)
termx->x_cflag |= CTSXON; termx->x_cflag |= CTSXON;
if (flags & DTR_FLOW) if (dtr)
termx->x_cflag |= DTRXOFF; termx->x_cflag |= DTRXOFF;
if (flags & DSR_FLOW) if (dsr)
termx->x_cflag |= DSRXON; termx->x_cflag |= DSRXON;
} }
#endif #endif

9
linux_termios.h
View File

@ -20,18 +20,13 @@
#ifndef LIBSERIALPORT_LINUX_TERMIOS_H #ifndef LIBSERIALPORT_LINUX_TERMIOS_H
#define LIBSERIALPORT_LINUX_TERMIOS_H #define LIBSERIALPORT_LINUX_TERMIOS_H
#define RTS_FLOW 1
#define CTS_FLOW 2
#define DTR_FLOW 4
#define DSR_FLOW 8
int get_termios_get_ioctl(void); int get_termios_get_ioctl(void);
int get_termios_set_ioctl(void); int get_termios_set_ioctl(void);
int get_termios_size(void); int get_termios_size(void);
int get_termios_speed(void *data); int get_termios_speed(void *data);
void set_termios_speed(void *data, int speed); void set_termios_speed(void *data, int speed);
int get_termiox_size(void); int get_termiox_size(void);
int get_termiox_flow(void *data); int get_termiox_flow(void *data, int *rts, int *cts, int *dtr, int *dsr);
void set_termiox_flow(void *data, int flags); void set_termiox_flow(void *data, int rts, int cts, int dtr, int dsr);
#endif #endif

73
serialport.c
View File

@ -70,10 +70,6 @@
#define TIOCOUTQ FIONWRITE #define TIOCOUTQ FIONWRITE
#endif #endif
#ifndef _WIN32
#include "linux_termios.h"
#endif
#include "libserialport.h" #include "libserialport.h"
struct sp_port { struct sp_port {
@ -111,7 +107,10 @@ struct port_data {
struct termios term; struct termios term;
int controlbits; int controlbits;
int termiox_supported; int termiox_supported;
int flow; int rts_flow;
int cts_flow;
int dtr_flow;
int dsr_flow;
#endif #endif
}; };
@ -1514,55 +1513,57 @@ static enum sp_return set_baudrate(int fd, int baudrate)
} }
#ifdef USE_TERMIOX #ifdef USE_TERMIOX
static enum sp_return get_flow(int fd, int *flow) static enum sp_return get_flow(int fd, struct port_data *data)
{ {
void *data; void *termx;
TRACE("%d, %p", fd, flow); TRACE("%d, %p", fd, data);
DEBUG("Getting advanced flow control"); DEBUG("Getting advanced flow control");
if (!(data = malloc(get_termiox_size()))) if (!(termx = malloc(get_termiox_size())))
RETURN_ERROR(SP_ERR_MEM, "termiox malloc failed"); RETURN_ERROR(SP_ERR_MEM, "termiox malloc failed");
if (ioctl(fd, TCGETX, data) < 0) { if (ioctl(fd, TCGETX, termx) < 0) {
free(data); free(termx);
RETURN_FAIL("getting termiox failed"); RETURN_FAIL("getting termiox failed");
} }
*flow = get_termiox_flow(data); get_termiox_flow(termx, &data->rts_flow, &data->cts_flow,
&data->dtr_flow, &data->dsr_flow);
free(data); free(termx);
RETURN_OK(); RETURN_OK();
} }
static enum sp_return set_flow(int fd, int flow) static enum sp_return set_flow(int fd, struct port_data *data)
{ {
void *data; void *termx;
TRACE("%d, %d", fd, flow); TRACE("%d, %p", fd, data);
DEBUG("Getting advanced flow control"); DEBUG("Getting advanced flow control");
if (!(data = malloc(get_termiox_size()))) if (!(termx = malloc(get_termiox_size())))
RETURN_ERROR(SP_ERR_MEM, "termiox malloc failed"); RETURN_ERROR(SP_ERR_MEM, "termiox malloc failed");
if (ioctl(fd, TCGETX, data) < 0) { if (ioctl(fd, TCGETX, termx) < 0) {
free(data); free(termx);
RETURN_FAIL("getting termiox failed"); RETURN_FAIL("getting termiox failed");
} }
DEBUG("Setting advanced flow control"); DEBUG("Setting advanced flow control");
set_termiox_flow(data, flow); set_termiox_flow(termx, data->rts_flow, data->cts_flow,
data->dtr_flow, data->dsr_flow);
if (ioctl(fd, TCSETX, data) < 0) { if (ioctl(fd, TCSETX, termx) < 0) {
free(data); free(termx);
RETURN_FAIL("setting termiox failed"); RETURN_FAIL("setting termiox failed");
} }
free(data); free(termx);
RETURN_OK(); RETURN_OK();
} }
@ -1682,7 +1683,7 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
RETURN_FAIL("TIOCMGET ioctl failed"); RETURN_FAIL("TIOCMGET ioctl failed");
#ifdef USE_TERMIOX #ifdef USE_TERMIOX
int ret = get_flow(port->fd, &data->flow); int ret = get_flow(port->fd, data);
if (ret == SP_ERR_FAIL && errno == EINVAL) if (ret == SP_ERR_FAIL && errno == EINVAL)
data->termiox_supported = 0; data->termiox_supported = 0;
@ -1745,21 +1746,21 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
config->rts = SP_RTS_FLOW_CONTROL; config->rts = SP_RTS_FLOW_CONTROL;
config->cts = SP_CTS_FLOW_CONTROL; config->cts = SP_CTS_FLOW_CONTROL;
} else { } else {
if (data->termiox_supported && data->flow & RTS_FLOW) if (data->termiox_supported && data->rts_flow)
config->rts = SP_RTS_FLOW_CONTROL; config->rts = SP_RTS_FLOW_CONTROL;
else else
config->rts = (data->controlbits & TIOCM_RTS) ? SP_RTS_ON : SP_RTS_OFF; config->rts = (data->controlbits & TIOCM_RTS) ? SP_RTS_ON : SP_RTS_OFF;
config->cts = (data->termiox_supported && data->flow & CTS_FLOW) ? config->cts = (data->termiox_supported && data->cts_flow) ?
SP_CTS_FLOW_CONTROL : SP_CTS_IGNORE; SP_CTS_FLOW_CONTROL : SP_CTS_IGNORE;
} }
if (data->termiox_supported && data->flow & DTR_FLOW) if (data->termiox_supported && data->dtr_flow)
config->dtr = SP_DTR_FLOW_CONTROL; config->dtr = SP_DTR_FLOW_CONTROL;
else else
config->dtr = (data->controlbits & TIOCM_DTR) ? SP_DTR_ON : SP_DTR_OFF; config->dtr = (data->controlbits & TIOCM_DTR) ? SP_DTR_ON : SP_DTR_OFF;
config->dsr = (data->termiox_supported && data->flow & DSR_FLOW) ? config->dsr = (data->termiox_supported && data->dsr_flow) ?
SP_DSR_FLOW_CONTROL : SP_DSR_IGNORE; SP_DSR_FLOW_CONTROL : SP_DSR_IGNORE;
if (data->term.c_iflag & IXOFF) { if (data->term.c_iflag & IXOFF) {
@ -2033,7 +2034,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
if (config->rts >= 0 || config->cts >= 0) { if (config->rts >= 0 || config->cts >= 0) {
if (data->termiox_supported) { if (data->termiox_supported) {
data->flow &= ~(RTS_FLOW | CTS_FLOW); data->rts_flow = data->cts_flow = 0;
switch (config->rts) { switch (config->rts) {
case SP_RTS_OFF: case SP_RTS_OFF:
case SP_RTS_ON: case SP_RTS_ON:
@ -2042,15 +2043,15 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
RETURN_FAIL("Setting RTS signal level failed"); RETURN_FAIL("Setting RTS signal level failed");
break; break;
case SP_RTS_FLOW_CONTROL: case SP_RTS_FLOW_CONTROL:
data->flow |= RTS_FLOW; data->rts_flow = 1;
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->cts_flow = 1;
if (data->flow & (RTS_FLOW | CTS_FLOW)) if (data->rts_flow && data->cts_flow)
data->term.c_iflag |= CRTSCTS; data->term.c_iflag |= CRTSCTS;
else else
data->term.c_iflag &= ~CRTSCTS; data->term.c_iflag &= ~CRTSCTS;
@ -2088,7 +2089,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
if (config->dtr >= 0 || config->dsr >= 0) { if (config->dtr >= 0 || config->dsr >= 0) {
if (data->termiox_supported) { if (data->termiox_supported) {
data->flow &= ~(DTR_FLOW | DSR_FLOW); data->dtr_flow = data->dsr_flow = 0;
switch (config->dtr) { switch (config->dtr) {
case SP_DTR_OFF: case SP_DTR_OFF:
case SP_DTR_ON: case SP_DTR_ON:
@ -2097,13 +2098,13 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
RETURN_FAIL("Setting DTR signal level failed"); RETURN_FAIL("Setting DTR signal level failed");
break; break;
case SP_DTR_FLOW_CONTROL: case SP_DTR_FLOW_CONTROL:
data->flow |= DTR_FLOW; data->dtr_flow = 1;
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->dsr_flow = 1;
} else { } else {
/* DTR/DSR flow control not supported. */ /* DTR/DSR flow control not supported. */
if (config->dtr == SP_DTR_FLOW_CONTROL || config->dsr == SP_DSR_FLOW_CONTROL) if (config->dtr == SP_DTR_FLOW_CONTROL || config->dsr == SP_DSR_FLOW_CONTROL)
@ -2154,7 +2155,7 @@ static enum sp_return set_config(struct sp_port *port, struct port_data *data,
TRY(set_baudrate(port->fd, config->baudrate)); TRY(set_baudrate(port->fd, config->baudrate));
#ifdef USE_TERMIOX #ifdef USE_TERMIOX
if (data->termiox_supported) if (data->termiox_supported)
TRY(set_flow(port->fd, data->flow)); TRY(set_flow(port->fd, data));
#endif #endif
#endif #endif