X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=linux_termios.c;h=7c1540a2ddb4e0450a4d1e4c5b66b985a263fb6c;hb=0666ccc7ca446ce2960630e2707389852c812284;hp=328c4d39b4024bc06fc218a52a69e7ac2cbd079c;hpb=33fd8804b8a81da4cc3ffcf43ded2288381aad49;p=libserialport.git diff --git a/linux_termios.c b/linux_termios.c index 328c4d3..7c1540a 100644 --- a/linux_termios.c +++ b/linux_termios.c @@ -33,12 +33,10 @@ * TCSETX/TCGETX ioctls used with struct termiox, others do not. */ -#if defined(__linux__) && !defined(__ANDROID__) - #include #include "linux_termios.h" -int get_termios_get_ioctl(void) +SP_PRIV int get_termios_get_ioctl(void) { #ifdef HAVE_TERMIOS2 return TCGETS2; @@ -47,7 +45,7 @@ int get_termios_get_ioctl(void) #endif } -int get_termios_set_ioctl(void) +SP_PRIV int get_termios_set_ioctl(void) { #ifdef HAVE_TERMIOS2 return TCSETS2; @@ -56,7 +54,7 @@ int get_termios_set_ioctl(void) #endif } -int get_termios_size(void) +SP_PRIV int get_termios_size(void) { #ifdef HAVE_TERMIOS2 return sizeof(struct termios2); @@ -65,7 +63,8 @@ int get_termios_size(void) #endif } -int get_termios_speed(void *data) +#if defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED) +SP_PRIV int get_termios_speed(void *data) { #ifdef HAVE_TERMIOS2 struct termios2 *term = (struct termios2 *) data; @@ -78,7 +77,7 @@ int get_termios_speed(void *data) return term->c_ispeed; } -void set_termios_speed(void *data, int speed) +SP_PRIV void set_termios_speed(void *data, int speed) { #ifdef HAVE_TERMIOS2 struct termios2 *term = (struct termios2 *) data; @@ -89,45 +88,40 @@ void set_termios_speed(void *data, int speed) term->c_cflag |= BOTHER; term->c_ispeed = term->c_ospeed = speed; } +#endif #ifdef HAVE_TERMIOX -int get_termiox_size(void) +SP_PRIV int get_termiox_size(void) { return sizeof(struct termiox); } -int get_termiox_flow(void *data) +SP_PRIV int get_termiox_flow(void *data, int *rts, int *cts, int *dtr, int *dsr) { struct termiox *termx = (struct termiox *) data; int flags = 0; - if (termx->x_cflag & RTSXOFF) - flags |= RTS_FLOW; - if (termx->x_cflag & CTSXON) - flags |= CTS_FLOW; - if (termx->x_cflag & DTRXOFF) - flags |= DTR_FLOW; - if (termx->x_cflag & DSRXON) - flags |= DSR_FLOW; + *rts = (termx->x_cflag & RTSXOFF); + *cts = (termx->x_cflag & CTSXON); + *dtr = (termx->x_cflag & DTRXOFF); + *dsr = (termx->x_cflag & DSRXON); return flags; } -void set_termiox_flow(void *data, int flags) +SP_PRIV void set_termiox_flow(void *data, int rts, int cts, int dtr, int dsr) { struct termiox *termx = (struct termiox *) data; termx->x_cflag &= ~(RTSXOFF | CTSXON | DTRXOFF | DSRXON); - if (flags & RTS_FLOW) + if (rts) termx->x_cflag |= RTSXOFF; - if (flags & CTS_FLOW) + if (cts) termx->x_cflag |= CTSXON; - if (flags & DTR_FLOW) + if (dtr) termx->x_cflag |= DTRXOFF; - if (flags & DSR_FLOW) + if (dsr) termx->x_cflag |= DSRXON; } #endif - -#endif