diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-04-30 09:53:43 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 17:29:43 +0200 |
commit | 7bcf97d1dd88135b58c7adb7c3bfebab55b21a20 (patch) | |
tree | 0b0001fb83cb512256944d47b62b9d3d3fcfd542 /drivers/char/moxa.h | |
parent | Char: moxa, ioctl cleanup (diff) | |
download | linux-7bcf97d1dd88135b58c7adb7c3bfebab55b21a20.tar.xz linux-7bcf97d1dd88135b58c7adb7c3bfebab55b21a20.zip |
Char: moxa, merge 2 poll functions
- merge 2 timers into one -- one can handle the emptywait as good as the other
- merge 2 separated poll functions into one, this allows handle the actions
directly and simplifies the code
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling@uni-c.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/moxa.h')
-rw-r--r-- | drivers/char/moxa.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/moxa.h b/drivers/char/moxa.h index 49e926dea195..0b1650621a04 100644 --- a/drivers/char/moxa.h +++ b/drivers/char/moxa.h @@ -165,11 +165,11 @@ #define HostStat 0x08 /* IRQ flag and general flag */ #define FlagStat 0x0A #define FlowControl 0x0C /* B7 B6 B5 B4 B3 B2 B1 B0 */ - /* x x x x | | | | */ - /* | | | + CTS flow */ - /* | | +--- RTS flow */ - /* | +------ TX Xon/Xoff */ - /* +--------- RX Xon/Xoff */ + /* x x x x | | | | */ + /* | | | + CTS flow */ + /* | | +--- RTS flow */ + /* | +------ TX Xon/Xoff */ + /* +--------- RX Xon/Xoff */ #define Break_cnt 0x0E /* received break count */ #define CD180TXirq 0x10 /* if non-0: enable TX irq */ #define RX_mask 0x12 |