summaryrefslogtreecommitdiff
path: root/board/inka4x0
diff options
context:
space:
mode:
authorDetlev Zundel <dzu@denx.de>2009-04-03 11:53:01 +0200
committerWolfgang Denk <wd@denx.de>2009-04-03 22:34:07 +0200
commit200779e3e2a9aeda7030b171a8c39d7797019917 (patch)
treebafef8607a86769535fc91c5e54dcd94421cfcb5 /board/inka4x0
parent74de7aefd79690bae8cf5a5120f5962d444be089 (diff)
downloadu-boot-imx-200779e3e2a9aeda7030b171a8c39d7797019917.zip
u-boot-imx-200779e3e2a9aeda7030b171a8c39d7797019917.tar.gz
u-boot-imx-200779e3e2a9aeda7030b171a8c39d7797019917.tar.bz2
Rename common ns16550 constants with UART_ prefix to prevent conflicts
Fix problems introduced in commit 7b5611cdd12ca0cc33f994f0d4a4454788fc3124 [inka4x0: Add hardware diagnosis functions for inka4x0] which redefined MSR_RI which is already used on PowerPC systems. Also eliminate redundant definitions in ps2mult.h. More cleanup will be needed for other redundant occurrences though. Signed-off-by: Detlev Zundel <dzu@denx.de>
Diffstat (limited to 'board/inka4x0')
-rw-r--r--board/inka4x0/inkadiag.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/board/inka4x0/inkadiag.c b/board/inka4x0/inkadiag.c
index 06c9807..12c0a85 100644
--- a/board/inka4x0/inkadiag.c
+++ b/board/inka4x0/inkadiag.c
@@ -280,48 +280,48 @@ static int do_inkadiag_serial(cmd_tbl_t *cmdtp, int flag, int argc,
if ((num >= 0) && (num <= 7)) {
if (mode & 1) {
/* turn on 'loopback' mode */
- out_8(&uart->mcr, MCR_LOOP);
+ out_8(&uart->mcr, UART_MCR_LOOP);
} else {
/*
* establish the UART's operational parameters
* set DLAB=1, so rbr accesses DLL
*/
- out_8(&uart->lcr, LCR_DLAB);
+ out_8(&uart->lcr, UART_LCR_DLAB);
/* set baudrate */
out_8(&uart->rbr, combrd);
/* set data-format: 8-N-1 */
- out_8(&uart->lcr, LCR_WLS_8);
+ out_8(&uart->lcr, UART_LCR_WLS_8);
}
if (mode & 2) {
/* set request to send */
- out_8(&uart->mcr, MCR_RTS);
+ out_8(&uart->mcr, UART_MCR_RTS);
udelay(10);
/* check clear to send */
- if ((in_8(&uart->msr) & MSR_CTS) == 0x00)
+ if ((in_8(&uart->msr) & UART_MSR_CTS) == 0x00)
return -1;
}
if (mode & 4) {
/* set data terminal ready */
- out_8(&uart->mcr, MCR_DTR);
+ out_8(&uart->mcr, UART_MCR_DTR);
udelay(10);
/* check data set ready and carrier detect */
- if ((in_8(&uart->msr) & (MSR_DSR | MSR_DCD))
- != (MSR_DSR | MSR_DCD))
+ if ((in_8(&uart->msr) & (UART_MSR_DSR | UART_MSR_DCD))
+ != (UART_MSR_DSR | UART_MSR_DCD))
return -1;
}
/* write each message-character, read it back, and display it */
for (i = 0, len = strlen(argv[3]); i < len; ++i) {
j = 0;
- while ((in_8(&uart->lsr) & LSR_THRE) == 0x00) {
+ while ((in_8(&uart->lsr) & UART_LSR_THRE) == 0x00) {
if (j++ > CONFIG_SYS_HZ)
break;
udelay(10);
}
out_8(&uart->rbr, argv[3][i]);
j = 0;
- while ((in_8(&uart->lsr) & LSR_DR) == 0x00) {
+ while ((in_8(&uart->lsr) & UART_LSR_DR) == 0x00) {
if (j++ > CONFIG_SYS_HZ)
break;
udelay(10);