Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340369
b: refs/heads/master
c: 97a70b1
h: refs/heads/master
i:
  340367: 446ce47
v: v3
  • Loading branch information
Mark Salter authored and David Howells committed Dec 12, 2012
1 parent daf4433 commit c97f216
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8f0bcbcab016324c2a3ba4cc715e8e523c29a578
refs/heads/master: 97a70b14395be0ca61b9fa56f8ff5f6313c26423
8 changes: 4 additions & 4 deletions trunk/arch/mn10300/kernel/mn10300-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -1629,12 +1629,12 @@ static void mn10300_serial_console_write(struct console *co,

while (*port->_status & SC01STR_TBF)
continue;
*(u8 *) port->_txb = ch;
*port->_txb = ch;

if (ch == 0x0a) {
while (*port->_status & SC01STR_TBF)
continue;
*(u8 *) port->_txb = 0xd;
*port->_txb = 0xd;
}
}

Expand Down Expand Up @@ -1759,12 +1759,12 @@ static void mn10300_serial_poll_put_char(struct uart_port *_port,
tmp = *port->_intr;

if (ch == 0x0a) {
*(u8 *) port->_txb = 0x0d;
*port->_txb = 0x0d;
while (*port->_status & SC01STR_TBF)
continue;
}

*(u8 *) port->_txb = ch;
*port->_txb = ch;
while (*port->_status & SC01STR_TBF)
continue;

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/mn10300/kernel/mn10300-serial.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ struct mn10300_serial_port {
volatile u16 *_control; /* control register pointer */
volatile u8 *_status; /* status register pointer */
volatile u8 *_intr; /* interrupt register pointer */
volatile void *_rxb; /* receive buffer register pointer */
volatile void *_txb; /* transmit buffer register pointer */
volatile u8 *_rxb; /* receive buffer register pointer */
volatile u8 *_txb; /* transmit buffer register pointer */
volatile u16 *_tmicr; /* timer interrupt control register */
volatile u8 *_tmxmd; /* baud rate timer mode register */
volatile u16 *_tmxbr; /* baud rate timer base register */
Expand Down

0 comments on commit c97f216

Please sign in to comment.