diff options
| author | netchild <netchild@FreeBSD.org> | 2006-05-10 20:38:16 +0000 |
|---|---|---|
| committer | netchild <netchild@FreeBSD.org> | 2006-05-10 20:38:16 +0000 |
| commit | 326540d4d567d7d8120fe40a0512fe88864e7178 (patch) | |
| tree | 64536960421af3dd9e546fefcee3ef459e00de8c /sys/compat/linux/linux_ioctl.c | |
| parent | 178c925c6402ab05c6e639a6b96cd9b41d2fb009 (diff) | |
| download | FreeBSD-src-326540d4d567d7d8120fe40a0512fe88864e7178.zip FreeBSD-src-326540d4d567d7d8120fe40a0512fe88864e7178.tar.gz | |
Now that we don't have a linuxolator on alpha anymore:
- unifdef __alpha__
- revert rev. 1.66 of linux_socket.c
Diffstat (limited to 'sys/compat/linux/linux_ioctl.c')
| -rw-r--r-- | sys/compat/linux/linux_ioctl.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index a8e494d..96ebcc5 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -276,15 +276,8 @@ 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 { @@ -634,20 +627,7 @@ bsd_to_linux_termio(struct termios *bios, struct linux_termio *lio) lio->c_cflag = lios.c_cflag; lio->c_lflag = lios.c_lflag; lio->c_line = lios.c_line; -#ifdef __alpha__ - lio->c_cc[LINUX__VINTR] = lios.c_cc[LINUX_VINTR]; - lio->c_cc[LINUX__VQUIT] = lios.c_cc[LINUX_VQUIT]; - lio->c_cc[LINUX__VERASE] = lios.c_cc[LINUX_VERASE]; - lio->c_cc[LINUX__VKILL] = lios.c_cc[LINUX_VKILL]; - lio->c_cc[LINUX__VEOF] = - lios.c_cc[(lios.c_lflag & ICANON) ? LINUX_VEOF : LINUX_VMIN]; - lio->c_cc[LINUX__VEOL] = - lios.c_cc[(lios.c_lflag & ICANON) ? LINUX_VEOL : LINUX_VTIME]; - lio->c_cc[LINUX__VEOL2] = lios.c_cc[LINUX_VEOL2]; - lio->c_cc[LINUX__VSWTC] = lios.c_cc[LINUX_VSWTC]; -#else memcpy(lio->c_cc, lios.c_cc, LINUX_NCC); -#endif } static void @@ -660,24 +640,9 @@ linux_to_bsd_termio(struct linux_termio *lio, struct termios *bios) lios.c_oflag = lio->c_oflag; lios.c_cflag = lio->c_cflag; lios.c_lflag = lio->c_lflag; -#ifdef __alpha__ - for (i=0; i<LINUX_NCCS; i++) - lios.c_cc[i] = LINUX_POSIX_VDISABLE; - lios.c_cc[LINUX_VINTR] = lio->c_cc[LINUX__VINTR]; - lios.c_cc[LINUX_VQUIT] = lio->c_cc[LINUX__VQUIT]; - lios.c_cc[LINUX_VERASE] = lio->c_cc[LINUX__VERASE]; - lios.c_cc[LINUX_VKILL] = lio->c_cc[LINUX__VKILL]; - lios.c_cc[LINUX_VEOL2] = lio->c_cc[LINUX__VEOL2]; - lios.c_cc[LINUX_VSWTC] = lio->c_cc[LINUX__VSWTC]; - lios.c_cc[(lio->c_lflag & ICANON) ? LINUX_VEOF : LINUX_VMIN] = - lio->c_cc[LINUX__VEOF]; - lios.c_cc[(lio->c_lflag & ICANON) ? LINUX_VEOL : LINUX_VTIME] = - lio->c_cc[LINUX__VEOL]; -#else for (i=LINUX_NCC; i<LINUX_NCCS; i++) lios.c_cc[i] = LINUX_POSIX_VDISABLE; memcpy(lios.c_cc, lio->c_cc, LINUX_NCC); -#endif linux_to_bsd_termios(&lios, bios); } |
