diff options
| author | Jesper Nilsson <jesper@jni.nu> | 2012-12-20 12:48:53 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jesper@jni.nu> | 2012-12-20 12:48:53 +0100 |
| commit | e61ac0b05c53f5b56f3ea623c215437c09d8265b (patch) | |
| tree | 70f97df839761058f2367d40c629b87e8e932a19 /arch/cris/include/asm/termios.h | |
| parent | 8e6b4dd1e1fbe81e7f9756eb8299632de641b2e1 (diff) | |
| parent | e717abac8a9f65eee6de3bb37e10c6916bced483 (diff) | |
| download | op-kernel-dev-e61ac0b05c53f5b56f3ea623c215437c09d8265b.zip op-kernel-dev-e61ac0b05c53f5b56f3ea623c215437c09d8265b.tar.gz | |
Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers into for-linus2
UAPI Disintegration 2012-10-09
* tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/cris/include/asm
UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
Diffstat (limited to 'arch/cris/include/asm/termios.h')
| -rw-r--r-- | arch/cris/include/asm/termios.h | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/arch/cris/include/asm/termios.h b/arch/cris/include/asm/termios.h index 1265109..1991cd9e 100644 --- a/arch/cris/include/asm/termios.h +++ b/arch/cris/include/asm/termios.h @@ -1,47 +1,8 @@ #ifndef _CRIS_TERMIOS_H #define _CRIS_TERMIOS_H -#include <asm/termbits.h> -#include <asm/ioctls.h> -#include <asm/rs485.h> -#include <linux/serial.h> +#include <uapi/asm/termios.h> -struct winsize { - unsigned short ws_row; - unsigned short ws_col; - unsigned short ws_xpixel; - unsigned short ws_ypixel; -}; - -#define NCC 8 -struct termio { - unsigned short c_iflag; /* input mode flags */ - unsigned short c_oflag; /* output mode flags */ - unsigned short c_cflag; /* control mode flags */ - unsigned short c_lflag; /* local mode flags */ - unsigned char c_line; /* line discipline */ - unsigned char c_cc[NCC]; /* control characters */ -}; - -/* modem lines */ -#define TIOCM_LE 0x001 -#define TIOCM_DTR 0x002 -#define TIOCM_RTS 0x004 -#define TIOCM_ST 0x008 -#define TIOCM_SR 0x010 -#define TIOCM_CTS 0x020 -#define TIOCM_CAR 0x040 -#define TIOCM_RNG 0x080 -#define TIOCM_DSR 0x100 -#define TIOCM_CD TIOCM_CAR -#define TIOCM_RI TIOCM_RNG -#define TIOCM_OUT1 0x2000 -#define TIOCM_OUT2 0x4000 -#define TIOCM_LOOP 0x8000 - -/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ - -#ifdef __KERNEL__ /* intr=^C quit=^\ erase=del kill=^U eof=^D vtime=\0 vmin=\1 sxtc=\0 @@ -87,6 +48,4 @@ struct termio { #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios)) #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios)) -#endif /* __KERNEL__ */ - #endif /* _CRIS_TERMIOS_H */ |
