2000-11-01 Joel Sherrill <joel@OARcorp.com>

* include/Makefile.am, include/rtems/libio_.h, libc/Makefile.am,
	libc/assoc.c, libc/assocnamebad.c, libc/base_fs.c, libc/cfsetispeed.c,
	libc/cfsetospeed.c, libc/chdir.c, libc/chmod.c, libc/chown.c,
	libc/close.c, libc/closedir.c, libc/dup2.c, libc/error.c, libc/eval.c,
	libc/fchdir.c, libc/fchmod.c, libc/fcntl.c, libc/fdatasync.c,
	libc/fpathconf.c, libc/fstat.c, libc/fsync.c, libc/ftruncate.c,
	libc/getdents.c, libc/ioctl.c, libc/libio.c, libc/libio_sockets.c,
	libc/link.c, libc/lseek.c, libc/malloc.c, libc/mallocfreespace.c,
	libc/mknod.c, libc/mount.c, libc/newlibc.c, libc/no_libc.c,
	libc/open.c, libc/read.c, libc/readlink.c, libc/rmdir.c, libc/stat.c,
	libc/symlink.c, libc/tcsetattr.c, libc/telldir.c, libc/ttyname.c,
	libc/ttyname_r.c, libc/umask.c, libc/unlink.c, libc/unmount.c,
	libc/utime.c, libc/write.c:
	assoc.h, error.h, libio_.h, libio.h, and libcsupport.h moved
	from libc to lib/include/rtems and now must be referenced as
	<rtems/XXX.h>.
	* include/rtems/Makefile.am, include/rtems/.cvsignore: New file.
	* include/rtems/assoc.h, include/rtems/error.h,
	include/rtems/libcsupport.h, include/rtems/libio.h,
	include/rtems/libio_.h: New/moved files.

c/src/exec/include/rtems/libio_.h

@@ -11,8 +11,8 @@
  *  $Id$
  */
 
