X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=linux_termios.c;h=92793df06d61b7de6d63bd3624a097e4b57ae280;hb=ec4b55ae25c368e30a5db6ab6cb33bb6abeca46c;hp=68c98e002f16ec7dd0c6b5ffbac1d87e4a4d5ff5;hpb=7a6d2196e043a7de86a5675f9fffa0ff0ec33e72;p=libserialport.git

diff --git a/linux_termios.c b/linux_termios.c
index 68c98e0..92793df 100644
--- a/linux_termios.c
+++ b/linux_termios.c
@@ -17,10 +17,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * At the time of writing, glibc does not support the Linux kernel interfaces
+ * for setting non-standard baud rates and flow control. We therefore have to
+ * prepare the correct ioctls ourselves, for which we need the declarations in
+ * linux/termios.h.
+ *
+ * We can't include linux/termios.h in serialport.c however, because its
+ * contents conflict with the termios.h provided by glibc. So this file exists
+ * to isolate the bits of code which use the kernel termios declarations.
+ *
+ * The details vary by architecture. Some architectures have c_ispeed/c_ospeed
+ * in struct termios, accessed with TCSETS/TCGETS. Others have these fields in
+ * struct termios2, accessed with TCSETS2/TCGETS2. Some architectures have the
+ * TCSETX/TCGETX ioctls used with struct termiox, others do not.
+ */
+
+#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;
@@ -29,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;
@@ -38,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);
@@ -47,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;
@@ -60,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;
@@ -71,3 +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
+SP_PRIV size_t get_termiox_size(void)
+{
+	return sizeof(struct termiox);
+}
+
+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;
+
+	*rts = (termx->x_cflag & RTSXOFF);
+	*cts = (termx->x_cflag & CTSXON);
+	*dtr = (termx->x_cflag & DTRXOFF);
+	*dsr = (termx->x_cflag & DSRXON);
+
+	return 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 (rts)
+		termx->x_cflag |= RTSXOFF;
+	if (cts)
+		termx->x_cflag |= CTSXON;
+	if (dtr)
+		termx->x_cflag |= DTRXOFF;
+	if (dsr)
+		termx->x_cflag |= DSRXON;
+}
+#endif