Merger from rtems-4-6-branch.

10 files changed, 89 insertions, 18 deletions

diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog
index de76eb4b9c..c135074183 100644
--- a/cpukit/sapi/ChangeLog
+++ b/cpukit/sapi/ChangeLog
@@ -1,3 +1,19 @@
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Remove stray reference to sptables.h.in.
+
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* include/rtems/sptables.h.in: Remove.
+	* include/rtems/sptables.h: New.
+	* include/.cvsignore: Remove.
+	* include/rtems/.cvsignore: Remove.
+	* inline/.cvsignore: Remove.
+	* inline/rtems/.cvsignore: Remove.
+	* macros/.cvsignore: Remove.
+	* macros/rtems/.cvsignore: Remove.
+	* src/.cvsignore: Remove.
+
 2003-02-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/rtems/sptables.h.in: Remove RTEMS_VERSION (Moved to
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 39b19b3883..5d66a261e2 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -33,9 +33,6 @@ PREINSTALL_FILES += $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
 
 EXTRA_DIST = include/rtems/README
 
-include/rtems/sptables.h: $(top_builddir)/config.status $(top_srcdir)/sapi/include/rtems/sptables.h.in
-	cd $(top_builddir) && CONFIG_FILES=sapi/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
-
 ## inline
 
 inline_H_FILES = inline/rtems/extension.inl
diff --git a/cpukit/sapi/include/.cvsignore b/cpukit/sapi/include/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/include/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/sapi/include/rtems/.cvsignore b/cpukit/sapi/include/rtems/.cvsignore
deleted file mode 100644
index 4f09d19b6d..0000000000
--- a/cpukit/sapi/include/rtems/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-sptables.h
diff --git a/cpukit/sapi/include/rtems/sptables.h b/cpukit/sapi/include/rtems/sptables.h
new file mode 100644
index 0000000000..ddd19afbb0
--- /dev/null
+++ b/cpukit/sapi/include/rtems/sptables.h
@@ -0,0 +1,73 @@
+/*  sptables.h
+ *
+ *  This include file contains the executive's pre-initialized tables
+ *  used when in a single processor configuration.
+ *
+ *  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 __RTEMS_SPTABLES_h
+#define __RTEMS_SPTABLES_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rtems/config.h>
+
+#include <rtems/debug.h>
+#include <rtems/fatal.h>
+#include <rtems/init.h>
+#include <rtems/io.h>
+#include <rtems/score/sysstate.h>
+
+#include <rtems/rtems/intr.h>
+#include <rtems/rtems/clock.h>
+#include <rtems/rtems/tasks.h>
+#include <rtems/rtems/dpmem.h>
+#include <rtems/rtems/event.h>
+#include <rtems/rtems/message.h>
+#if defined(RTEMS_MULTIPROCESSING)
+#include <rtems/rtems/mp.h>
+#endif
+#include <rtems/rtems/part.h>
+#include <rtems/rtems/ratemon.h>
+#include <rtems/rtems/region.h>
+#include <rtems/rtems/sem.h>
+#include <rtems/rtems/signal.h>
+#include <rtems/rtems/timer.h>
+
+/*
+ *  This is the default Multiprocessing Configuration Table.
+ *  It is used in single processor configurations.
+ */
+
+#if defined(SAPI_INIT) 
+const rtems_multiprocessing_table
+       _Initialization_Default_multiprocessing_table = {
+  1,                      /* local node number */
+  1,                      /* maximum number nodes in system */
+  0,                      /* maximum number global objects */
+  0,                      /* maximum number proxies */
+  NULL,                   /* pointer to MPCI address table */
+};
+#else
+extern const rtems_multiprocessing_table
+       _Initialization_Default_multiprocessing_table;
+#endif
+
+extern const char _RTEMS_version[];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* end of include file */
diff --git a/cpukit/sapi/inline/.cvsignore b/cpukit/sapi/inline/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/inline/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/sapi/inline/rtems/.cvsignore b/cpukit/sapi/inline/rtems/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/inline/rtems/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/sapi/macros/.cvsignore b/cpukit/sapi/macros/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/macros/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/sapi/macros/rtems/.cvsignore b/cpukit/sapi/macros/rtems/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/macros/rtems/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/sapi/src/.cvsignore b/cpukit/sapi/src/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/src/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in