Commit 0f326215 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Update parity handling documentation
parents 891eca14 89f3da3e
...@@ -214,12 +214,13 @@ hardware. ...@@ -214,12 +214,13 @@ hardware.
The interaction of the iflag bits is as follows (parity error The interaction of the iflag bits is as follows (parity error
given as an example): given as an example):
Parity error INPCK IGNPAR Parity error INPCK IGNPAR
None n/a n/a character received n/a 0 n/a character received, marked as
Yes n/a 0 character discarded
Yes 0 1 character received, marked as
TTY_NORMAL 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 TTY_PARITY
Yes 1 1 character discarded
Other flags may be used (eg, xon/xoff characters) if your Other flags may be used (eg, xon/xoff characters) if your
hardware supports hardware "soft" flow control. hardware supports hardware "soft" flow control.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment