diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-01-03 16:42:59 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-01-03 16:42:59 +0000 |
commit | 0fd4a133170981cef2520529e25c98a1702612f0 (patch) | |
tree | dcb42ca71a653ecd7622dfc3e756b48ce13a313f /c/src/lib/libbsp/mips/jmr3904/console/console-io.c | |
parent | 2001-01-03 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-0fd4a133170981cef2520529e25c98a1702612f0.tar.bz2 |
2001-01-03 Joel Sherrill <joel@OARcorp.com>
* clock/Makefile.am: Fixed reference to ckinit.c.
* clock/clockdrv.c: Enabled fast idle.
* console/console-io.c: Added console_initialize_hardware().
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/mips/jmr3904/console/console-io.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/mips/jmr3904/console/console-io.c b/c/src/lib/libbsp/mips/jmr3904/console/console-io.c index 75c8b45d17..085607a49b 100644 --- a/c/src/lib/libbsp/mips/jmr3904/console/console-io.c +++ b/c/src/lib/libbsp/mips/jmr3904/console/console-io.c @@ -56,9 +56,15 @@ static char initialized = 0; -void board_serial_init (void) +/* + * console_initialize_hardware + * + * This routine initializes the console hardware. + * + */ + +void console_initialize_hardware(void) { - initialized = 1; WRITE_UINT16 (DIAG_SLCR, 0x0020); WRITE_UINT16 (DIAG_SLDICR, 0x0000); WRITE_UINT16 (DIAG_SFCR, 0x0000); @@ -78,15 +84,11 @@ void console_outbyte_polled( { unsigned short disr; - if ( !initialized ) - board_serial_init(); - - for (;;) - { - READ_UINT16 (DIAG_SLDISR, disr); - if (disr & 0x0002) - break; - } + for (;;) { + READ_UINT16 (DIAG_SLDISR, disr); + if (disr & 0x0002) + break; + } disr = disr & ~0x0002; WRITE_UINT8 (DIAG_TFIFO, (unsigned char) ch); WRITE_UINT16 (DIAG_SLDISR, disr); @@ -105,9 +107,6 @@ int console_inbyte_nonblocking( unsigned char c; unsigned short disr; - if ( !initialized ) - board_serial_init(); - READ_UINT16 (DIAG_SLDISR, disr); if (disr & 0x0001) { disr = disr & ~0x0001; |