From d2c26e4bad11cf21129149adcc40b648ced967da Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 11 Mar 2003 08:10:00 +0000 Subject: Merger from rtems-4-6-branch. --- cpukit/sapi/ChangeLog | 16 ++++++++ cpukit/sapi/Makefile.am | 3 -- cpukit/sapi/include/.cvsignore | 2 - cpukit/sapi/include/rtems/.cvsignore | 3 -- cpukit/sapi/include/rtems/sptables.h | 73 ++++++++++++++++++++++++++++++++++++ cpukit/sapi/inline/.cvsignore | 2 - cpukit/sapi/inline/rtems/.cvsignore | 2 - cpukit/sapi/macros/.cvsignore | 2 - cpukit/sapi/macros/rtems/.cvsignore | 2 - cpukit/sapi/src/.cvsignore | 2 - 10 files changed, 89 insertions(+), 18 deletions(-) delete mode 100644 cpukit/sapi/include/.cvsignore delete mode 100644 cpukit/sapi/include/rtems/.cvsignore create mode 100644 cpukit/sapi/include/rtems/sptables.h delete mode 100644 cpukit/sapi/inline/.cvsignore delete mode 100644 cpukit/sapi/inline/rtems/.cvsignore delete mode 100644 cpukit/sapi/macros/.cvsignore delete mode 100644 cpukit/sapi/macros/rtems/.cvsignore delete mode 100644 cpukit/sapi/src/.cvsignore (limited to 'cpukit/sapi') 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 + + * Makefile.am: Remove stray reference to sptables.h.in. + +2003-03-06 Ralf Corsepius + + * 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 * 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 + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#if defined(RTEMS_MULTIPROCESSING) +#include +#endif +#include +#include +#include +#include +#include +#include + +/* + * 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 -- cgit v1.2.3