X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=linux_termios.c;h=92793df06d61b7de6d63bd3624a097e4b57ae280;hb=27911925c11b01943e2a569ebb71fe259c387329;hp=5343e6e8268f15253aa82fb2f6983b76427591f5;hpb=24abdb680fa5ab99b2e58b0196082c111f5baabc;p=libserialport.git

diff --git a/linux_termios.c b/linux_termios.c
index 5343e6e..92793df 100644
--- a/linux_termios.c
+++ b/linux_termios.c
@@ -33,12 +33,11 @@
  * TCSETX/TCGETX ioctls used with struct termiox, others do not.
  */
 
-#ifdef __linux__
-
+#include <stdlib.h>
 #include <linux/termios.h>
 #include "linux_termios.h"
 
-int get_termios_get_ioctl(void)
+SP_PRIV unsigned long get_termios_get_ioctl(void)
 {
 #ifdef HAVE_TERMIOS2
 	return TCGETS2;
@@ -47,7 +46,7 @@ int get_termios_get_ioctl(void)
 #endif
 }
 
-int get_termios_set_ioctl(void)
+SP_PRIV unsigned long get_termios_set_ioctl(void)
 {
 #ifdef HAVE_TERMIOS2
 	return TCSETS2;
@@ -56,7 +55,7 @@ int get_termios_set_ioctl(void)
 #endif
 }
 
-int get_termios_size(void)
+SP_PRIV size_t get_termios_size(void)
 {
 #ifdef HAVE_TERMIOS2
 	return sizeof(struct termios2);
@@ -65,7 +64,8 @@ int get_termios_size(void)
 #endif
 }
 
-int get_termios_speed(void *data)
+#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && defined(HAVE_BOTHER)
+SP_PRIV int get_termios_speed(void *data)
 {
 #ifdef HAVE_TERMIOS2
 	struct termios2 *term = (struct termios2 *) data;
@@ -78,7 +78,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 +89,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 size_t 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