-#ifndef __LIBIO__h
-#define __LIBIO__h
+#ifndef __RTEMS_LIBIO_INTERNAL__h
+#define __RTEMS_LIBIO_INTERNAL__h
 
 #ifdef __cplusplus
 extern "C" {

c/src/exec/libcsupport/include/rtems/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

c/src/exec/libcsupport/include/rtems/libio_.h

@@ -11,8 +11,8 @@
  *  $Id$
  */
 
-#ifndef __LIBIO__h
-#define __LIBIO__h
+#ifndef __RTEMS_LIBIO_INTERNAL__h
+#define __RTEMS_LIBIO_INTERNAL__h
 
 #ifdef __cplusplus
 extern "C" {

c/src/exec/libcsupport/src/Makefile.am

@@ -56,34 +56,10 @@ C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
 endif
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
-H_FILES = libcsupport.h
-SYS_H_FILES =
-RTEMS_H_FILES = assoc.h error.h libio.h
-noinst_HEADERS = libio_.h
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \
-    $(PROJECT_INCLUDE)/sys $(H_FILES:%=$(PROJECT_INCLUDE)/%) \
-    $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \
-    $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
-
-$(PROJECT_INCLUDE):
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems:
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/sys:
-	@$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/rtems/%.h: %.h
-	$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/sys/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 OBJS = $(C_O_FILES)
@@ -105,6 +81,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 DOC_FILES = TODO CASES
 
 EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
-    $(UNIX_C_FILES) $(H_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
+    $(UNIX_C_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/exec/libcsupport/src/assoc.c

@@ -6,7 +6,7 @@
  */
 
 #include <rtems.h>
-#include "assoc.h"
+#include <rtems/assoc.h>
 
 #include <string.h>             /* strcat, strcmp */
 

c/src/exec/libcsupport/src/assocnamebad.c

@@ -6,7 +6,7 @@
  */
 
 #include <rtems.h>
-#include "assoc.h"
+#include <rtems/assoc.h>
 
 #include <stdio.h>              /* sprintf */
 #include <string.h>             /* strcat, strcmp */

c/src/exec/libcsupport/src/base_fs.c

@@ -13,7 +13,7 @@
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 /*
  *  Global information for the base file system.

c/src/exec/libcsupport/src/cfsetispeed.c

@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <termios.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int cfsetispeed(
   struct termios *tp,

c/src/exec/libcsupport/src/cfsetospeed.c

@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <termios.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int cfsetospeed(
   struct termios *tp,

c/src/exec/libcsupport/src/chdir.c

@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int chdir(
   const char *pathname

c/src/exec/libcsupport/src/chmod.c

@@ -18,7 +18,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int chmod(
   const char *path,

c/src/exec/libcsupport/src/chown.c

@@ -17,7 +17,7 @@
 #include <rtems.h>
 #include <rtems/libio.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int chown(
   const char *path,

c/src/exec/libcsupport/src/close.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int close(
   int  fd

c/src/exec/libcsupport/src/closedir.c

@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)closedir.c	5.9 (Berkeley) 2/23/91";
 #include <errno.h>
 
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 /*
  * close a directory.

c/src/exec/libcsupport/src/dup2.c

@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int dup2(
   int fildes,

c/src/exec/libcsupport/src/error.c

@@ -43,7 +43,7 @@
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
 
-#include "error.h"
+#include <rtems/error.h>
 #include <rtems/assoc.h>
 
 #include <stdio.h>

c/src/exec/libcsupport/src/eval.c

@@ -14,7 +14,7 @@
  */
 
 #include <rtems.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int rtems_filesystem_evaluate_path(
   const char                        *pathname,

c/src/exec/libcsupport/src/fchdir.c

@@ -17,7 +17,7 @@
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fchdir(
   int       fd

c/src/exec/libcsupport/src/fchmod.c

@@ -17,7 +17,7 @@
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fchmod(
   int       fd,

c/src/exec/libcsupport/src/fcntl.c

@@ -16,7 +16,7 @@
 #include <errno.h>
 
 #include <rtems.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fcntl(
   int fd,

c/src/exec/libcsupport/src/fdatasync.c

@@ -13,7 +13,7 @@
 
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fdatasync(
   int     fd

c/src/exec/libcsupport/src/fpathconf.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 #include <errno.h>

c/src/exec/libcsupport/src/fstat.c

@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fstat(
   int          fd,

c/src/exec/libcsupport/src/fsync.c

@@ -13,7 +13,7 @@
 
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fsync(
   int     fd

c/src/exec/libcsupport/src/ftruncate.c

@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int ftruncate(
   int     fd,

c/src/exec/libcsupport/src/getdents.c

@@ -19,7 +19,7 @@
 
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int getdents(
   int   dd_fd,

c/src/exec/libcsupport/src/ioctl.c

@@ -14,7 +14,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 

c/src/exec/libcsupport/src/libio.c

@@ -13,7 +13,7 @@
  *  $Id$
  */
 
-#include "libio_.h"                   /* libio_.h pulls in rtems */
+#include <rtems/libio_.h>               /* libio_.h pulls in rtems */
 #include <rtems.h>
 #include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
 

c/src/exec/libcsupport/src/libio_sockets.c

@@ -12,7 +12,7 @@
  *  $Id$
  */
 
-#include "libio_.h"                   /* libio_.h pulls in rtems */
+#include <rtems/libio_.h>             /* libio_.h pulls in rtems */
 #include <rtems.h>
 
 #include <errno.h>

c/src/exec/libcsupport/src/link.c

@@ -15,7 +15,7 @@
 #include <rtems/libio.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int link(
   const char *existing,

c/src/exec/libcsupport/src/lseek.c

@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 off_t lseek(
   int     fd,

c/src/exec/libcsupport/src/malloc.c

@@ -14,7 +14,7 @@
 
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include "libcsupport.h"
+#include <rtems/libcsupport.h>
 #ifdef RTEMS_NEWLIB
 #include <sys/reent.h>
 #endif

c/src/exec/libcsupport/src/mallocfreespace.c

@@ -14,7 +14,7 @@
 
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include "libcsupport.h"
+#include <rtems/libcsupport.h>
 
 #include <stdio.h>
 #include <stdlib.h>

c/src/exec/libcsupport/src/mknod.c

@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int mknod(
   const char *pathname,

c/src/exec/libcsupport/src/mount.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 Chain_Control rtems_filesystem_mount_table_control;
 

c/src/exec/libcsupport/src/newlibc.c

@@ -17,7 +17,7 @@
 #include <rtems.h>
 
 #if defined(RTEMS_NEWLIB)
-#include <libcsupport.h>
+#include <rtems/libcsupport.h>
 #include <stdlib.h>             /* for free() */
 #include <string.h>             /* for memset() */
 

c/src/exec/libcsupport/src/no_libc.c

@@ -16,7 +16,7 @@
 #include <rtems.h>
 #if !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX)
 
-#include "libcsupport.h"
+#include <rtems/libcsupport.h>
 
 #include <stdlib.h>             /* for free() */
 

c/src/exec/libcsupport/src/open.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 

c/src/exec/libcsupport/src/read.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 ssize_t read(
   int         fd,

c/src/exec/libcsupport/src/readlink.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int readlink(
   const char *pathname,

c/src/exec/libcsupport/src/rmdir.c

@@ -17,7 +17,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int rmdir(
   const char *pathname

c/src/exec/libcsupport/src/stat.c

@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int _STAT_NAME(
   const char  *path,

c/src/exec/libcsupport/src/symlink.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int symlink(
   const char *actualpath,

c/src/exec/libcsupport/src/tcsetattr.c

@@ -21,7 +21,7 @@
 /* #include <sys/ioctl.h> */
 
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int tcsetattr(
   int             fd,

c/src/exec/libcsupport/src/telldir.c

@@ -17,7 +17,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 
 long telldir(

c/src/exec/libcsupport/src/ttyname.c

@@ -14,7 +14,7 @@
 #include <_syslist.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 
 int ttyname_r(

c/src/exec/libcsupport/src/ttyname_r.c

@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)ttyname.c	5.10 (Berkeley) 5/6/91";
 #include <_syslist.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 /*
  *  ttyname_r() - POSIX 1003.1b 4.7.2 - Demetermine Terminal Device Name

c/src/exec/libcsupport/src/umask.c

@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 mode_t umask(
   mode_t cmask

c/src/exec/libcsupport/src/unlink.c

@@ -13,7 +13,7 @@
 
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int unlink( 
   const char *path 

c/src/exec/libcsupport/src/unmount.c

@@ -26,7 +26,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 /*
  *  Data structures and routines private to mount/unmount pair.

c/src/exec/libcsupport/src/utime.c

@@ -15,7 +15,7 @@
 #include <utime.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int utime(
   const char           *path,

c/src/exec/libcsupport/src/write.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 
 /*

c/src/lib/ChangeLog

@@ -1,4 +1,31 @@
 
+2000-11-01	Joel Sherrill <joel@OARcorp.com>
+
+	* configure.in: Added include/rtems subdirectory.
+
+2000-11-01	Joel Sherrill <joel@OARcorp.com>
+
+	* include/Makefile.am, include/rtems/libio_.h, libc/Makefile.am,
+	libc/assoc.c, libc/assocnamebad.c, libc/base_fs.c, libc/cfsetispeed.c,
+	libc/cfsetospeed.c, libc/chdir.c, libc/chmod.c, libc/chown.c,
+	libc/close.c, libc/closedir.c, libc/dup2.c, libc/error.c, libc/eval.c,
+	libc/fchdir.c, libc/fchmod.c, libc/fcntl.c, libc/fdatasync.c,
+	libc/fpathconf.c, libc/fstat.c, libc/fsync.c, libc/ftruncate.c,
+	libc/getdents.c, libc/ioctl.c, libc/libio.c, libc/libio_sockets.c,
+	libc/link.c, libc/lseek.c, libc/malloc.c, libc/mallocfreespace.c,
+	libc/mknod.c, libc/mount.c, libc/newlibc.c, libc/no_libc.c,
+	libc/open.c, libc/read.c, libc/readlink.c, libc/rmdir.c, libc/stat.c,
+	libc/symlink.c, libc/tcsetattr.c, libc/telldir.c, libc/ttyname.c,
+	libc/ttyname_r.c, libc/umask.c, libc/unlink.c, libc/unmount.c,
+	libc/utime.c, libc/write.c:
+	assoc.h, error.h, libio_.h, libio.h, and libcsupport.h moved 
+	from libc to lib/include/rtems and now must be referenced as
+	<rtems/XXX.h>.  
+	* include/rtems/Makefile.am, include/rtems/.cvsignore: New file.
+	* include/rtems/assoc.h, include/rtems/error.h,
+	include/rtems/libcsupport.h, include/rtems/libio.h,
+	include/rtems/libio_.h: New/moved files.
+
 2000-10-26      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.in: Remove bogus cfg_subdirs.

c/src/lib/include/Makefile.am

@@ -19,7 +19,7 @@ $(PROJECT_INCLUDE)/%.h: %.h
 
 all-local: $(PREINSTALL_FILES)
 
-SUBDIRS = sys motorola zilog
+SUBDIRS = sys rtems motorola zilog
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am

c/src/lib/include/rtems/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

c/src/lib/include/rtems/Makefile.am

@@ -0,0 +1,21 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+H_FILES = assoc.h error.h libcsupport.h libio.h libio_.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
+
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+all-local: $(PREINSTALL_FILES)
+
+include $(top_srcdir)/../../../automake/local.am

c/src/lib/include/rtems/libio_.h

@@ -11,8 +11,8 @@
  *  $Id$
  */
 
-#ifndef __LIBIO__h
-#define __LIBIO__h
+#ifndef __RTEMS_LIBIO_INTERNAL__h
+#define __RTEMS_LIBIO_INTERNAL__h
 
 #ifdef __cplusplus
 extern "C" {

c/src/lib/libc/Makefile.am

@@ -56,34 +56,10 @@ C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
 endif
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
-H_FILES = libcsupport.h
-SYS_H_FILES =
-RTEMS_H_FILES = assoc.h error.h libio.h
-noinst_HEADERS = libio_.h
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \
-    $(PROJECT_INCLUDE)/sys $(H_FILES:%=$(PROJECT_INCLUDE)/%) \
-    $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \
-    $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
-
-$(PROJECT_INCLUDE):
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems:
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/sys:
-	@$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/rtems/%.h: %.h
-	$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/sys/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 OBJS = $(C_O_FILES)
@@ -105,6 +81,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 DOC_FILES = TODO CASES
 
 EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
-    $(UNIX_C_FILES) $(H_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
+    $(UNIX_C_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/lib/libc/assoc.c

@@ -6,7 +6,7 @@
  */
 
 #include <rtems.h>
-#include "assoc.h"
+#include <rtems/assoc.h>
 
 #include <string.h>             /* strcat, strcmp */
 

c/src/lib/libc/assoc.h

@@ -1,42 +0,0 @@
-/*
- *
- *  Rtems associativity routines.  Mainly used to convert a value from
- *  one space to another (eg: our errno's to host errno's and v.v)
- *
- *
- *  $Id$
- */
-
-#ifndef _INCLUDE_ASSOC_H
-#define _INCLUDE_ASSOC_H
-
-typedef struct {
-    const char   *name;
-    unsigned32   local_value;
-    unsigned32   remote_value;
-} rtems_assoc_t;
-
-/*
- * Flag/marker for optional default value in each table
- */
-
-#define RTEMS_ASSOC_DEFAULT_NAME "(default)"
-
-const rtems_assoc_t *rtems_assoc_ptr_by_name(const rtems_assoc_t *, const char *);
-const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, unsigned32);
-const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_local_by_remote(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *);
-unsigned32   rtems_assoc_local_by_name(const rtems_assoc_t *, const char *);
-const char  *rtems_assoc_name_by_local(const rtems_assoc_t *, unsigned32);
-const char  *rtems_assoc_name_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, unsigned32);
-char  *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, unsigned32, char *);
-char  *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, unsigned32, char *);
-unsigned32   rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, unsigned32);
-
-
-#endif /* ! _INCLUDE_ASSOC_H */

c/src/lib/libc/assocnamebad.c

@@ -6,7 +6,7 @@
  */
 
 #include <rtems.h>
-#include "assoc.h"
+#include <rtems/assoc.h>
 
 #include <stdio.h>              /* sprintf */
 #include <string.h>             /* strcat, strcmp */

c/src/lib/libc/base_fs.c

@@ -13,7 +13,7 @@
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 /*
  *  Global information for the base file system.

c/src/lib/libc/cfsetispeed.c

@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <termios.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int cfsetispeed(
   struct termios *tp,

c/src/lib/libc/cfsetospeed.c

@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <termios.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int cfsetospeed(
   struct termios *tp,

c/src/lib/libc/chdir.c

@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int chdir(
   const char *pathname

c/src/lib/libc/chmod.c

@@ -18,7 +18,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int chmod(
   const char *path,

c/src/lib/libc/chown.c

@@ -17,7 +17,7 @@
 #include <rtems.h>
 #include <rtems/libio.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int chown(
   const char *path,

c/src/lib/libc/close.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int close(
   int  fd

c/src/lib/libc/closedir.c

@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)closedir.c	5.9 (Berkeley) 2/23/91";
 #include <errno.h>
 
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 /*
  * close a directory.

c/src/lib/libc/dup2.c

@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int dup2(
   int fildes,

c/src/lib/libc/error.c

@@ -43,7 +43,7 @@
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
 
-#include "error.h"
+#include <rtems/error.h>
 #include <rtems/assoc.h>
 
 #include <stdio.h>

c/src/lib/libc/error.h

@@ -1,47 +0,0 @@
-/*
- *  Defines and externs for rtems error reporting
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ERROR_h
-#define __RTEMS_ERROR_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * rtems_error() and rtems_panic() support
- */
-
-#define RTEMS_ERROR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define RTEMS_ERROR_PANIC  (RTEMS_ERROR_ERRNO / 2)       /* err fatal; no return */
-#define RTEMS_ERROR_ABORT  (RTEMS_ERROR_ERRNO / 4)       /* err is fatal; panic */
-
-#define RTEMS_ERROR_MASK  (RTEMS_ERROR_ERRNO | RTEMS_ERROR_ABORT | \
-                             RTEMS_ERROR_PANIC) /* all */
-
-const char *rtems_status_text(rtems_status_code);
-int   rtems_error(int error_code, const char *printf_format, ...);
-#ifdef __GNUC__
-void  rtems_panic(const char *printf_format, ...);
-/*
- *  We should be able to use this attribute but gcc complains that
- *  rtems_panic does in fact return. :(
- *
- *      __attribute__ ((__noreturn__));
- */
-#else
-void  rtems_panic(const char *printf_format, ...);
-#endif
-
-extern int rtems_panic_in_progress;
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
-/* end of include file */

c/src/lib/libc/eval.c

@@ -14,7 +14,7 @@
  */
 
 #include <rtems.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int rtems_filesystem_evaluate_path(
   const char                        *pathname,

c/src/lib/libc/fchdir.c

@@ -17,7 +17,7 @@
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fchdir(
   int       fd

c/src/lib/libc/fchmod.c

@@ -17,7 +17,7 @@
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fchmod(
   int       fd,

c/src/lib/libc/fcntl.c

@@ -16,7 +16,7 @@
 #include <errno.h>
 
 #include <rtems.h>
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fcntl(
   int fd,

c/src/lib/libc/fdatasync.c

@@ -13,7 +13,7 @@
 
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fdatasync(
   int     fd

c/src/lib/libc/fpathconf.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 #include <errno.h>

c/src/lib/libc/fstat.c

@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fstat(
   int          fd,

c/src/lib/libc/fsync.c

@@ -13,7 +13,7 @@
 
 #include <unistd.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int fsync(
   int     fd

c/src/lib/libc/ftruncate.c

@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int ftruncate(
   int     fd,

c/src/lib/libc/getdents.c

@@ -19,7 +19,7 @@
 
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int getdents(
   int   dd_fd,

c/src/lib/libc/ioctl.c

@@ -14,7 +14,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 

c/src/lib/libc/libcsupport.h

@@ -1,43 +0,0 @@
-/*  libcsupport.h
- *
- *  This include file contains the information regarding the
- *  RTEMS specific support for the standard C library.
- *
- *  COPYRIGHT (c) 1989-1999.
- *  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$
- */
-
-#ifndef __LIBC_SUPPORT_h
-#define __LIBC_SUPPORT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/types.h>
-
-void RTEMS_Malloc_Initialize(
-  void   *start,
-  size_t  length,
-  size_t  sbrk_amount
-);
-
-extern void malloc_dump(void);
-extern void malloc_walk(size_t source, size_t printf_enabled);
-extern void libc_init(int reentrant);
-extern int  host_errno(void);
-extern void fix_syscall_errno(void);
-extern size_t malloc_free_space();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */

c/src/lib/libc/libio.c

@@ -13,7 +13,7 @@
  *  $Id$
  */
 
-#include "libio_.h"                   /* libio_.h pulls in rtems */
+#include <rtems/libio_.h>               /* libio_.h pulls in rtems */
 #include <rtems.h>
 #include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
 

c/src/lib/libc/libio_sockets.c

@@ -12,7 +12,7 @@
  *  $Id$
  */
 
-#include "libio_.h"                   /* libio_.h pulls in rtems */
+#include <rtems/libio_.h>             /* libio_.h pulls in rtems */
 #include <rtems.h>
 
 #include <errno.h>

c/src/lib/libc/link.c

@@ -15,7 +15,7 @@
 #include <rtems/libio.h>
 #include <errno.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int link(
   const char *existing,

c/src/lib/libc/lseek.c

@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 off_t lseek(
   int     fd,

c/src/lib/libc/malloc.c

@@ -14,7 +14,7 @@
 
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include "libcsupport.h"
+#include <rtems/libcsupport.h>
 #ifdef RTEMS_NEWLIB
 #include <sys/reent.h>
 #endif

c/src/lib/libc/mallocfreespace.c

@@ -14,7 +14,7 @@
 
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include "libcsupport.h"
+#include <rtems/libcsupport.h>
 
 #include <stdio.h>
 #include <stdlib.h>

c/src/lib/libc/mknod.c

@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int mknod(
   const char *pathname,

c/src/lib/libc/mount.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 Chain_Control rtems_filesystem_mount_table_control;
 

c/src/lib/libc/newlibc.c

@@ -17,7 +17,7 @@
 #include <rtems.h>
 
 #if defined(RTEMS_NEWLIB)
-#include <libcsupport.h>
+#include <rtems/libcsupport.h>
 #include <stdlib.h>             /* for free() */
 #include <string.h>             /* for memset() */
 

c/src/lib/libc/no_libc.c

@@ -16,7 +16,7 @@
 #include <rtems.h>
 #if !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX)
 
-#include "libcsupport.h"
+#include <rtems/libcsupport.h>
 
 #include <stdlib.h>             /* for free() */
 

c/src/lib/libc/open.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 #include <unistd.h>
 

c/src/lib/libc/read.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 ssize_t read(
   int         fd,

c/src/lib/libc/readlink.c

@@ -11,7 +11,7 @@
  *  $Id$
  */
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int readlink(
   const char *pathname,

c/src/lib/libc/rmdir.c

@@ -17,7 +17,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "libio_.h"
+#include <rtems/libio_.h>
 
 int rmdir(
   const char *pathname