projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SX1: add hardware V2 support
[oweals/u-boot.git]
/
cpu
/
ixp
/
serial.c
diff --git
a/cpu/ixp/serial.c
b/cpu/ixp/serial.c
index cf520b699ed55a2b56ed8fd1fee14b5ae981ad24..dd26af49b54d00e21fb5dac5519dd82031cdcfa8 100644
(file)
--- a/
cpu/ixp/serial.c
+++ b/
cpu/ixp/serial.c
@@
-43,7
+43,7
@@
DECLARE_GLOBAL_DATA_PTR;
void serial_setbrg (void)
{
unsigned int quot = 0;
void serial_setbrg (void)
{
unsigned int quot = 0;
- int uart = C
FG
_IXP425_CONSOLE;
+ int uart = C
ONFIG_SYS
_IXP425_CONSOLE;
if ((gd->baudrate <= SERIAL_CLOCK) && (SERIAL_CLOCK % gd->baudrate == 0))
quot = SERIAL_CLOCK / gd->baudrate;
if ((gd->baudrate <= SERIAL_CLOCK) && (SERIAL_CLOCK % gd->baudrate == 0))
quot = SERIAL_CLOCK / gd->baudrate;
@@
-58,7
+58,11
@@
void serial_setbrg (void)
DLL(uart) = quot & 0xff;
DLH(uart) = quot >> 8;
LCR(uart) = LCR_WLS0 | LCR_WLS1;
DLL(uart) = quot & 0xff;
DLH(uart) = quot >> 8;
LCR(uart) = LCR_WLS0 | LCR_WLS1;
-
+#ifdef CONFIG_SERIAL_RTS_ACTIVE
+ MCR(uart) = MCR_RTS; /* set RTS active */
+#else
+ MCR(uart) = 0; /* set RTS inactive */
+#endif
IER(uart) = IER_UUE;
}
IER(uart) = IER_UUE;
}
@@
-81,9
+85,9
@@
int serial_init (void)
void serial_putc (const char c)
{
/* wait for room in the tx FIFO on UART */
void serial_putc (const char c)
{
/* wait for room in the tx FIFO on UART */
- while ((LSR(C
FG
_IXP425_CONSOLE) & LSR_TEMT) == 0);
+ while ((LSR(C
ONFIG_SYS
_IXP425_CONSOLE) & LSR_TEMT) == 0);
- THR(C
FG
_IXP425_CONSOLE) = c;
+ THR(C
ONFIG_SYS
_IXP425_CONSOLE) = c;
/* If \n, also do \r */
if (c == '\n')
/* If \n, also do \r */
if (c == '\n')
@@
-97,7
+101,7
@@
void serial_putc (const char c)
*/
int serial_tstc (void)
{
*/
int serial_tstc (void)
{
- return LSR(C
FG
_IXP425_CONSOLE) & LSR_DR;
+ return LSR(C
ONFIG_SYS
_IXP425_CONSOLE) & LSR_DR;
}
/*
}
/*
@@
-107,9
+111,9
@@
int serial_tstc (void)
*/
int serial_getc (void)
{
*/
int serial_getc (void)
{
- while (!(LSR(C
FG
_IXP425_CONSOLE) & LSR_DR));
+ while (!(LSR(C
ONFIG_SYS
_IXP425_CONSOLE) & LSR_DR));
- return (char) RBR(C
FG
_IXP425_CONSOLE) & 0xff;
+ return (char) RBR(C
ONFIG_SYS
_IXP425_CONSOLE) & 0xff;
}
void
}
void