tty: baudrate: Synchronise baud_table[] and baud_bits[]
PATCH v2 1/2 tty: baudrate: Synchronise baud_table[] and baud_bits[]
Synchronize baud rate tables baud_table and baud_bits with each other for better readability. This makes clear what is being used for SPARC. No functional change intended.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/tty/tty_baudrate.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-)
drivers/tty/tty_baudrate.c +9 -15
@@ -17,8 +17,8 @@* include/asm/termbits.h file. */ static const speed_t baud_table[] = { -0 ,50 ,75 ,110 ,134 ,150 ,200 ,300 ,600 ,1200 ,1800 ,2400 ,4800 , -9600 ,19200 ,38400 ,57600 ,115200 ,230400 ,460800 , +0 ,50 ,75 ,110 ,134 ,150 ,200 ,300 ,600 ,1200 ,1800 ,2400 , +4800 ,9600 ,19200 ,38400 ,57600 ,115200 ,230400 ,460800 , #ifdef __sparc__76800 ,153600 ,307200 ,614400 ,921600 #else
@@ -27,22 +27,16 @@ static const speed_t baud_table[] = {#endif }; -#ifndef __sparc__static const tcflag_t baud_bits[] = { -B0 ,B50 ,B75 ,B110 ,B134 ,B150 ,B200 ,B300 ,B600 , -B1200 ,B1800 ,B2400 ,B4800 ,B9600 ,B19200 ,B38400 , -B57600 ,B115200 ,B230400 ,B460800 ,B500000 ,B576000 , -B921600 ,B1000000 ,B1152000 ,B1500000 ,B2000000 ,B2500000 , -B3000000 ,B3500000 ,B4000000 -}; +B0 ,B50 ,B75 ,B110 ,B134 ,B150 ,B200 ,B300 ,B600 ,B1200 ,B1800 ,B2400 , +B4800 ,B9600 ,B19200 ,B38400 ,B57600 ,B115200 ,B230400 ,B460800 , +#ifdef __sparc__ + B76800, B153600, B307200, B614400, B921600 #else -static const tcflag_t baud_bits[] = { -B0 ,B50 ,B75 ,B110 ,B134 ,B150 ,B200 ,B300 ,B600 , -B1200 ,B1800 ,B2400 ,B4800 ,B9600 ,B19200 ,B38400 , -B57600 ,B115200 ,B230400 ,B460800 ,B76800 ,B153600 , -B307200 ,B614400 ,B921600 -}; +B500000 ,B576000 ,B921600 ,B1000000 ,B1152000 ,B1500000 ,B2000000 , +B2500000 ,B3000000 ,B3500000 ,B4000000 #endif +};static int n_baud_table =ARRAY_SIZE (baud_table);
Signature · 1 line
2.24.1
PATCH v2 2/2 tty: baudrate: SPARC supports few more baud rates
According to termbits.h SPARC supports few more baud rates than currently defined in tty_baudrate.c.
Append supported ones to baud_table[] and baud_bits[].
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/tty/tty_baudrate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/tty/tty_baudrate.c +4 -2
@@ -20,7 +20,8 @@ static const speed_t baud_table[] = {0 ,50 ,75 ,110 ,134 ,150 ,200 ,300 ,600 ,1200 ,1800 ,2400 ,4800 ,9600 ,19200 ,38400 ,57600 ,115200 ,230400 ,460800 , #ifdef __sparc__ - 76800, 153600, 307200, 614400, 921600 +76800 ,153600 ,307200 ,614400 ,921600 ,500000 ,576000 , + 1000000, 1152000, 1500000, 2000000 #else500000 ,576000 ,921600 ,1000000 ,1152000 ,1500000 ,2000000 ,2500000 ,3000000 ,3500000 ,4000000
@@ -31,7 +32,8 @@ static const tcflag_t baud_bits[] = {B0 ,B50 ,B75 ,B110 ,B134 ,B150 ,B200 ,B300 ,B600 ,B1200 ,B1800 ,B2400 ,B4800 ,B9600 ,B19200 ,B38400 ,B57600 ,B115200 ,B230400 ,B460800 , #ifdef __sparc__ - B76800, B153600, B307200, B614400, B921600 +B76800 ,B153600 ,B307200 ,B614400 ,B921600 ,B500000 ,B576000 , + B1000000, B1152000, B1500000, B2000000 #elseB500000 ,B576000 ,B921600 ,B1000000 ,B1152000 ,B1500000 ,B2000000 ,B2500000 ,B3000000 ,B3500000 ,B4000000
Signature · 1 line
2.24.1