From 11c5571d3616452fd6b7237ad1b30151236e003b Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Wed, 24 Sep 2014 10:12:20 -0500 Subject: rtems: synch with rtems. --- schedsim/rtems/Makefile.am | 14 ++++---------- schedsim/rtems/sched_cpu/rtems/score/cpu.h | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/schedsim/rtems/Makefile.am b/schedsim/rtems/Makefile.am index 9db8293..805d92a 100644 --- a/schedsim/rtems/Makefile.am +++ b/schedsim/rtems/Makefile.am @@ -163,20 +163,13 @@ librtems_a_SOURCES += $(cpukitdir)/score/src/iterateoverthreads.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadq.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadblockingoperationcancel.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadqdequeue.c -librtems_a_SOURCES += $(cpukitdir)/score/src/threadqdequeuefifo.c -librtems_a_SOURCES += $(cpukitdir)/score/src/threadqdequeuepriority.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadqenqueue.c -librtems_a_SOURCES += $(cpukitdir)/score/src/threadqenqueuefifo.c -librtems_a_SOURCES += $(cpukitdir)/score/src/threadqenqueuepriority.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadqextract.c -librtems_a_SOURCES += $(cpukitdir)/score/src/threadqextractfifo.c -librtems_a_SOURCES += $(cpukitdir)/score/src/threadqextractpriority.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadqextractwithproxy.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadqfirst.c -librtems_a_SOURCES += $(cpukitdir)/score/src/threadqfirstfifo.c -librtems_a_SOURCES += $(cpukitdir)/score/src/threadqfirstpriority.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadqflush.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadqprocesstimeout.c +librtems_a_SOURCES += $(cpukitdir)/score/src/threadqrequeue.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadqtimeout.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadyield.c librtems_a_SOURCES += $(cpukitdir)/score/src/timespecaddto.c @@ -200,7 +193,6 @@ librtems_a_SOURCES += $(cpukitdir)/score/src/watchdogtickle.c librtems_a_SOURCES += $(cpukitdir)/sapi/src/debug.c librtems_a_SOURCES += $(cpukitdir)/rtems/src/clockgetsecondssinceepoch.c librtems_a_SOURCES += $(cpukitdir)/rtems/src/clockgettickspersecond.c -librtems_a_SOURCES += $(cpukitdir)/rtems/src/clockgettickssinceboot.c librtems_a_SOURCES += $(cpukitdir)/rtems/src/clockgettod.c librtems_a_SOURCES += $(cpukitdir)/rtems/src/clockgettodtimeval.c librtems_a_SOURCES += $(cpukitdir)/rtems/src/clockgetuptime.c @@ -272,15 +264,17 @@ librtems_a_SOURCES += $(cpukitdir)/score/src/smp.c librtems_a_SOURCES += $(cpukitdir)/score/src/threaddisabledispatch.c librtems_a_SOURCES += $(cpukitdir)/score/src/threadenabledispatch.c librtems_a_SOURCES += $(cpukitdir)/score/src/threaddispatchdisablelevel.c +librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerchangeroot.c librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerprioritysmp.c librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersimplesmp.c librtems_a_SOURCES += $(cpukitdir)/score/src/debugisthreaddispatchingallowed.c +librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerdefaultaskforhelp.c librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerdefaultgetaffinity.c librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerdefaultsetaffinity.c -librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersmpvalidstatechanges.c librtems_a_SOURCES += $(cpukitdir)/score/src/schedulergetaffinity.c librtems_a_SOURCES += $(cpukitdir)/score/src/schedulerpriorityaffinitysmp.c librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersetaffinity.c +librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersmpdebug.c librtems_a_SOURCES += $(cpukitdir)/score/src/schedulersmpstartidle.c librtems_a_SOURCES += $(cpukitdir)/score/src/cpuset.c librtems_a_SOURCES += $(cpukitdir)/rtems/src/taskgetaffinity.c diff --git a/schedsim/rtems/sched_cpu/rtems/score/cpu.h b/schedsim/rtems/sched_cpu/rtems/score/cpu.h index 45ae93c..9e27c83 100644 --- a/schedsim/rtems/sched_cpu/rtems/score/cpu.h +++ b/schedsim/rtems/sched_cpu/rtems/score/cpu.h @@ -963,7 +963,7 @@ extern int _CPU_ISR_level_on_sched_cpu; * * XXX document implementation including references if appropriate */ -#define _CPU_Fatal_halt( _error ) \ +#define _CPU_Fatal_halt( _source, _err ) \ { \ } -- cgit v1.2.3