2000-09-25 Joel Sherrill <joel@OARcorp.com>

	* include/bsp.h: tty_* renamed to console_*.
	* tty/tty.c: Ditto.
	* shmsupp/addrconv.c: Typo fixed.
	* wrapup/Makefile.am: Merge startup not start directory.

5 files changed, 15 insertions, 16 deletions

diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog b/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
index 6856525e29..25381915eb 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-25	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: tty_* renamed to console_*.
+	* tty/tty.c: Ditto.
+	* shmsupp/addrconv.c: Typo fixed.
+	* wrapup/Makefile.am: Merge startup not start directory.
+
 2000-09-04	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* shmsupp/Makefile.am, start/Makefile.am, startup/Makefile.am,
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
index f42d1d08a7..fb35dfb711 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
@@ -92,14 +92,6 @@ rtems_device_driver Clock_control(
 
 extern int use_print_buffer;
 
-/*
- * When not doing printf to a buffer, we do printf thru RTEMS libio
- * and our tty driver.  Set it up so that console is right.
- */
-
-#define CONSOLE_DRIVER_TABLE_ENTRY \
-  { tty_initialize, tty_open, tty_close, tty_read, tty_write, tty_control }
-
 #define HPPA_INTERRUPT_EXTERNAL_MPCI        HPPA_INTERRUPT_EXTERNAL_10
 
 rtems_isr_entry set_vector(rtems_isr_entry, rtems_vector_number, int);
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/addrconv.c b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/addrconv.c
index 49a70be604..170ea0ae7b 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/addrconv.c
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/addrconv.c
@@ -19,7 +19,7 @@
  */
 
 #include <bsp.h>
-shm_driverinclude <shm_driver.h>
+#include <shm_driver.h>
 
 void *Shm_Convert_address(
   void *address
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tty/tty.c b/c/src/lib/libbsp/hppa1.1/simhppa/tty/tty.c
index cc854b1f25..5e976e1884 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/tty/tty.c
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/tty/tty.c
@@ -38,7 +38,7 @@ static int host_read_syscall(int fd, char *buffer, int count);
 static int host_write_syscall(int fd, char *buffer, int count);
 
 rtems_device_driver
-tty_initialize(
+console_initialize(
     rtems_device_major_number major,
     rtems_device_minor_number minor,
     void                    * arg
@@ -56,7 +56,7 @@ tty_initialize(
 }
 
 rtems_device_driver
-tty_open(
+console_open(
     rtems_device_major_number major,
     rtems_device_minor_number minor,
     void                    * arg
@@ -66,7 +66,7 @@ tty_open(
 }
 
 rtems_device_driver
-tty_close(
+console_close(
     rtems_device_major_number major,
     rtems_device_minor_number minor,
     void                    * arg
@@ -76,7 +76,7 @@ tty_close(
 }
 
 rtems_device_driver
-tty_control(
+console_control(
     rtems_device_major_number major,
     rtems_device_minor_number minor,
     void                    * arg
@@ -87,7 +87,7 @@ tty_control(
 
 
 rtems_device_driver
-tty_read(
+console_read(
     rtems_device_major_number major,
     rtems_device_minor_number minor,
     void                    * arg
@@ -123,7 +123,7 @@ tty_read(
 }
 
 rtems_device_driver
-tty_write(
+console_write(
     rtems_device_major_number major,
     rtems_device_minor_number minor,
     void                    * arg
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.am
index 0ec54b2429..92acdd8422 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.am
@@ -15,7 +15,7 @@ GENERIC_FILES = $(GENERIC_MP_REL_FILES)
 if HAS_MP
 BSP_MP_O_FILES = shmsupp
 endif
-BSP_FILES = start tty $(BSP_MP_O_FILES)
+BSP_FILES = startup tty $(BSP_MP_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../../automake/compile.am