projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
include
/
asm-xtensa
/
termbits.h
diff --git
a/include/asm-xtensa/termbits.h
b/include/asm-xtensa/termbits.h
index
9972c25
..
85aa6a3
100644
(file)
--- a/
include/asm-xtensa/termbits.h
+++ b/
include/asm-xtensa/termbits.h
@@
-157,6
+157,7
@@
struct ktermios {
#define HUPCL 0002000
#define CLOCAL 0004000
#define CBAUDEX 0010000
#define HUPCL 0002000
#define CLOCAL 0004000
#define CBAUDEX 0010000
+#define BOTHER 0010000
#define B57600 0010001
#define B115200 0010002
#define B230400 0010003
#define B57600 0010001
#define B115200 0010002
#define B230400 0010003
@@
-172,10
+173,12
@@
struct ktermios {
#define B3000000 0010015
#define B3500000 0010016
#define B4000000 0010017
#define B3000000 0010015
#define B3500000 0010016
#define B4000000 0010017
-#define CIBAUD 002003600000
/* input baud rate (not used)
*/
+#define CIBAUD 002003600000
/* input baud rate
*/
#define CMSPAR 010000000000 /* mark or space (stick) parity */
#define CRTSCTS 020000000000 /* flow control */
#define CMSPAR 010000000000 /* mark or space (stick) parity */
#define CRTSCTS 020000000000 /* flow control */
+#define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */
+
/* c_lflag bits */
#define ISIG 0000001
/* c_lflag bits */
#define ISIG 0000001