2011-04-07 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, wkspace.c: Compiles now and do not core dump when RTEMS
	is not initialized.

3 files changed, 24 insertions, 8 deletions

diff --git a/tools/schedsim/rtems/ChangeLog b/tools/schedsim/rtems/ChangeLog
index d4c908c0c6..b662bc08e0 100644
--- a/tools/schedsim/rtems/ChangeLog
+++ b/tools/schedsim/rtems/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-07	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, wkspace.c: Compiles now and do not core dump when RTEMS
+	is not initialized.
+
 2011-02-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* sched_cpu/rtems/score/cpuopts.h: Bump to 4.10.99.0
diff --git a/tools/schedsim/rtems/Makefile.am b/tools/schedsim/rtems/Makefile.am
index 681563876d..e09bc9129d 100644
--- a/tools/schedsim/rtems/Makefile.am
+++ b/tools/schedsim/rtems/Makefile.am
@@ -75,14 +75,27 @@ librtems_a_SOURCES += $(cpukitdir)/score/src/objectnametoidstring.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/objectsetname.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/objectshrinkinformation.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/scheduler.c
-librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriority.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityallocate.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityblock.c
-librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerprioritythreadschedulerallocate.c
-librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerprioritythreadschedulerfree.c
-librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerprioritythreadschedulerupdate.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriority.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityenqueue.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityenqueuefirst.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityextract.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityfree.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityschedule.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityunblock.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityupdate.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityyield.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimpleblock.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimple.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimpleenqueue.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimpleenqueuefirst.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimpleextract.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimplereadyqueueenqueue.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimplereadyqueueenqueuefirst.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimpleschedule.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimpleunblock.c
+librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimpleyield.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/thread.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadchangepriority.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadclearstate.c
@@ -97,7 +110,6 @@ librtems_a_SOURCES += $(cpukitdir)/score/src/threadloadenv.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadready.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadreset.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadrestart.c
-librtems_a_SOURCES += $(cpukitdir)/score/src/threadresume.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadsetpriority.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadsetstate.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadsettransient.c
@@ -105,7 +117,6 @@ librtems_a_SOURCES += $(cpukitdir)/score/src/threadstackallocate.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadstackfree.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadstart.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadstartmultitasking.c
-librtems_a_SOURCES += $(cpukitdir)/score/src/threadsuspend.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadtickletimeslice.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/iterateoverthreads.c
 librtems_a_SOURCES += $(cpukitdir)/score/src/threadq.c
@@ -224,6 +235,7 @@ schedsim_rtems_include_HEADERS  = \
   ${cpukitdir}/score/include//rtems/seterr.h \
   ${cpukitdir}/score/include/rtems/system.h \
   ${cpukitdir}/score/include/rtems/debug.h \
+  ${cpukitdir}/score/include/rtems/bspsmp.h \
   ${cpukitdir}/include/rtems/bspIo.h \
   $(cpukitdir)/sapi/include/rtems/fatal.h \
   $(cpukitdir)/sapi/include/rtems/init.h \
diff --git a/tools/schedsim/rtems/wkspace.c b/tools/schedsim/rtems/wkspace.c
index beb86184c6..f4209d5f73 100644
--- a/tools/schedsim/rtems/wkspace.c
+++ b/tools/schedsim/rtems/wkspace.c
@@ -60,7 +60,7 @@ void *_Workspace_Allocate(
 /*
  *  _Workspace_Free
  */
-bool _Workspace_Free(
+void _Workspace_Free(
   void *block
 )
 {
@@ -73,7 +73,6 @@ bool _Workspace_Free(
     );
   #endif
   free( block );
-  return true;
 }
 
 /*