Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 58771
b: refs/heads/master
c: 4eb6bf6
h: refs/heads/master
i:
  58769: ce1320d
  58767: 4bf45c9
v: v3
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Jul 11, 2007
1 parent 6247945 commit 7185e29
Show file tree
Hide file tree
Showing 16 changed files with 166 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bcf67e16251c42302499499b1c50f7d35622f564
refs/heads/master: 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4
12 changes: 11 additions & 1 deletion trunk/include/asm-arm26/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct ktermios {
struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
Expand All @@ -26,6 +26,16 @@ struct ktermios {
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

/* c_cc characters */
#define VINTR 0
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-avr32/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-blackfin/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-cris/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-frv/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-h8300/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-ia64/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-m32r/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-m68k/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-mips/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-parisc/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-s390/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-sh/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-v850/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/asm-xtensa/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@ struct termios {
cc_t c_cc[NCCS]; /* control characters */
};

struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};

struct ktermios {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */
Expand Down

0 comments on commit 7185e29

Please sign in to comment.