diff options
| author | gallatin <gallatin@FreeBSD.org> | 2000-11-01 22:36:41 +0000 |
|---|---|---|
| committer | gallatin <gallatin@FreeBSD.org> | 2000-11-01 22:36:41 +0000 |
| commit | 1f8368b3773c060758b0e49f13d736957e14c7fb (patch) | |
| tree | ce12bf93465d25a5b19f8ea02d5ab29b88ae7804 /sys | |
| parent | 58beb59c8099dfb2d3fa677c29acf501cf78ce09 (diff) | |
| download | FreeBSD-src-1f8368b3773c060758b0e49f13d736957e14c7fb.zip FreeBSD-src-1f8368b3773c060758b0e49f13d736957e14c7fb.tar.gz | |
fix linux_termio and linux_termios structs on alpha. alpha differences
are in the termios struct (probably because linux wants to be compatible
with the osf/1 termios struct), not the termio struct.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/alpha/linux/linux_ioctl.h | 2 | ||||
| -rw-r--r-- | sys/compat/linux/linux_ioctl.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/alpha/linux/linux_ioctl.h b/sys/alpha/linux/linux_ioctl.h index 6944b6d..8410f10 100644 --- a/sys/alpha/linux/linux_ioctl.h +++ b/sys/alpha/linux/linux_ioctl.h @@ -286,7 +286,7 @@ #define LINUX_VQUIT 9 #define LINUX_VMIN 16 #define LINUX_VTIME 17 -#define LINUX_NCC 19 +#define LINUX_NCC 8 /* Linux termios c_cc values */ #define LINUX_VEOL 1 diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 3efd91a..76cfa4d 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -130,15 +130,8 @@ struct linux_termio { unsigned short c_oflag; unsigned short c_cflag; unsigned short c_lflag; -#ifdef __alpha__ - unsigned char c_cc[LINUX_NCCS]; - unsigned char c_line; - unsigned int c_ispeed; - unsigned int c_ospeed; -#else unsigned char c_line; unsigned char c_cc[LINUX_NCC]; -#endif }; struct linux_termios { @@ -146,8 +139,15 @@ struct linux_termios { unsigned int c_oflag; unsigned int c_cflag; unsigned int c_lflag; +#ifdef __alpha__ + unsigned char c_cc[LINUX_NCCS]; + unsigned char c_line; + unsigned int c_ispeed; + unsigned int c_ospeed; +#else unsigned char c_line; unsigned char c_cc[LINUX_NCCS]; +#endif }; struct linux_winsize { |
