diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:22:31 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:22:31 +0900 |
| commit | 02a650e2820e19fde8f6a49752027217fdd33d78 (patch) | |
| tree | 92d97b79941c0cee9a1da1e8a21abc7a661aa0f5 /arch/frv/include/asm/termios.h | |
| parent | b6897130f0ac8ac33043be736770eb5f58164044 (diff) | |
| parent | 7190632b78de594f3dabe174e9df373bfc790d89 (diff) | |
| download | linux-02a650e2820e19fde8f6a49752027217fdd33d78.tar.gz | |
Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI disintegration for misc arches from David Howells:
"UAPI disintegration for MN10300, FRV and AVR32 arches"
* tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/mn10300/include/asm
UAPI: (Scripted) Disintegrate arch/frv/include/asm
UAPI: (Scripted) Disintegrate arch/avr32/include/asm
Diffstat (limited to 'arch/frv/include/asm/termios.h')
| -rw-r--r-- | arch/frv/include/asm/termios.h | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/arch/frv/include/asm/termios.h b/arch/frv/include/asm/termios.h index b4868aafe79c..9f753fc09532 100644 --- a/arch/frv/include/asm/termios.h +++ b/arch/frv/include/asm/termios.h @@ -1,27 +1,8 @@ #ifndef _ASM_TERMIOS_H #define _ASM_TERMIOS_H -#include <asm/termbits.h> -#include <asm/ioctls.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 */ -}; - -#ifdef __KERNEL__ /* intr=^C quit=^| erase=del kill=^U eof=^D vtime=\0 vmin=\1 sxtc=\0 start=^Q stop=^S susp=^Z eol=\0 @@ -29,30 +10,5 @@ struct termio { eol2=\0 */ #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0" -#endif - -/* 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 - -#define TIOCM_MODEM_BITS TIOCM_OUT2 /* IRDA support */ - -/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ - -#ifdef __KERNEL__ #include <asm-generic/termios-base.h> -#endif - #endif /* _ASM_TERMIOS_H */ |