diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:39:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:39:44 -0400 |
commit | 9cf52b2921fbe62566b6b2ee79f71203749c9e5e (patch) | |
tree | 5705ab0af0adfb7043407b5a4ffbf43fcbff42bd /include/asm-sparc64/termbits.h | |
parent | 952184304fbf030f0133d8b66a91b2847dce729e (diff) | |
parent | 5c45708352a040f19caceb683c78bc86aad466f6 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC/64]: Consolidate of_register_driver
[SPARC] Videopix Frame Grabber: Convert device_lock_sem to mutex
[SPARC]: Support for new termios.
[SPARC64]: Check of_get_property() return in pci_determine_mem_io_space().
[SPARC64]: Fix boot failures due to bootmem.
[SPARC64]: Implement atomic backoff.
Diffstat (limited to 'include/asm-sparc64/termbits.h')
-rw-r--r-- | include/asm-sparc64/termbits.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/asm-sparc64/termbits.h b/include/asm-sparc64/termbits.h index 705cd44b4173..ebe31c152f16 100644 --- a/include/asm-sparc64/termbits.h +++ b/include/asm-sparc64/termbits.h | |||
@@ -5,8 +5,6 @@ | |||
5 | 5 | ||
6 | typedef unsigned char cc_t; | 6 | typedef unsigned char cc_t; |
7 | typedef unsigned int speed_t; | 7 | typedef unsigned int speed_t; |
8 | |||
9 | /* XXX is this right for sparc64? it was an unsigned long... XXX */ | ||
10 | typedef unsigned int tcflag_t; | 8 | typedef unsigned int tcflag_t; |
11 | 9 | ||
12 | #define NCC 8 | 10 | #define NCC 8 |
@@ -33,6 +31,18 @@ struct termios { | |||
33 | #endif | 31 | #endif |
34 | }; | 32 | }; |
35 | 33 | ||
34 | struct termios2 { | ||
35 | tcflag_t c_iflag; /* input mode flags */ | ||
36 | tcflag_t c_oflag; /* output mode flags */ | ||
37 | tcflag_t c_cflag; /* control mode flags */ | ||
38 | tcflag_t c_lflag; /* local mode flags */ | ||
39 | cc_t c_line; /* line discipline */ | ||
40 | cc_t c_cc[NCCS]; /* control characters */ | ||
41 | cc_t _x_cc[2]; /* padding to match ktermios */ | ||
42 | speed_t c_ispeed; /* input speed */ | ||
43 | speed_t c_ospeed; /* output speed */ | ||
44 | }; | ||
45 | |||
36 | struct ktermios { | 46 | struct ktermios { |
37 | tcflag_t c_iflag; /* input mode flags */ | 47 | tcflag_t c_iflag; /* input mode flags */ |
38 | tcflag_t c_oflag; /* output mode flags */ | 48 | tcflag_t c_oflag; /* output mode flags */ |
@@ -161,6 +171,7 @@ struct ktermios { | |||
161 | #define HUPCL 0x00000400 | 171 | #define HUPCL 0x00000400 |
162 | #define CLOCAL 0x00000800 | 172 | #define CLOCAL 0x00000800 |
163 | #define CBAUDEX 0x00001000 | 173 | #define CBAUDEX 0x00001000 |
174 | #define BOTHER 0x00001000 | ||
164 | #define B57600 0x00001001 | 175 | #define B57600 0x00001001 |
165 | #define B115200 0x00001002 | 176 | #define B115200 0x00001002 |
166 | #define B230400 0x00001003 | 177 | #define B230400 0x00001003 |
@@ -190,6 +201,8 @@ struct ktermios { | |||
190 | #define CMSPAR 0x40000000 /* mark or space (stick) parity */ | 201 | #define CMSPAR 0x40000000 /* mark or space (stick) parity */ |
191 | #define CRTSCTS 0x80000000 /* flow control */ | 202 | #define CRTSCTS 0x80000000 /* flow control */ |
192 | 203 | ||
204 | #define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */ | ||
205 | |||
193 | /* c_lflag bits */ | 206 | /* c_lflag bits */ |
194 | #define ISIG 0x00000001 | 207 | #define ISIG 0x00000001 |
195 | #define ICANON 0x00000002 | 208 | #define ICANON 0x00000002 |