[Glibc-bsd-commits] r2328 - in trunk/glibc-ports/kfreebsd: bits sys

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2008-11-10 21:36:44 +0000 (Mon, 10 Nov 2008)
New Revision: 2328

Modified:
   trunk/glibc-ports/kfreebsd/bits/termios.h
   trunk/glibc-ports/kfreebsd/sys/ttydefaults.h
Log:
3rd round of termios fixes



Modified: trunk/glibc-ports/kfreebsd/bits/termios.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/termios.h	2008-11-10 20:39:31 UTC (rev 2327)
+++ trunk/glibc-ports/kfreebsd/bits/termios.h	2008-11-10 21:36:44 UTC (rev 2328)
@@ -96,20 +96,19 @@
   /* Output modes.  */
 #define	OPOST	(1 << 0)	/* Perform output processing.  */
 #define	ONLCR	(1 << 1)	/* Map NL to CR-NL on output.  */
-#define	OCRNL	(1 << 8)	/* map CR to NL on output */
-#define	ONOCR	(1 << 9)	/* no CR output at column 0 */
-#define	ONLRET	(1 << 10)	/* NL performs CR function */
-#ifdef	__USE_BSD
-# define ONOEOT	(1 << 3)	/* Discard EOT (^D) on output.  */
-#endif
-
 #if defined __USE_MISC || defined __USE_XOPEN
-# define TAB0   0x00000000	/* no tab delay and expansion */
-# define TAB3   0x00000004	/* expand tabs to spaces */
+# define TAB0   (0 << 2)	/* no tab delay and expansion */
+# define TAB3   (1 << 2)	/* expand tabs to spaces */
 # define TABDLY	TAB3		/* tab delay mask */
 # define OXTABS	TAB3
 # define XTABS	TAB3
 #endif
+#ifdef	__USE_BSD
+# define ONOEOT	(1 << 3)	/* Discard EOT (^D) on output.  */
+#endif
+#define	OCRNL	(1 << 4)	/* map CR to NL on output */
+#define	ONOCR	(1 << 5)	/* no CR output at column 0 */
+#define	ONLRET	(1 << 6)	/* NL performs CR function */
 
 
   /* Control modes.  */

Modified: trunk/glibc-ports/kfreebsd/sys/ttydefaults.h
===================================================================
--- trunk/glibc-ports/kfreebsd/sys/ttydefaults.h	2008-11-10 20:39:31 UTC (rev 2327)
+++ trunk/glibc-ports/kfreebsd/sys/ttydefaults.h	2008-11-10 21:36:44 UTC (rev 2328)
@@ -60,6 +60,7 @@
 # define CEOL		((unsigned char)'\377')	/* XXX avoid _POSIX_VDISABLE */
 #endif
 #define CERASE		0177
+#define CERASE2		CTRL('h')
 #define CINTR		CTRL('c')
 #define CSTATUS		CTRL('t')
 #define CKILL		CTRL('u')
@@ -89,7 +90,7 @@
 #ifdef TTYDEFCHARS
 cc_t	ttydefchars[NCCS] = {
 	CEOF,	CEOL,	CEOL,	CERASE, CWERASE, CKILL, CREPRINT,
-	_POSIX_VDISABLE, CINTR,	CQUIT,	CSUSP,	CDSUSP,	CSTART,	CSTOP,	CLNEXT,
+	CERASE2, CINTR,	CQUIT,	CSUSP,	CDSUSP,	CSTART,	CSTOP,	CLNEXT,
 	CDISCARD, CMIN,	CTIME,  CSTATUS, _POSIX_VDISABLE
 };
 #undef TTYDEFCHARS