--- zzzz-none-000/linux-2.4.17/arch/mips/mips-boards/generic/display.c 2001-04-14 03:26:07.000000000 +0000 +++ sangam-fb-322/linux-2.4.17/arch/mips/mips-boards/generic/display.c 2004-11-24 13:22:35.000000000 +0000 @@ -2,6 +2,9 @@ * Carsten Langgaard, carstenl@mips.com * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. * + * Jeff Harrell, jharrell@ti.com + * Copyright (C) 2000,2001 Texas Instruments, Inc. All rights reserved. + * * ######################################################################## * * This program is free software; you can distribute it and/or modify it @@ -23,25 +26,30 @@ * */ +#include #include void mips_display_message(const char *str) { - volatile unsigned int *display = (void *)ASCII_DISPLAY_POS_BASE; +#if defined(CONFIG_MIPS_SEAD2) + volatile unsigned int *display = (void *)SEAD_ASCII_DISPLAY_POS_BASE; int i; - for (i = 0; i <= 14; i=i+2) { - if (*str) - display[i] = *str++; - else - display[i] = ' '; - } + for (i = 0; i <= 14; i+=2) + { + if (*str) + display[i] = *str++; + else + display[i] = ' '; + } +#endif /* CONFIG_MIPS_SEAD2 */ } void mips_display_word(unsigned int num) { - volatile unsigned int *display = (void *)ASCII_DISPLAY_WORD_BASE; - +#if (CONFIG_MIPS_SEAD2) + volatile char *display = (void *)SEAD_ASCII_DISPLAY_WORD_BASE; *display = num; +#endif /* CONFIG_MIPS_SEAD2 */ }