From 0fd4a133170981cef2520529e25c98a1702612f0 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 3 Jan 2001 16:42:59 +0000 Subject: 2001-01-03 Joel Sherrill * clock/Makefile.am: Fixed reference to ckinit.c. * clock/clockdrv.c: Enabled fast idle. * console/console-io.c: Added console_initialize_hardware(). --- c/src/lib/libbsp/mips/jmr3904/ChangeLog | 6 +++++ c/src/lib/libbsp/mips/jmr3904/clock/Makefile.am | 2 +- c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c | 2 ++ c/src/lib/libbsp/mips/jmr3904/console/console-io.c | 27 +++++++++++----------- 4 files changed, 22 insertions(+), 15 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog index 17dabc2a4c..0e428b3714 100644 --- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog +++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog @@ -1,3 +1,9 @@ +2001-01-03 Joel Sherrill + + * clock/Makefile.am: Fixed reference to ckinit.c. + * clock/clockdrv.c: Enabled fast idle. + * console/console-io.c: Added console_initialize_hardware(). + 2000-12-19 Joel Sherrill * timer: New subdirectory. diff --git a/c/src/lib/libbsp/mips/jmr3904/clock/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/clock/Makefile.am index 17ecfe4e15..1a377b56d1 100644 --- a/c/src/lib/libbsp/mips/jmr3904/clock/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/clock/Makefile.am @@ -28,6 +28,6 @@ all-local: $(ARCH) $(OBJS) $(PGM) .PRECIOUS: $(PGM) -EXTRA_DIST = ckinit.c +EXTRA_DIST = clockdrv.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c b/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c index d77db955cc..513db82a0c 100644 --- a/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c +++ b/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c @@ -10,6 +10,8 @@ #include #include +#define CLOCK_DRIVER_USE_FAST_IDLE + #define CLOCK_VECTOR TX3904_IRQ_TMR0 #define Clock_driver_support_at_tick() 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; -- cgit v1.2.3