* [PATCH] General fixes in the serial_rs485 structure [not found] ` <20100531113429.5efd6de9@lxorguk.ukuu.org.uk> @ 2010-05-31 13:39 ` Claudio Scordino 2010-05-31 14:21 ` Philippe De Muyter 0 siblings, 1 reply; 3+ messages in thread From: Claudio Scordino @ 2010-05-31 13:39 UTC (permalink / raw) To: hskinnemoen, Nicolas Ferre Cc: Alan Cox, Bernhard Roth, Rick Bronson, Philippe De Muyter, John Nicholls, Sebastian Heutling, Ryan Mallon, michael trimarchi, Konrad Mattheis, Elektrolot, Prchal Jiří, akpm, Linux Kernel, linux-arm-kernel, linux Hi, this patch fixes two different issues: - It adds the flag SER_RS485_RTS_BEFORE_SEND that somehow 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) Then, 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"). Best regards, Claudio New fields in structure serial_rs485. This patch fixes 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> --- drivers/serial/atmel_serial.c | 6 +++--- include/linux/serial.h | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index eed3c2d..1adb1bf 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c @@ -216,7 +216,7 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) if (rs485conf->flags & SER_RS485_ENABLED) { dev_dbg(port->dev, "Setting UART to RS485\n"); atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; - UART_PUT_TTGR(port, rs485conf->delay_rts_before_send); + UART_PUT_TTGR(port, rs485conf->delay_rts_after_send); mode |= ATMEL_US_USMODE_RS485; } else { dev_dbg(port->dev, "Setting UART to RS232\n"); @@ -291,7 +291,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl) if (atmel_port->rs485.flags & SER_RS485_ENABLED) { dev_dbg(port->dev, "Setting UART to RS485\n"); - UART_PUT_TTGR(port, atmel_port->rs485.delay_rts_before_send); + UART_PUT_TTGR(port, atmel_port->rs485.delay_rts_after_send); mode |= ATMEL_US_USMODE_RS485; } else { dev_dbg(port->dev, "Setting UART to RS232\n"); @@ -1210,7 +1210,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, if (atmel_port->rs485.flags & SER_RS485_ENABLED) { dev_dbg(port->dev, "Setting UART to RS485\n"); - UART_PUT_TTGR(port, atmel_port->rs485.delay_rts_before_send); + UART_PUT_TTGR(port, atmel_port->rs485.delay_rts_after_send); mode |= ATMEL_US_USMODE_RS485; } else { dev_dbg(port->dev, "Setting UART to RS232\n"); diff --git a/include/linux/serial.h b/include/linux/serial.h index c8613c3..f9a0b67 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 .. */ }; -- 1.6.0.4 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] General fixes in the serial_rs485 structure 2010-05-31 13:39 ` [PATCH] General fixes in the serial_rs485 structure Claudio Scordino @ 2010-05-31 14:21 ` Philippe De Muyter 2010-05-31 15:21 ` Claudio Scordino 0 siblings, 1 reply; 3+ messages in thread From: Philippe De Muyter @ 2010-05-31 14:21 UTC (permalink / raw) To: Claudio Scordino Cc: hskinnemoen, Nicolas Ferre, Alan Cox, Bernhard Roth, Rick Bronson, John Nicholls, Sebastian Heutling, Ryan Mallon, michael trimarchi, Konrad Mattheis, Elektrolot, Prchal Jiří, akpm, Linux Kernel, linux-arm-kernel, linux On Mon, May 31, 2010 at 03:39:37PM +0200, Claudio Scordino wrote: > diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c > index eed3c2d..1adb1bf 100644 > --- a/drivers/serial/atmel_serial.c > +++ b/drivers/serial/atmel_serial.c > @@ -216,7 +216,7 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) > if (rs485conf->flags & SER_RS485_ENABLED) { > dev_dbg(port->dev, "Setting UART to RS485\n"); > atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; > - UART_PUT_TTGR(port, rs485conf->delay_rts_before_send); > + UART_PUT_TTGR(port, rs485conf->delay_rts_after_send); > mode |= ATMEL_US_USMODE_RS485; > } else { > dev_dbg(port->dev, "Setting UART to RS232\n"); Should the usage of delay_rts_after_send not depend on (flags & SER_RS485_RTS_AFTER_SEND) also ? and likewise with delay_rts_before_send and SER_RS485_RTS_BEFORE_SEND ? Philippe -- Philippe De Muyter phdm at macqel dot be Tel +32 27029044 Macq Electronique SA rue de l'Aeronef 2 B-1140 Bruxelles Fax +32 27029077 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] General fixes in the serial_rs485 structure 2010-05-31 14:21 ` Philippe De Muyter @ 2010-05-31 15:21 ` Claudio Scordino 0 siblings, 0 replies; 3+ messages in thread From: Claudio Scordino @ 2010-05-31 15:21 UTC (permalink / raw) To: Philippe De Muyter Cc: hskinnemoen, Nicolas Ferre, Alan Cox, Bernhard Roth, Rick Bronson, John Nicholls, Sebastian Heutling, Ryan Mallon, michael trimarchi, Konrad Mattheis, Elektrolot, Prchal Jiří, akpm, Linux Kernel, linux-arm-kernel, linux Philippe De Muyter ha scritto: > On Mon, May 31, 2010 at 03:39:37PM +0200, Claudio Scordino wrote: > >> diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c >> index eed3c2d..1adb1bf 100644 >> --- a/drivers/serial/atmel_serial.c >> +++ b/drivers/serial/atmel_serial.c >> @@ -216,7 +216,7 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) >> if (rs485conf->flags & SER_RS485_ENABLED) { >> dev_dbg(port->dev, "Setting UART to RS485\n"); >> atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; >> - UART_PUT_TTGR(port, rs485conf->delay_rts_before_send); >> + UART_PUT_TTGR(port, rs485conf->delay_rts_after_send); >> mode |= ATMEL_US_USMODE_RS485; >> } else { >> dev_dbg(port->dev, "Setting UART to RS232\n"); > > Should the usage of delay_rts_after_send not depend on > (flags & SER_RS485_RTS_AFTER_SEND) also ? You're right. Sorry for the oversight. This is the patch fixed. Many thanks, Claudio ========================== New fields in structure serial_rs485. This patch fixes 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> --- drivers/serial/atmel_serial.c | 11 ++++++++--- include/linux/serial.h | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index eed3c2d..6a33546 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c @@ -216,7 +216,8 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) if (rs485conf->flags & SER_RS485_ENABLED) { dev_dbg(port->dev, "Setting UART to RS485\n"); atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; - UART_PUT_TTGR(port, rs485conf->delay_rts_before_send); + if (rs485conf->flags & SER_RS485_RTS_AFTER_SEND) + UART_PUT_TTGR(port, rs485conf->delay_rts_after_send); mode |= ATMEL_US_USMODE_RS485; } else { dev_dbg(port->dev, "Setting UART to RS232\n"); @@ -291,7 +292,9 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl) if (atmel_port->rs485.flags & SER_RS485_ENABLED) { dev_dbg(port->dev, "Setting UART to RS485\n"); - UART_PUT_TTGR(port, atmel_port->rs485.delay_rts_before_send); + if (atmel_port->rs485.flags & SER_RS485_RTS_AFTER_SEND) + UART_PUT_TTGR(port, + atmel_port->rs485.delay_rts_after_send); mode |= ATMEL_US_USMODE_RS485; } else { dev_dbg(port->dev, "Setting UART to RS232\n"); @@ -1210,7 +1213,9 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, if (atmel_port->rs485.flags & SER_RS485_ENABLED) { dev_dbg(port->dev, "Setting UART to RS485\n"); - UART_PUT_TTGR(port, atmel_port->rs485.delay_rts_before_send); + if (atmel_port->rs485.flags & SER_RS485_RTS_AFTER_SEND) + UART_PUT_TTGR(port, + atmel_port->rs485.delay_rts_after_send); mode |= ATMEL_US_USMODE_RS485; } else { dev_dbg(port->dev, "Setting UART to RS232\n"); diff --git a/include/linux/serial.h b/include/linux/serial.h index c8613c3..f9a0b67 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 .. */ }; -- 1.6.0.4 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-31 15:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <4BFE66CA.5050500@evidence.eu.com>
[not found] ` <20100529000839.158dedd3@lxorguk.ukuu.org.uk>
[not found] ` <4C0375C1.5030305@evidence.eu.com>
[not found] ` <20100531113429.5efd6de9@lxorguk.ukuu.org.uk>
2010-05-31 13:39 ` [PATCH] General fixes in the serial_rs485 structure Claudio Scordino
2010-05-31 14:21 ` Philippe De Muyter
2010-05-31 15:21 ` Claudio Scordino
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
Powered by JetHome