[Glibc-bsd-commits] r1525 -
trunk/glibc-2.3-head/sysdeps/kfreebsd/bits
Petr Salinger
ps-guest at costa.debian.org
Sat Apr 29 16:19:07 UTC 2006
Author: ps-guest
Date: 2006-04-29 16:19:06 +0000 (Sat, 29 Apr 2006)
New Revision: 1525
Modified:
trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/ioctl-types.h
trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/ioctls.h
Log:
* again clean up of <bits/ioctls.h>
Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/ioctl-types.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/ioctl-types.h 2006-04-29 09:19:54 UTC (rev 1524)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/ioctl-types.h 2006-04-29 16:19:06 UTC (rev 1525)
@@ -22,50 +22,22 @@
#endif
/* Type of ARG for TIOCGETC and TIOCSETC requests. */
-struct tchars
-{
- char t_intrc; /* Interrupt character. */
- char t_quitc; /* Quit character. */
- char t_startc; /* Start-output character. */
- char t_stopc; /* Stop-output character. */
- char t_eofc; /* End-of-file character. */
- char t_brkc; /* Input delimiter character. */
-};
-
+/* struct tchars is defined in <sys/ioctl_compat.h> */
#define _IOT_tchars /* Hurd ioctl type field. */ \
_IOT (_IOTS (char), 6, 0, 0, 0, 0)
/* Type of ARG for TIOCGLTC and TIOCSLTC requests. */
-struct ltchars
-{
- char t_suspc; /* Suspend character. */
- char t_dsuspc; /* Delayed suspend character. */
- char t_rprntc; /* Reprint-line character. */
- char t_flushc; /* Flush-output character. */
- char t_werasc; /* Word-erase character. */
- char t_lnextc; /* Literal-next character. */
-};
-
+/* struct ltchars is defined in <sys/ioctl_compat.h> */
#define _IOT_ltchars /* Hurd ioctl type field. */ \
_IOT (_IOTS (char), 6, 0, 0, 0, 0)
/* Type of ARG for TIOCGETP and TIOCSETP requests (and gtty and stty). */
-struct sgttyb
-{
- char sg_ispeed; /* Input speed. */
- char sg_ospeed; /* Output speed. */
- char sg_erase; /* Erase character. */
- char sg_kill; /* Kill character. */
- short int sg_flags; /* Mode flags. */
-};
-
+/* struct sgttyb is defined in <sys/ioctl_compat.h> */
#define _IOT_sgttyb /* Hurd ioctl type field. */ \
_IOT (_IOTS (char), 6, _IOTS (short int), 1, 0, 0)
/* Type of ARG for TIOCGWINSZ and TIOCSWINSZ requests. */
-
/* struct winsize is defined in <sys/ttycom.h> */
-
#define _IOT_winsize /* Hurd ioctl type field. */ \
_IOT (_IOTS (unsigned short int), 4, 0, 0, 0, 0)
@@ -73,6 +45,8 @@
compatibility with Sun; they define `struct ttysize' to have identical
layout as `struct winsize' and #define TIOCGSIZE to be TIOCGWINSZ
(likewise TIOCSSIZE and TIOCSWINSZ). */
+/* struct ttysize is in FreeBSD originally defined in <sys/ioctl.h>,
+ which is replaced by GLIBC version -> define here */
struct ttysize
{
unsigned short int ts_lines;
Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/ioctls.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/ioctls.h 2006-04-29 09:19:54 UTC (rev 1524)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/bits/ioctls.h 2006-04-29 16:19:06 UTC (rev 1525)
@@ -47,106 +47,21 @@
#include <sys/sockio.h>
-/*
- * Compatibility with 4.3 BSD terminal driver.
- * @(#)ioctl_compat.h 8.4 (Berkeley) 1/21/94
- */
+#ifndef _SYS_IOCTL_COMPAT_H_
+#ifndef BURN_BRIDGES
-#ifdef USE_OLD_TTY
-# undef TIOCGETD
-# define TIOCGETD _IOR('t', 0, int) /* get line discipline */
-# undef TIOCSETD
-# define TIOCSETD _IOW('t', 1, int) /* set line discipline */
-#else
-# define OTIOCGETD _IOR('t', 0, int) /* get line discipline */
-# define OTIOCSETD _IOW('t', 1, int) /* set line discipline */
-#endif
-#define TIOCHPCL _IO('t', 2) /* hang up on last close */
-#define TIOCGETP _IOR('t', 8,struct sgttyb)/* get parameters -- gtty */
-#define TIOCSETP _IOW('t', 9,struct sgttyb)/* set parameters -- stty */
-#define TIOCSETN _IOW('t',10,struct sgttyb)/* as above, but no flushtty*/
-#define TIOCSETC _IOW('t',17,struct tchars)/* set special characters */
-#define TIOCGETC _IOR('t',18,struct tchars)/* get special characters */
-#define TANDEM 0x00000001 /* send stopc on out q full */
-#define CBREAK 0x00000002 /* half-cooked mode */
-#define LCASE 0x00000004 /* simulate lower case */
#undef ECHO /* see bits/termios.h */
-#define ECHO 0x00000008 /* echo input */
-#define CRMOD 0x00000010 /* map \r to \r\n on output */
-#define RAW 0x00000020 /* no i/o processing */
-#define ODDP 0x00000040 /* get/send odd parity */
-#define EVENP 0x00000080 /* get/send even parity */
-#define ANYP 0x000000c0 /* get any parity/send none */
-#define NLDELAY 0x00000300 /* \n delay */
-#define NL0 0x00000000
-#define NL1 0x00000100 /* tty 37 */
-#define NL2 0x00000200 /* vt05 */
-#define NL3 0x00000300
-#define TBDELAY 0x00000c00 /* horizontal tab delay */
-#define TAB0 0x00000000
-#define TAB1 0x00000400 /* tty 37 */
-#define TAB2 0x00000800
-#define TAB3 0x00000c00
-#define XTABS TAB3 /* expand tabs on output */
-#define CRDELAY 0x00003000 /* \r delay */
-#define CR0 0x00000000
-#define CR1 0x00001000 /* tn 300 */
-#define CR2 0x00002000 /* tty 37 */
-#define CR3 0x00003000 /* concept 100 */
-#define VTDELAY 0x00004000 /* vertical tab delay */
-#define FF0 0x00000000
-#define FF1 0x00004000 /* tty 37 */
-#define BSDELAY 0x00008000 /* \b delay */
-#define BS0 0x00000000
-#define BS1 0x00008000
-#define ALLDELAY (NLDELAY|TBDELAY|CRDELAY|VTDELAY|BSDELAY)
-#define CRTBS 0x00010000 /* do backspacing for crt */
-#define PRTERA 0x00020000 /* \ ... / erase */
-#define CRTERA 0x00040000 /* " \b " to wipe out char */
-#define TILDE 0x00080000 /* hazeltine tilde kludge */
#undef MDMBUF /* see bits/termios.h */
-#define MDMBUF 0x00100000 /*start/stop output on carrier*/
-#define LITOUT 0x00200000 /* literal output */
#undef TOSTOP /* see bits/termios.h */
-#define TOSTOP 0x00400000 /*SIGSTOP on background output*/
#undef FLUSHO /* see bits/termios.h */
-#define FLUSHO 0x00800000 /* flush output to terminal */
-#define NOHANG 0x01000000 /* (no-op) was no SIGHUP on carrier drop */
-#define L001000 0x02000000
-#define CRTKIL 0x04000000 /* kill line with " \b " */
-#define PASS8 0x08000000
-#define CTLECH 0x10000000 /* echo control chars as ^X */
#undef PENDIN /* see bits/termios.h */
-#define PENDIN 0x20000000 /* tp->t_rawq needs reread */
-#define DECCTQ 0x40000000 /* only ^Q starts after ^S */
#undef NOFLSH /* see bits/termios.h */
-#define NOFLSH 0x80000000 /* no output flush on signal */
-#define TIOCLBIS _IOW('t', 127, int) /* bis local mode bits */
-#define TIOCLBIC _IOW('t', 126, int) /* bic local mode bits */
-#define TIOCLSET _IOW('t', 125, int) /* set entire local mode word */
-#define TIOCLGET _IOR('t', 124, int) /* get local modes */
-#define LCRTBS (CRTBS>>16)
-#define LPRTERA (PRTERA>>16)
-#define LCRTERA (CRTERA>>16)
-#define LTILDE (TILDE>>16)
-#define LMDMBUF (MDMBUF>>16)
-#define LLITOUT (LITOUT>>16)
-#define LTOSTOP (TOSTOP>>16)
-#define LFLUSHO (FLUSHO>>16)
-#define LNOHANG (NOHANG>>16)
-#define LCRTKIL (CRTKIL>>16)
-#define LPASS8 (PASS8>>16)
-#define LCTLECH (CTLECH>>16)
-#define LPENDIN (PENDIN>>16)
-#define LDECCTQ (DECCTQ>>16)
-#define LNOFLSH (NOFLSH>>16)
-#define TIOCSLTC _IOW('t',117,struct ltchars)/* set local special chars*/
-#define TIOCGLTC _IOR('t',116,struct ltchars)/* get local special chars*/
-#define OTIOCCONS _IO('t', 98) /* for hp300 -- sans int arg */
-#define OTTYDISC 0
-#define NETLDISC 1
-#define NTTYDISC 2
-#include <sys/ttydev.h>
+#include <sys/ioctl_compat.h>
+#define TAB3 XTABS /* expand tabs on output */
+
+#endif /* !BURN_BRIDGES */
+#endif /* !_SYS_IOCTL_COMPAT_H_ */
+
#endif /* !_IOCTLS_H_ */
More information about the Glibc-bsd-commits
mailing list