aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-02 16:03:22 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-02 16:03:22 -0700
commit0f3262157899efd422228713a521504bdf0c991e (patch)
tree865601393570282133e51a126f380490c27d635b
parent891eca1447a94b25fb59b696f839a2a6897d8f1f (diff)
parent89f3da3e06257abba3e70163c92969f3fcd1833d (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Update parity handling documentation
-rw-r--r--Documentation/serial/driver9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/serial/driver b/Documentation/serial/driver
index df82116a9f2..88ad615dd33 100644
--- a/Documentation/serial/driver
+++ b/Documentation/serial/driver
@@ -214,12 +214,13 @@ hardware.
The interaction of the iflag bits is as follows (parity error
given as an example):
Parity error INPCK IGNPAR
- None n/a n/a character received
- Yes n/a 0 character discarded
- Yes 0 1 character received, marked as
+ n/a 0 n/a character received, marked as
TTY_NORMAL
- Yes 1 1 character received, marked as
+ None 1 n/a character received, marked as
+ TTY_NORMAL
+ Yes 1 0 character received, marked as
TTY_PARITY
+ Yes 1 1 character discarded
Other flags may be used (eg, xon/xoff characters) if your
hardware supports hardware "soft" flow control.