diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile | 3 | ||||
| -rw-r--r-- | misc/sgtty.h | 4 | ||||
| -rw-r--r-- | misc/sys/ioctl.h | 89 |
3 files changed, 9 insertions, 87 deletions
diff --git a/misc/Makefile b/misc/Makefile index b36e46f09a..eeb5191cc1 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -22,7 +22,8 @@ subdir := misc -headers := sys/uio.h iovec.h sys/ioctl.h sys/ptrace.h ioctls.h sys/file.h\ +headers := sys/uio.h iovec.h sys/ioctl.h ioctls.h ioctl-types.h \ + sys/ptrace.h sys/file.h \ a.out.h nlist.h stab.h stab.def sgtty.h sys/dir.h sys/cdefs.h \ ttyent.h syscall.h syslog.h sys/syslog.h paths.h sys/reboot.h \ sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h\ diff --git a/misc/sgtty.h b/misc/sgtty.h index 00d13a4417..29acb59292 100644 --- a/misc/sgtty.h +++ b/misc/sgtty.h @@ -22,6 +22,10 @@ Cambridge, MA 02139, USA. */ #include <sys/ioctl.h> +/* On some systems this type is not defined by <ioctl-types.h>; + in that case, the functions are just stubs that return ENOSYS. */ +struct sgttyb; + __BEGIN_DECLS /* Fill in *PARAMS with terminal parameters associated with FD. */ diff --git a/misc/sys/ioctl.h b/misc/sys/ioctl.h index 318b5c9b90..4e187c0c85 100644 --- a/misc/sys/ioctl.h +++ b/misc/sys/ioctl.h @@ -26,6 +26,9 @@ __BEGIN_DECLS /* Get the list of `ioctl' requests and related constants. */ #include <ioctls.h> +/* Define some types used by `ioctl' requests. */ +#include <ioctl-types.h> + /* On a Unix system, the system <sys/ioctl.h> probably defines some of the symbols we define in <sys/ttydefaults.h> (usually with the same values). The code to generate <ioctls.h> has omitted these symbols to avoid the @@ -33,92 +36,6 @@ __BEGIN_DECLS must include <sys/ttydefaults.h> here. */ #include <sys/ttydefaults.h> -#if defined(TIOCGETC) || defined(TIOCSETC) -/* 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. */ -}; - -#define _IOT_tchars /* Hurd ioctl type field. */ \ - _IOT (_IOTS (char), 6, 0, 0, 0, 0) -#endif - -#if defined(TIOCGLTC) || defined(TIOCSLTC) -/* 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. */ -}; - -#define _IOT_ltchars /* Hurd ioctl type field. */ \ - _IOT (_IOTS (char), 6, 0, 0, 0, 0) -#endif - -/* 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. */ -}; - -#define _IOT_sgttyb /* Hurd ioctl type field. */ \ - _IOT (_IOTS (char), 6, _IOTS (short int), 1, 0, 0) - -#if defined(TIOCGWINSZ) || defined(TIOCSWINSZ) -/* Type of ARG for TIOCGWINSZ and TIOCSWINSZ requests. */ -struct winsize -{ - unsigned short int ws_row; /* Rows, in characters. */ - unsigned short int ws_col; /* Columns, in characters. */ - - /* These are not actually used. */ - unsigned short int ws_xpixel; /* Horizontal pixels. */ - unsigned short int ws_ypixel; /* Vertical pixels. */ -}; - -#define _IOT_winsize /* Hurd ioctl type field. */ \ - _IOT (_IOTS (unsigned short int), 4, 0, 0, 0, 0) -#endif - -#if defined (TIOCGSIZE) || defined (TIOCSSIZE) -# if defined (TIOCGWINSZ) && TIOCGSIZE == TIOCGWINSZ -/* Many systems that have TIOCGWINSZ define TIOCGSIZE for source - 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 -{ - unsigned short int ts_lines; - unsigned short int ts_cols; - unsigned short int ts_xxx; - unsigned short int ts_yyy; -}; -#define _IOT_ttysize _IOT_winsize -# else -/* Suns use a different layout for `struct ttysize', and TIOCGSIZE and - TIOCGWINSZ are separate commands that do the same thing with different - structures (likewise TIOCSSIZE and TIOCSWINSZ). */ -struct ttysize -{ - int ts_lines, ts_cols; /* Lines and columns, in characters. */ -}; -# endif -#endif - /* Perform the I/O control operation specified by REQUEST on FD. One argument may follow; its presence and type depend on REQUEST. Return value depends on REQUEST. Usually -1 indicates error. */ |