Skip to content
Snippets Groups Projects
Commit b3e112bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents f647a274 0a8b80c5
No related merge requests found
Hide whitespace changes
Inline Side-by-side
drivers/serial/8250.c
+ 5
− 5
View file @ b3e112bc
...@@ -1682,22 +1682,22 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios, ...@@ -1682,22 +1682,22 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios,
switch (termios->c_cflag & CSIZE) { switch (termios->c_cflag & CSIZE) {
case CS5: case CS5:
cval = 0x00; cval = UART_LCR_WLEN5;
break; break;
case CS6: case CS6:
cval = 0x01; cval = UART_LCR_WLEN6;
break; break;
case CS7: case CS7:
cval = 0x02; cval = UART_LCR_WLEN7;
break; break;
default: default:
case CS8: case CS8:
cval = 0x03; cval = UART_LCR_WLEN8;
break; break;
} }
if (termios->c_cflag & CSTOPB) if (termios->c_cflag & CSTOPB)
cval |= 0x04; cval |= UART_LCR_STOP;
if (termios->c_cflag & PARENB) if (termios->c_cflag & PARENB)
cval |= UART_LCR_PARITY; cval |= UART_LCR_PARITY;
if (!(termios->c_cflag & PARODD)) if (!(termios->c_cflag & PARODD))
......
drivers/serial/au1x00_uart.c
+ 5
− 5
View file @ b3e112bc
...@@ -773,22 +773,22 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios, ...@@ -773,22 +773,22 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios,
switch (termios->c_cflag & CSIZE) { switch (termios->c_cflag & CSIZE) {
case CS5: case CS5:
cval = 0x00; cval = UART_LCR_WLEN5;
break; break;
case CS6: case CS6:
cval = 0x01; cval = UART_LCR_WLEN6;
break; break;
case CS7: case CS7:
cval = 0x02; cval = UART_LCR_WLEN7;
break; break;
default: default:
case CS8: case CS8:
cval = 0x03; cval = UART_LCR_WLEN8;
break; break;
} }
if (termios->c_cflag & CSTOPB) if (termios->c_cflag & CSTOPB)
cval |= 0x04; cval |= UART_LCR_STOP;
if (termios->c_cflag & PARENB) if (termios->c_cflag & PARENB)
cval |= UART_LCR_PARITY; cval |= UART_LCR_PARITY;
if (!(termios->c_cflag & PARODD)) if (!(termios->c_cflag & PARODD))
......
drivers/serial/m32r_sio.c
+ 5
− 5
View file @ b3e112bc
...@@ -724,22 +724,22 @@ static void m32r_sio_set_termios(struct uart_port *port, ...@@ -724,22 +724,22 @@ static void m32r_sio_set_termios(struct uart_port *port,
switch (termios->c_cflag & CSIZE) { switch (termios->c_cflag & CSIZE) {
case CS5: case CS5:
cval = 0x00; cval = UART_LCR_WLEN5;
break; break;
case CS6: case CS6:
cval = 0x01; cval = UART_LCR_WLEN6;
break; break;
case CS7: case CS7:
cval = 0x02; cval = UART_LCR_WLEN7;
break; break;
default: default:
case CS8: case CS8:
cval = 0x03; cval = UART_LCR_WLEN8;
break; break;
} }
if (termios->c_cflag & CSTOPB) if (termios->c_cflag & CSTOPB)
cval |= 0x04; cval |= UART_LCR_STOP;
if (termios->c_cflag & PARENB) if (termios->c_cflag & PARENB)
cval |= UART_LCR_PARITY; cval |= UART_LCR_PARITY;
if (!(termios->c_cflag & PARODD)) if (!(termios->c_cflag & PARODD))
......
drivers/serial/pxa.c
+ 5
− 5
View file @ b3e112bc
...@@ -455,22 +455,22 @@ serial_pxa_set_termios(struct uart_port *port, struct termios *termios, ...@@ -455,22 +455,22 @@ serial_pxa_set_termios(struct uart_port *port, struct termios *termios,
switch (termios->c_cflag & CSIZE) { switch (termios->c_cflag & CSIZE) {
case CS5: case CS5:
cval = 0x00; cval = UART_LCR_WLEN5;
break; break;
case CS6: case CS6:
cval = 0x01; cval = UART_LCR_WLEN6;
break; break;
case CS7: case CS7:
cval = 0x02; cval = UART_LCR_WLEN7;
break; break;
default: default:
case CS8: case CS8:
cval = 0x03; cval = UART_LCR_WLEN8;
break; break;
} }
if (termios->c_cflag & CSTOPB) if (termios->c_cflag & CSTOPB)
cval |= 0x04; cval |= UART_LCR_STOP;
if (termios->c_cflag & PARENB) if (termios->c_cflag & PARENB)
cval |= UART_LCR_PARITY; cval |= UART_LCR_PARITY;
if (!(termios->c_cflag & PARODD)) if (!(termios->c_cflag & PARODD))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment