summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorClaudio Scordino <claudio@evidence.eu.com>2010-07-20 15:26:47 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 13:47:45 -0700
commit1b6331848b69d1ed165a6bdc75c4046d68767563 (patch)
tree8bb63607eed2f95dfcc460bfb0606de5ff7747b8 /include
parent93e3d58284626ff6466f9c3dac8800cd6f8079c6 (diff)
serial: general fixes in the serial_rs485 structure
Fix several issues related to the RS485 interface: - It adds the flag SER_RS485_RTS_BEFORE_SEND that was missing from the serial_rs485 structure (even if "delay_rts_before_send" was existing) - It adds a further "delay_rts_after_send" field for those drivers that can have a delay after send (e.g., atmel_serial) - It fixes the usage of the structure in the atmel_serial driver (where "delay_rts_before_send" should be used instead of "delay_rts_after_send"). Signed-off-by: Claudio Scordino <claudio@evidence.eu.com> Signed-off-by: Bernhard Roth <br@pwrnet.de> Cc: Philippe De Muyter <phdm@macqel.be> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/linux/serial.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/serial.h b/include/linux/serial.h
index c3b45add494d..ef914061511e 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -210,8 +210,10 @@ struct serial_rs485 {
#define SER_RS485_ENABLED (1 << 0)
#define SER_RS485_RTS_ON_SEND (1 << 1)
#define SER_RS485_RTS_AFTER_SEND (1 << 2)
+#define SER_RS485_RTS_BEFORE_SEND (1 << 3)
__u32 delay_rts_before_send; /* Milliseconds */
- __u32 padding[6]; /* Memory is cheap, new structs
+ __u32 delay_rts_after_send; /* Milliseconds */
+ __u32 padding[5]; /* Memory is cheap, new structs
are a royal PITA .. */
};