General fixes in the serial_rs485 structure
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 General fixes in the serial_rs485 structure
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").
--- drivers/serial/atmel_serial.c | 6 +++--- include/linux/serial.h | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/serial/atmel_serial.c +3 -3
@@ -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" );
include/linux/serial.h +3 -1
@@ -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 .. */ };
Signature · 1 line
1.6.0.4
drivers/serial/atmel_serial.c void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) · line 222
Quoted 13 lines · Claudio Scordino
drivers/serial/atmel_serial.c +1
-1@@ -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
Signature · 2 lines
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
Philippe De Muyter ha scritto:
Quoted 18 lines · Claudio Scordino
Quoted 6 lines
drivers/serial/atmel_serial.c +0
-0drivers/serial/atmel_serial.c void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) · line 222
Quoted 8 lines
drivers/serial/atmel_serial.c +1
-1@@ -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_sendnot 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").
--- drivers/serial/atmel_serial.c | 11 ++++++++--- include/linux/serial.h | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-)
drivers/serial/atmel_serial.c +8 -3
@@ -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" );
include/linux/serial.h +3 -1
@@ -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 .. */ };
Signature · 1 line
1.6.0.4