2010-12-17 Joel Sherrill <joel.sherrill@oarcorp.com>

		Jennifer Averett <jennifer.averett@oarcorp.com>

	Add RTEMS Scheduler Simulator.
	* sapi/include/confdefs.h: This adds some simple conditional
	logic to disable portions of the configuration that are NOT supported
	when configuring an RTEMS instance for use with a Scheduler Simulator
	instance.

1 files changed, 25 insertions, 1 deletions

diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index 4ef0fb8f24..07fb2ec8a9 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -63,12 +63,17 @@ extern rtems_configuration_table        Configuration;
  *  This macro determines whether the RTEMS reentrancy support for
  *  the Newlib C Library is enabled.
  */
+#ifdef RTEMS_SCHEDSIM
+  #undef RTEMS_NEWLIB
+#endif
+
 #if (defined(RTEMS_NEWLIB) && !defined(CONFIGURE_DISABLE_NEWLIB_REENTRANCY))
   #define CONFIGURE_NEWLIB_EXTENSION 1
 #else
   #define CONFIGURE_NEWLIB_EXTENSION 0
 #endif
 
+#ifndef RTEMS_SCHEDSIM
 #include <rtems/libio.h>
 
 #ifdef CONFIGURE_INIT
@@ -93,7 +98,7 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
     rtems_filesystem_initialize;
     #endif
 #endif
-
+#endif
 
 /*
  *  If the application disables the filesystem, they will not need
@@ -262,6 +267,7 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
 
 #endif
 
+#ifndef RTEMS_SCHEDSIM
 /**
  * IMFS
  */
@@ -286,6 +292,7 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
   #define CONFIGURE_FILESYSTEM_ENTRY_miniIMFS \
     { RTEMS_FILESYSTEM_TYPE_MINIIMFS, miniIMFS_initialize }
 #endif
+#endif
 
 /**
  *  Internall it is called FIFOs not pipes
@@ -294,6 +301,7 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
   #define CONFIGURE_FIFOS_ENABLED
 #endif
 
+#ifndef RTEMS_SCHEDSIM
 /**
  *  This defines the IMFS file system table entry.
  */ 
@@ -307,6 +315,7 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
       { RTEMS_FILESYSTEM_TYPE_IMFS, IMFS_initialize }
   #endif
 #endif
+#endif
 
 /**
  *  This sets up the resources for the PIPES/FIFOs
@@ -412,16 +421,19 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
     #define CONFIGURE_MEMORY_FOR_DEVFS  0
   #endif
 
+#ifndef RTEMS_SCHEDSIM
   #if defined(CONFIGURE_FILESYSTEM_IMFS) || \
       defined(CONFIGURE_FILESYSTEM_MINIIMFS)
     int imfs_rq_memfile_bytes_per_block = CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK;
   #endif
+#endif
 
   /**
    * Table termination record.
    */
   #define CONFIGURE_FILESYSTEM_NULL { NULL, NULL }
 
+#ifndef RTEMS_SCHEDSIM
   /**
    * The default file system table. Must be terminated with the NULL entry if
    * you provide your own.
@@ -484,6 +496,7 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
   #endif
 
 #endif
+#endif
 
 /*
  *  STACK_CHECER_ON was still available in 4.9 so give a warning for now.
@@ -1683,6 +1696,8 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
   #define CONFIGURE_GOROUTINES_TASK_VARIABLES   0
   #define CONFIGURE_MAXIMUM_GO_CHANNELS         0
 #endif
+
+#ifndef RTEMS_SCHEDSIM
 /**
  *  This macro specifies the amount of memory to be reserved for the
  *  Newlib C Library reentrancy structure -- if we are using newlib.
@@ -1697,6 +1712,11 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
   #define CONFIGURE_MEMORY_PER_TASK_FOR_NEWLIB 0
 #endif
 
+#else
+  #define CONFIGURE_MEMORY_PER_TASK_FOR_NEWLIB 0
+#endif
+
+
 /*
  *  Calculate the RAM size based on the maximum number of objects configured.
  */
@@ -2191,6 +2211,7 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
   #endif
 #endif
 
+#ifndef RTEMS_SCHEDSIM
 /*
  *  Make sure at least one of the initialization task/thread
  *  tables was defined.
@@ -2200,6 +2221,7 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
     !defined(CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION)
 #error "CONFIGURATION ERROR: No initialization tasks or threads configured!!"
 #endif
+#endif
 
 /*
  *  If the user is trying to configure a multiprocessing application and
@@ -2232,6 +2254,7 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
   #endif
 #endif
 
+#ifndef RTEMS_SCHEDSIM
 /*
  *  You must either explicity include or exclude the clock driver.
  *  It is such a common newbie error to leave it out.  Maybe this
@@ -2249,6 +2272,7 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
     #error "CONFIGURATION ERROR: Do you want the clock driver or not?!?"
    #endif
 #endif
+#endif
 
 /*
  *  These names have been obsoleted so make the user application stop compiling