2001-01-03 Joel Sherrill <joel@OARcorp.com>

	* clock/clock.c: Use shared clock driver shell.
	* console/console.c: Removed.  Now use shared polling shell.
	* console/console-io.c: New file.
	* console/Makefile.am: Correct to use shared polling shell.
	* startup/bspstart.c: Remove all fast idle references.

3 files changed, 82 insertions, 200 deletions

diff --git a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am
index 52da84b904..4f702b653e 100644
--- a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am
@@ -4,9 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
+VPATH = @srcdir@:@srcdir@/../../../shared
+
 PGM = $(ARCH)/console.rel
 
-C_FILES = console.c
+C_FILES = console-io.c console-polled.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 S_FILES = consupp.S
@@ -31,6 +33,6 @@ all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
-EXTRA_DIST = console.c consupp.S
+EXTRA_DIST = console-io.c consupp.S
 
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/psim/console/console-io.c b/c/src/lib/libbsp/powerpc/psim/console/console-io.c
new file mode 100644
index 0000000000..a9567332c6
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/psim/console/console-io.c
@@ -0,0 +1,78 @@
+/*
+ *  This file contains the hardware specific portions of the TTY driver
+ *  for the serial ports on the erc32.
+ *
+ *  COPYRIGHT (c) 1989-2000.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.OARcorp.com/rtems/license.html.
+ *
+ *  $Id$
+ */
+
+#include <bsp.h>
+#include <rtems/libio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+/*
+ *  console_initialize_hardware
+ *
+ *  This routine initializes the console hardware.
+ *
+ */
+
+void console_initialize_hardware(void)
+{
+}
+
+/* external prototypes for monitor interface routines */
+
+void outbyte( char );
+char inbyte( void );
+
+/*
+ *  console_outbyte_polled
+ *
+ *  This routine transmits a character using polling.
+ */
+
+void console_outbyte_polled(
+  int  port,
+  char ch
+)
+{
+  outbyte( ch );
+}
+
+/*
+ *  console_inbyte_nonblocking 
+ *
+ *  This routine polls for a character.
+ */
+
+int console_inbyte_nonblocking(
+  int port
+)
+{
+  char c;
+
+  c = inbyte();
+  if (!c)
+    return -1;
+  return c;
+}
+
+/*
+ *  To support printk
+ */
+
+#include <bspIo.h>
+
+void PSIM_output_char(char c) { console_outbyte_polled( 0, c ); }
+
+BSP_output_char_function_type           BSP_output_char = PSIM_output_char;
+BSP_polling_getchar_function_type       BSP_poll_char = NULL;
+
diff --git a/c/src/lib/libbsp/powerpc/psim/console/console.c b/c/src/lib/libbsp/powerpc/psim/console/console.c
deleted file mode 100644
index 90e46e6c06..0000000000
--- a/c/src/lib/libbsp/powerpc/psim/console/console.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- *  This file contains the hardware specific portions of the TTY driver
- *  for the serial ports on the erc32.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-/* external prototypes for monitor interface routines */
-
-void outbyte( char );
-char inbyte( void );
-
-/*
- *  console_outbyte_polled
- *
- *  This routine transmits a character using polling.
- */
-
-void console_outbyte_polled(
-  int  port,
-  char ch
-)
-{
-  outbyte( ch );
-}
-
-/*
- *  console_inbyte_nonblocking 
- *
- *  This routine polls for a character.
- */
-
-int console_inbyte_nonblocking(
-  int port
-)
-{
-  char c;
-
-  c = inbyte();
-  if (!c)
-    return -1;
-  return c;
-}
-
-/*
- *  DEBUG_puts
- *
- *  This should be safe in the event of an error.  It attempts to insure
- *  that no TX empty interrupts occur while it is doing polled IO.  Then
- *  it restores the state of that external interrupt.
- *
- *  Input parameters:
- *    string  - pointer to debug output string
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- */
-
-void DEBUG_puts(
-  char *string
-)
-{
-  char *s;
-
-  /* XXX should disable interrupts around this if interrupt driven */
-
-  for ( s = string ; *s ; s++ ) 
-    console_outbyte_polled( 0, *s );
-
-  console_outbyte_polled( 0, '\r' );
-  console_outbyte_polled( 0, '\n' );
-}
-
-
-/*
- *  Console Termios Support Entry Points
- *
- */
-
-int console_write_support (
-  int minor,
-  const char *bufarg,
-  int len
-)
-{
-  int nwrite = 0;
-  const char *buf = bufarg;
-
-  while (nwrite < len) {
-    console_outbyte_polled( minor, *buf++ );
-    nwrite++;
-  }
-  return nwrite;
-}
-
-/*
- *  Console Device Driver Entry Points
- *
- */
- 
-rtems_device_driver console_initialize(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *arg
-)
-{
-  rtems_status_code status;
-
-  rtems_termios_initialize();
-
-  /*
-   *  Register Device Names
-   */
-
-  status = rtems_io_register_name( "/dev/console", major, 0 );
-  if (status != RTEMS_SUCCESSFUL)
-    rtems_fatal_error_occurred(status);
-
-  return RTEMS_SUCCESSFUL;
-}
-
-rtems_device_driver console_open(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  rtems_status_code sc;
-  static const rtems_termios_callbacks pollCallbacks = {
-    NULL,                        /* firstOpen */
-    NULL,                        /* lastClose */
-    console_inbyte_nonblocking,  /* pollRead */
-    console_write_support,       /* write */
-    NULL,                        /* setAttributes */
-    NULL,                        /* stopRemoteTx */
-    NULL,                        /* startRemoteTx */
-    0                            /* outputUsesInterrupts */
-  };
-
-
-  assert( minor <= 1 );
-  if ( minor > 2 )
-    return RTEMS_INVALID_NUMBER;
- 
-  sc = rtems_termios_open (major, minor, arg, &pollCallbacks );
-
-  return RTEMS_SUCCESSFUL;
-}
- 
-rtems_device_driver console_close(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  return rtems_termios_close (arg);
-}
- 
-rtems_device_driver console_read(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  return rtems_termios_read (arg);
-}
- 
-rtems_device_driver console_write(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  return rtems_termios_write (arg);
-}
- 
-rtems_device_driver console_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  return rtems_termios_ioctl (arg);
-}