[rtems commit] score: Merge sysstate API into one file
Sebastian Huber
sebh at rtems.org
Wed Jul 24 09:06:33 UTC 2013
Module: rtems
Branch: master
Commit: 39046f766f170748acdb7f55f79a681a09552698
Changeset: http://git.rtems.org/rtems/commit/?id=39046f766f170748acdb7f55f79a681a09552698
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Wed Jul 24 11:09:23 2013 +0200
score: Merge sysstate API into one file
---
c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c | 1 +
c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c | 1 +
c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c | 1 +
c/src/lib/libbsp/powerpc/mvme3100/i2c/i2c_init.c | 1 +
.../lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c.c | 1 +
c/src/lib/libbsp/powerpc/shared/motorola/vpd.c | 1 +
c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c | 1 +
c/src/lib/libbsp/shared/src/irq-generic.c | 1 +
c/src/lib/libcpu/mips/mongoosev/duart/mg5uart.c | 1 +
c/src/libchip/rtc/ds1375.c | 1 +
c/src/libchip/serial/mc68681.c | 1 +
c/src/libchip/serial/z85c30.c | 1 +
cpukit/libcsupport/src/error.c | 1 +
cpukit/libcsupport/src/free.c | 2 +
cpukit/libcsupport/src/malloc.c | 2 +
cpukit/libcsupport/src/realloc.c | 2 +
cpukit/libcsupport/src/rtems_malloc.c | 2 +
cpukit/libcsupport/src/rtems_memalign.c | 2 +
cpukit/libi2c/libi2c.c | 1 +
cpukit/libmisc/monitor/mon-server.c | 1 +
cpukit/rtems/include/rtems.h | 1 -
cpukit/rtems/src/msg.c | 1 -
cpukit/rtems/src/msgqallocate.c | 1 -
cpukit/rtems/src/msgqbroadcast.c | 1 -
cpukit/rtems/src/msgqdelete.c | 1 -
cpukit/rtems/src/msgqflush.c | 1 -
cpukit/rtems/src/msgqgetnumberpending.c | 1 -
cpukit/rtems/src/msgqident.c | 1 -
cpukit/rtems/src/msgqreceive.c | 1 -
cpukit/rtems/src/msgqsend.c | 1 -
cpukit/rtems/src/msgqtranslatereturncode.c | 1 -
cpukit/rtems/src/msgqurgent.c | 1 -
cpukit/rtems/src/part.c | 1 -
cpukit/rtems/src/partdelete.c | 1 -
cpukit/rtems/src/partgetbuffer.c | 1 -
cpukit/rtems/src/partident.c | 1 -
cpukit/rtems/src/partreturnbuffer.c | 1 -
cpukit/rtems/src/sem.c | 1 -
cpukit/rtems/src/semdelete.c | 1 -
cpukit/rtems/src/semflush.c | 1 -
cpukit/rtems/src/semident.c | 1 -
cpukit/rtems/src/semobtain.c | 1 -
cpukit/rtems/src/semrelease.c | 1 -
cpukit/rtems/src/taskdelete.c | 1 -
cpukit/rtems/src/taskgetnote.c | 1 -
cpukit/rtems/src/taskident.c | 1 -
cpukit/rtems/src/taskinitusers.c | 1 -
cpukit/rtems/src/taskissuspended.c | 1 -
cpukit/rtems/src/taskmode.c | 1 -
cpukit/rtems/src/taskrestart.c | 1 -
cpukit/rtems/src/taskresume.c | 1 -
cpukit/rtems/src/tasks.c | 1 -
cpukit/rtems/src/tasksetnote.c | 1 -
cpukit/rtems/src/tasksetpriority.c | 1 -
cpukit/rtems/src/taskstart.c | 1 -
cpukit/rtems/src/tasksuspend.c | 1 -
cpukit/rtems/src/taskwakeafter.c | 1 -
cpukit/rtems/src/taskwakewhen.c | 1 -
cpukit/sapi/include/rtems/sptables.h | 1 -
cpukit/score/Makefile.am | 1 -
cpukit/score/include/rtems/score/coremutex.h | 1 -
cpukit/score/include/rtems/score/coremuteximpl.h | 1 +
cpukit/score/include/rtems/score/sysstate.h | 72 +++++++++++++-
cpukit/score/inline/rtems/score/sysstate.inl | 99 --------------------
cpukit/score/inline/rtems/score/thread.inl | 1 -
cpukit/score/preinstall.am | 4 -
cpukit/score/src/heapallocate.c | 1 -
cpukit/score/src/heapextend.c | 1 -
cpukit/score/src/heapgetfreeinfo.c | 1 -
cpukit/score/src/heapresizeblock.c | 1 -
cpukit/score/src/heapsizeofuserarea.c | 1 -
cpukit/score/src/objectallocate.c | 1 -
cpukit/score/src/objectextendinformation.c | 1 -
cpukit/score/src/objectfree.c | 1 -
cpukit/score/src/objectget.c | 1 -
cpukit/score/src/objectgetisr.c | 1 -
cpukit/score/src/objectgetnext.c | 1 -
cpukit/score/src/objectgetnoprotection.c | 1 -
cpukit/score/src/objectnametoid.c | 1 -
cpukit/score/src/objectnametoidstring.c | 1 -
cpukit/score/src/objectshrinkinformation.c | 1 -
cpukit/score/src/threadclearstate.c | 1 -
cpukit/score/src/threadclose.c | 1 -
cpukit/score/src/threadcreateidle.c | 1 -
cpukit/score/src/threaddelayended.c | 1 -
cpukit/score/src/threaddisabledispatch.c | 1 +
cpukit/score/src/threaddispatch.c | 1 -
cpukit/score/src/threaddispatchdisablelevel.c | 1 -
cpukit/score/src/threadget.c | 1 -
cpukit/score/src/threadhandler.c | 1 -
cpukit/score/src/threadinitialize.c | 1 -
cpukit/score/src/threadloadenv.c | 1 -
cpukit/score/src/threadready.c | 1 -
cpukit/score/src/threadreset.c | 1 -
cpukit/score/src/threadrestart.c | 1 -
cpukit/score/src/threadsetstate.c | 1 -
cpukit/score/src/threadsettransient.c | 1 -
cpukit/score/src/threadstackallocate.c | 1 -
cpukit/score/src/threadstackfree.c | 1 -
cpukit/score/src/threadstart.c | 1 -
testsuites/libtests/heapwalk/init.c | 1 +
testsuites/sptests/sp08/init.c | 2 +
testsuites/sptests/spfatal23/testcase.h | 3 +-
103 files changed, 99 insertions(+), 184 deletions(-)
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c
index 6699b38..6eeb2a0 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c
@@ -11,6 +11,7 @@
#include <bsp.h>
#include <i2c.h>
+#include <rtems/score/sysstate.h>
/* i2c_transfer_sema_done_func --
* This function called from I2C driver layer to signal that I2C
diff --git a/c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c b/c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c
index 6539be5..e6989fc 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c
@@ -10,6 +10,7 @@
*/
#include <bsp.h>
+#include <rtems/score/sysstate.h>
#include "../include/i2c.h"
/* i2c_transfer_sema_done_func --
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
index 60701af..173c7a0 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
@@ -77,6 +77,7 @@
#include <rtems.h>
#include <rtems/error.h>
+#include <rtems/score/sysstate.h>
#include <bsp.h>
#include <bsp/irq.h>
#include "../include/mpc5200.h"
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/i2c/i2c_init.c b/c/src/lib/libbsp/powerpc/mvme3100/i2c/i2c_init.c
index fd579fc..9e242ba 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/i2c/i2c_init.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/i2c/i2c_init.c
@@ -54,6 +54,7 @@
#include <libchip/i2c-ds1621.h>
#include <bsp/mpc8540_i2c_busdrv.h>
#include <rtems/libio.h>
+#include <rtems/score/sysstate.h>
#include <stdio.h>
#include <sys/stat.h>
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c.c b/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c.c
index e3f2524..94dfcd9 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c.c
@@ -61,6 +61,7 @@
#include <libcpu/spr.h>
#include <libcpu/io.h>
#include <rtems/bspIo.h>
+#include <rtems/score/sysstate.h>
#include "mpc8540_i2c_busdrv.h"
diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.c b/c/src/lib/libbsp/powerpc/shared/motorola/vpd.c
index 31fc846..4b0bbef 100644
--- a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.c
+++ b/c/src/lib/libbsp/powerpc/shared/motorola/vpd.c
@@ -53,6 +53,7 @@ field = type, length, { data }
#include <unistd.h>
#include <rtems.h>
+#include <rtems/score/sysstate.h>
#include <string.h>
#include <sys/fcntl.h>
#include <bsp.h>
diff --git a/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c b/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c
index ee18ea3..df5352f 100644
--- a/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c
+++ b/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c
@@ -29,6 +29,7 @@
*/
#include <rtems.h>
+#include <rtems/score/sysstate.h>
#include <string.h>
#include "gdb_if.h"
diff --git a/c/src/lib/libbsp/shared/src/irq-generic.c b/c/src/lib/libbsp/shared/src/irq-generic.c
index b2d712a..69ed55a 100644
--- a/c/src/lib/libbsp/shared/src/irq-generic.c
+++ b/c/src/lib/libbsp/shared/src/irq-generic.c
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <rtems/score/apimutex.h>
+#include <rtems/score/sysstate.h>
#ifdef BSP_INTERRUPT_USE_INDEX_TABLE
bsp_interrupt_handler_index_type bsp_interrupt_handler_index_table
diff --git a/c/src/lib/libcpu/mips/mongoosev/duart/mg5uart.c b/c/src/lib/libcpu/mips/mongoosev/duart/mg5uart.c
index f198ac9..40d4404 100644
--- a/c/src/lib/libcpu/mips/mongoosev/duart/mg5uart.c
+++ b/c/src/lib/libcpu/mips/mongoosev/duart/mg5uart.c
@@ -16,6 +16,7 @@
#include <rtems.h>
#include <rtems/libio.h>
+#include <rtems/score/sysstate.h>
#include <stdlib.h>
#include <libchip/serial.h>
diff --git a/c/src/libchip/rtc/ds1375.c b/c/src/libchip/rtc/ds1375.c
index e52323c..f7e58f2 100644
--- a/c/src/libchip/rtc/ds1375.c
+++ b/c/src/libchip/rtc/ds1375.c
@@ -52,6 +52,7 @@
#include <rtems.h>
#include <rtems/rtc.h>
+#include <rtems/score/sysstate.h>
#include <libchip/rtc.h>
#include <libchip/ds1375-rtc.h>
diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c
index 7a0ab84..6746b89 100644
--- a/c/src/libchip/serial/mc68681.c
+++ b/c/src/libchip/serial/mc68681.c
@@ -16,6 +16,7 @@
#include <rtems.h>
#include <rtems/libio.h>
+#include <rtems/score/sysstate.h>
#include <stdlib.h>
#include <libchip/serial.h>
diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c
index 74007fb..dfe3a31 100644
--- a/c/src/libchip/serial/z85c30.c
+++ b/c/src/libchip/serial/z85c30.c
@@ -30,6 +30,7 @@
#include <rtems.h>
#include <rtems/libio.h>
+#include <rtems/score/sysstate.h>
#include <stdlib.h>
#include <libchip/serial.h>
diff --git a/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c
index a77dfbb..6993ea1 100644
--- a/cpukit/libcsupport/src/error.c
+++ b/cpukit/libcsupport/src/error.c
@@ -19,6 +19,7 @@
#include <rtems/error.h>
#include <rtems/assoc.h>
+#include <rtems/score/sysstate.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdarg.h>
diff --git a/cpukit/libcsupport/src/free.c b/cpukit/libcsupport/src/free.c
index 4e31555..47836fc 100644
--- a/cpukit/libcsupport/src/free.c
+++ b/cpukit/libcsupport/src/free.c
@@ -22,6 +22,8 @@
#include "malloc_p.h"
#include <stdlib.h>
+#include <rtems/score/sysstate.h>
+
void free(
void *ptr
)
diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c
index f79e3bb..3b267b9 100644
--- a/cpukit/libcsupport/src/malloc.c
+++ b/cpukit/libcsupport/src/malloc.c
@@ -24,6 +24,8 @@
#include "malloc_p.h"
+#include <rtems/score/sysstate.h>
+
void *malloc(
size_t size
)
diff --git a/cpukit/libcsupport/src/realloc.c b/cpukit/libcsupport/src/realloc.c
index 566ecbf..f9b2674 100644
--- a/cpukit/libcsupport/src/realloc.c
+++ b/cpukit/libcsupport/src/realloc.c
@@ -24,6 +24,8 @@
#include <errno.h>
#include <string.h>
+#include <rtems/score/sysstate.h>
+
void *realloc(
void *ptr,
size_t size
diff --git a/cpukit/libcsupport/src/rtems_malloc.c b/cpukit/libcsupport/src/rtems_malloc.c
index b4b3aca..5eb1ea1 100644
--- a/cpukit/libcsupport/src/rtems_malloc.c
+++ b/cpukit/libcsupport/src/rtems_malloc.c
@@ -26,6 +26,8 @@
#ifdef RTEMS_NEWLIB
#include "malloc_p.h"
+#include <rtems/score/sysstate.h>
+
void *rtems_heap_allocate_aligned_with_boundary(
size_t size,
uintptr_t alignment,
diff --git a/cpukit/libcsupport/src/rtems_memalign.c b/cpukit/libcsupport/src/rtems_memalign.c
index 64bb489..f3dbce4 100644
--- a/cpukit/libcsupport/src/rtems_memalign.c
+++ b/cpukit/libcsupport/src/rtems_memalign.c
@@ -24,6 +24,8 @@
#include <stdlib.h>
#include <errno.h>
+#include <rtems/score/sysstate.h>
+
int rtems_memalign(
void **pointer,
size_t alignment,
diff --git a/cpukit/libi2c/libi2c.c b/cpukit/libi2c/libi2c.c
index 88f8799..233cb68 100644
--- a/cpukit/libi2c/libi2c.c
+++ b/cpukit/libi2c/libi2c.c
@@ -63,6 +63,7 @@
#include <rtems/error.h>
#include <rtems/bspIo.h>
#include <rtems/libio.h>
+#include <rtems/score/sysstate.h>
#include <rtems/libi2c.h>
diff --git a/cpukit/libmisc/monitor/mon-server.c b/cpukit/libmisc/monitor/mon-server.c
index 2dc10df..109a577 100644
--- a/cpukit/libmisc/monitor/mon-server.c
+++ b/cpukit/libmisc/monitor/mon-server.c
@@ -15,6 +15,7 @@
#include <unistd.h>
#include <rtems/monitor.h>
+#include <rtems/score/sysstate.h>
/*
* Various id's for the server
diff --git a/cpukit/rtems/include/rtems.h b/cpukit/rtems/include/rtems.h
index d1ace5a..867429e 100644
--- a/cpukit/rtems/include/rtems.h
+++ b/cpukit/rtems/include/rtems.h
@@ -77,7 +77,6 @@ extern "C" {
#include <rtems/rtems/smp.h>
#include <rtems/rtems/support.h>
-#include <rtems/score/sysstate.h>
/**
* @brief Returns the pointer to the RTEMS version string.
diff --git a/cpukit/rtems/src/msg.c b/cpukit/rtems/src/msg.c
index fc37f0e..fd29225 100644
--- a/cpukit/rtems/src/msg.c
+++ b/cpukit/rtems/src/msg.c
@@ -20,7 +20,6 @@
#include <rtems/system.h>
#include <rtems/config.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/msgqallocate.c b/cpukit/rtems/src/msgqallocate.c
index 775b248..af61def 100644
--- a/cpukit/rtems/src/msgqallocate.c
+++ b/cpukit/rtems/src/msgqallocate.c
@@ -19,7 +19,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/msgqbroadcast.c b/cpukit/rtems/src/msgqbroadcast.c
index c455c96..c8cf757 100644
--- a/cpukit/rtems/src/msgqbroadcast.c
+++ b/cpukit/rtems/src/msgqbroadcast.c
@@ -19,7 +19,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/msgqdelete.c b/cpukit/rtems/src/msgqdelete.c
index 1d26ad2..2131530 100644
--- a/cpukit/rtems/src/msgqdelete.c
+++ b/cpukit/rtems/src/msgqdelete.c
@@ -19,7 +19,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/msgqflush.c b/cpukit/rtems/src/msgqflush.c
index 40428da..9305b9b 100644
--- a/cpukit/rtems/src/msgqflush.c
+++ b/cpukit/rtems/src/msgqflush.c
@@ -19,7 +19,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/msgqgetnumberpending.c b/cpukit/rtems/src/msgqgetnumberpending.c
index 4ca825e..6c4ff62 100644
--- a/cpukit/rtems/src/msgqgetnumberpending.c
+++ b/cpukit/rtems/src/msgqgetnumberpending.c
@@ -19,7 +19,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/msgqident.c b/cpukit/rtems/src/msgqident.c
index 381a553..6271a84 100644
--- a/cpukit/rtems/src/msgqident.c
+++ b/cpukit/rtems/src/msgqident.c
@@ -19,7 +19,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/msgqreceive.c b/cpukit/rtems/src/msgqreceive.c
index 1231b37..d8df301 100644
--- a/cpukit/rtems/src/msgqreceive.c
+++ b/cpukit/rtems/src/msgqreceive.c
@@ -19,7 +19,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/msgqsend.c b/cpukit/rtems/src/msgqsend.c
index 1fdaceb..aeeb0fc 100644
--- a/cpukit/rtems/src/msgqsend.c
+++ b/cpukit/rtems/src/msgqsend.c
@@ -19,7 +19,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/msgqtranslatereturncode.c b/cpukit/rtems/src/msgqtranslatereturncode.c
index 3b12f16..a6f912b 100644
--- a/cpukit/rtems/src/msgqtranslatereturncode.c
+++ b/cpukit/rtems/src/msgqtranslatereturncode.c
@@ -19,7 +19,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/msgqurgent.c b/cpukit/rtems/src/msgqurgent.c
index ee0317b..ae444e4 100644
--- a/cpukit/rtems/src/msgqurgent.c
+++ b/cpukit/rtems/src/msgqurgent.c
@@ -19,7 +19,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
#include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/part.c b/cpukit/rtems/src/part.c
index c669c96..ba6b4a5 100644
--- a/cpukit/rtems/src/part.c
+++ b/cpukit/rtems/src/part.c
@@ -26,7 +26,6 @@
#include <rtems/score/object.h>
#include <rtems/rtems/partimpl.h>
#include <rtems/score/thread.h>
-#include <rtems/score/sysstate.h>
void _Partition_Manager_initialization(void)
{
diff --git a/cpukit/rtems/src/partdelete.c b/cpukit/rtems/src/partdelete.c
index 48a6768..e094e36 100644
--- a/cpukit/rtems/src/partdelete.c
+++ b/cpukit/rtems/src/partdelete.c
@@ -25,7 +25,6 @@
#include <rtems/score/object.h>
#include <rtems/rtems/partimpl.h>
#include <rtems/score/thread.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_partition_delete(
rtems_id id
diff --git a/cpukit/rtems/src/partgetbuffer.c b/cpukit/rtems/src/partgetbuffer.c
index 0b8f20c..a325ea9 100644
--- a/cpukit/rtems/src/partgetbuffer.c
+++ b/cpukit/rtems/src/partgetbuffer.c
@@ -25,7 +25,6 @@
#include <rtems/score/object.h>
#include <rtems/rtems/partimpl.h>
#include <rtems/score/thread.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_partition_get_buffer(
rtems_id id,
diff --git a/cpukit/rtems/src/partident.c b/cpukit/rtems/src/partident.c
index b6ec38b..237b230 100644
--- a/cpukit/rtems/src/partident.c
+++ b/cpukit/rtems/src/partident.c
@@ -25,7 +25,6 @@
#include <rtems/score/object.h>
#include <rtems/rtems/partimpl.h>
#include <rtems/score/thread.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_partition_ident(
rtems_name name,
diff --git a/cpukit/rtems/src/partreturnbuffer.c b/cpukit/rtems/src/partreturnbuffer.c
index c5f6c47..bb6d940 100644
--- a/cpukit/rtems/src/partreturnbuffer.c
+++ b/cpukit/rtems/src/partreturnbuffer.c
@@ -21,7 +21,6 @@
#include <rtems/score/object.h>
#include <rtems/rtems/partimpl.h>
#include <rtems/score/thread.h>
-#include <rtems/score/sysstate.h>
/*
* rtems_partition_return_buffer
diff --git a/cpukit/rtems/src/sem.c b/cpukit/rtems/src/sem.c
index ff8a14f..c7fe325 100644
--- a/cpukit/rtems/src/sem.c
+++ b/cpukit/rtems/src/sem.c
@@ -35,7 +35,6 @@
#if defined(RTEMS_MULTIPROCESSING)
#include <rtems/score/mpci.h>
#endif
-#include <rtems/score/sysstate.h>
#include <rtems/score/interr.h>
diff --git a/cpukit/rtems/src/semdelete.c b/cpukit/rtems/src/semdelete.c
index 6131571..4d54b4c 100644
--- a/cpukit/rtems/src/semdelete.c
+++ b/cpukit/rtems/src/semdelete.c
@@ -34,7 +34,6 @@
#if defined(RTEMS_MULTIPROCESSING)
#include <rtems/score/mpci.h>
#endif
-#include <rtems/score/sysstate.h>
#include <rtems/score/interr.h>
diff --git a/cpukit/rtems/src/semflush.c b/cpukit/rtems/src/semflush.c
index 9b7c055..a52cf02 100644
--- a/cpukit/rtems/src/semflush.c
+++ b/cpukit/rtems/src/semflush.c
@@ -34,7 +34,6 @@
#if defined(RTEMS_MULTIPROCESSING)
#include <rtems/score/mpci.h>
#endif
-#include <rtems/score/sysstate.h>
#include <rtems/score/interr.h>
diff --git a/cpukit/rtems/src/semident.c b/cpukit/rtems/src/semident.c
index 4d4812d..41d24c4 100644
--- a/cpukit/rtems/src/semident.c
+++ b/cpukit/rtems/src/semident.c
@@ -34,7 +34,6 @@
#if defined(RTEMS_MULTIPROCESSING)
#include <rtems/score/mpci.h>
#endif
-#include <rtems/score/sysstate.h>
#include <rtems/score/interr.h>
diff --git a/cpukit/rtems/src/semobtain.c b/cpukit/rtems/src/semobtain.c
index 722da0e..04e38d4 100644
--- a/cpukit/rtems/src/semobtain.c
+++ b/cpukit/rtems/src/semobtain.c
@@ -34,7 +34,6 @@
#if defined(RTEMS_MULTIPROCESSING)
#include <rtems/score/mpci.h>
#endif
-#include <rtems/score/sysstate.h>
#include <rtems/score/interr.h>
diff --git a/cpukit/rtems/src/semrelease.c b/cpukit/rtems/src/semrelease.c
index 7f2e294..f2bbd84 100644
--- a/cpukit/rtems/src/semrelease.c
+++ b/cpukit/rtems/src/semrelease.c
@@ -49,7 +49,6 @@
#if defined(RTEMS_MULTIPROCESSING)
#include <rtems/score/mpci.h>
#endif
-#include <rtems/score/sysstate.h>
#include <rtems/score/interr.h>
diff --git a/cpukit/rtems/src/taskdelete.c b/cpukit/rtems/src/taskdelete.c
index 0b98224..a43e222 100644
--- a/cpukit/rtems/src/taskdelete.c
+++ b/cpukit/rtems/src/taskdelete.c
@@ -32,7 +32,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/apimutex.h>
rtems_status_code rtems_task_delete(
diff --git a/cpukit/rtems/src/taskgetnote.c b/cpukit/rtems/src/taskgetnote.c
index 2cfa69c..430e9a3 100644
--- a/cpukit/rtems/src/taskgetnote.c
+++ b/cpukit/rtems/src/taskgetnote.c
@@ -32,7 +32,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_task_get_note(
rtems_id id,
diff --git a/cpukit/rtems/src/taskident.c b/cpukit/rtems/src/taskident.c
index 44f418d..1581e09 100644
--- a/cpukit/rtems/src/taskident.c
+++ b/cpukit/rtems/src/taskident.c
@@ -31,7 +31,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_task_ident(
rtems_name name,
diff --git a/cpukit/rtems/src/taskinitusers.c b/cpukit/rtems/src/taskinitusers.c
index ef5cc87..0801d37 100644
--- a/cpukit/rtems/src/taskinitusers.c
+++ b/cpukit/rtems/src/taskinitusers.c
@@ -33,7 +33,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
/*
* _RTEMS_tasks_Initialize_user_tasks_body
diff --git a/cpukit/rtems/src/taskissuspended.c b/cpukit/rtems/src/taskissuspended.c
index 2c05d21..ee47787 100644
--- a/cpukit/rtems/src/taskissuspended.c
+++ b/cpukit/rtems/src/taskissuspended.c
@@ -31,7 +31,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
/*
* rtems_task_is_suspended
diff --git a/cpukit/rtems/src/taskmode.c b/cpukit/rtems/src/taskmode.c
index 52161ee..bcfdc50 100644
--- a/cpukit/rtems/src/taskmode.c
+++ b/cpukit/rtems/src/taskmode.c
@@ -33,7 +33,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_task_mode(
rtems_mode mode_set,
diff --git a/cpukit/rtems/src/taskrestart.c b/cpukit/rtems/src/taskrestart.c
index 40ad380..66f4604 100644
--- a/cpukit/rtems/src/taskrestart.c
+++ b/cpukit/rtems/src/taskrestart.c
@@ -31,7 +31,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_task_restart(
rtems_id id,
diff --git a/cpukit/rtems/src/taskresume.c b/cpukit/rtems/src/taskresume.c
index 04a0421..ee06dca 100644
--- a/cpukit/rtems/src/taskresume.c
+++ b/cpukit/rtems/src/taskresume.c
@@ -31,7 +31,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_task_resume(
rtems_id id
diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c
index 6e85fa7..15f7660 100644
--- a/cpukit/rtems/src/tasks.c
+++ b/cpukit/rtems/src/tasks.c
@@ -35,7 +35,6 @@
#include <rtems/score/userextimpl.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
/*
* _RTEMS_tasks_Create_extension
diff --git a/cpukit/rtems/src/tasksetnote.c b/cpukit/rtems/src/tasksetnote.c
index 7267d50..f79baaa 100644
--- a/cpukit/rtems/src/tasksetnote.c
+++ b/cpukit/rtems/src/tasksetnote.c
@@ -32,7 +32,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_task_set_note(
rtems_id id,
diff --git a/cpukit/rtems/src/tasksetpriority.c b/cpukit/rtems/src/tasksetpriority.c
index 369ceef..b522fd2 100644
--- a/cpukit/rtems/src/tasksetpriority.c
+++ b/cpukit/rtems/src/tasksetpriority.c
@@ -31,7 +31,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_task_set_priority(
rtems_id id,
diff --git a/cpukit/rtems/src/taskstart.c b/cpukit/rtems/src/taskstart.c
index d8baa83..ae4b707 100644
--- a/cpukit/rtems/src/taskstart.c
+++ b/cpukit/rtems/src/taskstart.c
@@ -31,7 +31,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
/*
* rtems_task_start
diff --git a/cpukit/rtems/src/tasksuspend.c b/cpukit/rtems/src/tasksuspend.c
index d04183d..a88e211 100644
--- a/cpukit/rtems/src/tasksuspend.c
+++ b/cpukit/rtems/src/tasksuspend.c
@@ -31,7 +31,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
rtems_status_code rtems_task_suspend(
rtems_id id
diff --git a/cpukit/rtems/src/taskwakeafter.c b/cpukit/rtems/src/taskwakeafter.c
index 6a736c6..2869bfe 100644
--- a/cpukit/rtems/src/taskwakeafter.c
+++ b/cpukit/rtems/src/taskwakeafter.c
@@ -32,7 +32,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/watchdogimpl.h>
rtems_status_code rtems_task_wake_after(
diff --git a/cpukit/rtems/src/taskwakewhen.c b/cpukit/rtems/src/taskwakewhen.c
index 849801f..31eb5d8 100644
--- a/cpukit/rtems/src/taskwakewhen.c
+++ b/cpukit/rtems/src/taskwakewhen.c
@@ -32,7 +32,6 @@
#include <rtems/score/tod.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/watchdogimpl.h>
rtems_status_code rtems_task_wake_when(
diff --git a/cpukit/sapi/include/rtems/sptables.h b/cpukit/sapi/include/rtems/sptables.h
index fdef83e..f8357fd 100644
--- a/cpukit/sapi/include/rtems/sptables.h
+++ b/cpukit/sapi/include/rtems/sptables.h
@@ -29,7 +29,6 @@ extern "C" {
#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>
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 82eb254..290715d 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -101,7 +101,6 @@ include_rtems_score_HEADERS += inline/rtems/score/scheduler.inl
include_rtems_score_HEADERS += inline/rtems/score/schedulerpriority.inl
include_rtems_score_HEADERS += inline/rtems/score/schedulersimple.inl
include_rtems_score_HEADERS += inline/rtems/score/states.inl
-include_rtems_score_HEADERS += inline/rtems/score/sysstate.inl
include_rtems_score_HEADERS += inline/rtems/score/thread.inl
include_rtems_score_HEADERS += inline/rtems/score/threadq.inl
include_rtems_score_HEADERS += inline/rtems/score/tod.inl
diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/score/include/rtems/score/coremutex.h
index bf0ac1e..71582a9 100644
--- a/cpukit/score/include/rtems/score/coremutex.h
+++ b/cpukit/score/include/rtems/score/coremutex.h
@@ -26,7 +26,6 @@
#include <rtems/score/priority.h>
#include <rtems/score/watchdog.h>
#include <rtems/score/interr.h>
-#include <rtems/score/sysstate.h>
#ifdef __cplusplus
extern "C" {
diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h
index 337ef01..af7c3fa 100644
--- a/cpukit/score/include/rtems/score/coremuteximpl.h
+++ b/cpukit/score/include/rtems/score/coremuteximpl.h
@@ -20,6 +20,7 @@
#include <rtems/score/coremutex.h>
#include <rtems/score/chainimpl.h>
+#include <rtems/score/sysstate.h>
#include <rtems/score/threaddispatch.h>
#ifdef __cplusplus
diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/score/include/rtems/score/sysstate.h
index 7d3d6ae..6599dff 100644
--- a/cpukit/score/include/rtems/score/sysstate.h
+++ b/cpukit/score/include/rtems/score/sysstate.h
@@ -18,7 +18,7 @@
#ifndef _RTEMS_SCORE_SYSSTATE_H
#define _RTEMS_SCORE_SYSSTATE_H
-#include <rtems/score/basedefs.h> /* SCORE_EXTERN */
+#include <rtems/score/basedefs.h>
#ifdef __cplusplus
extern "C" {
@@ -79,11 +79,73 @@ SCORE_EXTERN bool _System_state_Is_multiprocessing;
extern System_state_Codes _System_state_Current;
-/*
- * Make it possible for the application to get the system state information.
- */
+RTEMS_INLINE_ROUTINE void _System_state_Set (
+ System_state_Codes state
+)
+{
+ _System_state_Current = state;
+}
+
+RTEMS_INLINE_ROUTINE void _System_state_Handler_initialization (
+#if defined(RTEMS_MULTIPROCESSING)
+ bool is_multiprocessing
+#else
+ bool is_multiprocessing __attribute__((unused))
+#endif
+)
+{
+ _System_state_Set( SYSTEM_STATE_BEFORE_INITIALIZATION );
+#if defined(RTEMS_MULTIPROCESSING)
+ _System_state_Is_multiprocessing = is_multiprocessing;
+#endif
+}
+
+RTEMS_INLINE_ROUTINE System_state_Codes _System_state_Get ( void )
+{
+ return _System_state_Current;
+}
-#include <rtems/score/sysstate.inl>
+RTEMS_INLINE_ROUTINE bool _System_state_Is_before_initialization (
+ System_state_Codes state
+)
+{
+ return (state == SYSTEM_STATE_BEFORE_INITIALIZATION);
+}
+
+RTEMS_INLINE_ROUTINE bool _System_state_Is_before_multitasking (
+ System_state_Codes state
+)
+{
+ return (state == SYSTEM_STATE_BEFORE_MULTITASKING);
+}
+
+RTEMS_INLINE_ROUTINE bool _System_state_Is_begin_multitasking (
+ System_state_Codes state
+)
+{
+ return (state == SYSTEM_STATE_BEGIN_MULTITASKING);
+}
+
+RTEMS_INLINE_ROUTINE bool _System_state_Is_shutdown (
+ System_state_Codes state
+)
+{
+ return (state == SYSTEM_STATE_SHUTDOWN);
+}
+
+RTEMS_INLINE_ROUTINE bool _System_state_Is_up (
+ System_state_Codes state
+)
+{
+ return (state == SYSTEM_STATE_UP);
+}
+
+RTEMS_INLINE_ROUTINE bool _System_state_Is_failed (
+ System_state_Codes state
+)
+{
+ return (state == SYSTEM_STATE_FAILED);
+}
/** @} */
diff --git a/cpukit/score/inline/rtems/score/sysstate.inl b/cpukit/score/inline/rtems/score/sysstate.inl
deleted file mode 100644
index 3fa534c..0000000
--- a/cpukit/score/inline/rtems/score/sysstate.inl
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @file
- *
- * @brief System State Handler API
- */
-
-/*
- * COPYRIGHT (c) 1989-2004.
- * 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.rtems.com/license/LICENSE.
- */
-
-#ifndef _RTEMS_SCORE_SYSSTATE_H
-# error "Never use <rtems/score/sysstate.inl> directly; include <rtems/score/sysstate.h> instead."
-#endif
-
-#ifndef _RTEMS_SCORE_SYSSTATE_INL
-#define _RTEMS_SCORE_SYSSTATE_INL
-
-/**
- * @addtogroup ScoreSysState
- */
-/**@{**/
-
-RTEMS_INLINE_ROUTINE void _System_state_Set (
- System_state_Codes state
-)
-{
- _System_state_Current = state;
-}
-
-RTEMS_INLINE_ROUTINE void _System_state_Handler_initialization (
-#if defined(RTEMS_MULTIPROCESSING)
- bool is_multiprocessing
-#else
- bool is_multiprocessing __attribute__((unused))
-#endif
-)
-{
- _System_state_Set( SYSTEM_STATE_BEFORE_INITIALIZATION );
-#if defined(RTEMS_MULTIPROCESSING)
- _System_state_Is_multiprocessing = is_multiprocessing;
-#endif
-}
-
-RTEMS_INLINE_ROUTINE System_state_Codes _System_state_Get ( void )
-{
- return _System_state_Current;
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_before_initialization (
- System_state_Codes state
-)
-{
- return (state == SYSTEM_STATE_BEFORE_INITIALIZATION);
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_before_multitasking (
- System_state_Codes state
-)
-{
- return (state == SYSTEM_STATE_BEFORE_MULTITASKING);
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_begin_multitasking (
- System_state_Codes state
-)
-{
- return (state == SYSTEM_STATE_BEGIN_MULTITASKING);
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_shutdown (
- System_state_Codes state
-)
-{
- return (state == SYSTEM_STATE_SHUTDOWN);
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_up (
- System_state_Codes state
-)
-{
- return (state == SYSTEM_STATE_UP);
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_failed (
- System_state_Codes state
-)
-{
- return (state == SYSTEM_STATE_FAILED);
-}
-
-/** @} */
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl
index 88438d6..9c0aecb 100644
--- a/cpukit/score/inline/rtems/score/thread.inl
+++ b/cpukit/score/inline/rtems/score/thread.inl
@@ -23,7 +23,6 @@
#ifndef _RTEMS_SCORE_THREAD_INL
#define _RTEMS_SCORE_THREAD_INL
-#include <rtems/score/sysstate.h>
#include <rtems/score/context.h>
/**
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
index 6df393d..85cd03f 100644
--- a/cpukit/score/preinstall.am
+++ b/cpukit/score/preinstall.am
@@ -335,10 +335,6 @@ $(PROJECT_INCLUDE)/rtems/score/states.inl: inline/rtems/score/states.inl $(PROJE
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/states.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/states.inl
-$(PROJECT_INCLUDE)/rtems/score/sysstate.inl: inline/rtems/score/sysstate.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sysstate.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sysstate.inl
-
$(PROJECT_INCLUDE)/rtems/score/thread.inl: inline/rtems/score/thread.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/thread.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/thread.inl
diff --git a/cpukit/score/src/heapallocate.c b/cpukit/score/src/heapallocate.c
index 6367fac..4284f56 100644
--- a/cpukit/score/src/heapallocate.c
+++ b/cpukit/score/src/heapallocate.c
@@ -22,7 +22,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/heapimpl.h>
#ifndef HEAP_PROTECTION
diff --git a/cpukit/score/src/heapextend.c b/cpukit/score/src/heapextend.c
index 571bba8..183fac3 100644
--- a/cpukit/score/src/heapextend.c
+++ b/cpukit/score/src/heapextend.c
@@ -22,7 +22,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/heapimpl.h>
static void _Heap_Free_block( Heap_Control *heap, Heap_Block *block )
diff --git a/cpukit/score/src/heapgetfreeinfo.c b/cpukit/score/src/heapgetfreeinfo.c
index de6e3dc..2e5ac42 100644
--- a/cpukit/score/src/heapgetfreeinfo.c
+++ b/cpukit/score/src/heapgetfreeinfo.c
@@ -20,7 +20,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/heapimpl.h>
void _Heap_Get_free_information(
diff --git a/cpukit/score/src/heapresizeblock.c b/cpukit/score/src/heapresizeblock.c
index f791efe..dae90c1 100644
--- a/cpukit/score/src/heapresizeblock.c
+++ b/cpukit/score/src/heapresizeblock.c
@@ -22,7 +22,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/heapimpl.h>
static Heap_Resize_status _Heap_Resize_block_checked(
diff --git a/cpukit/score/src/heapsizeofuserarea.c b/cpukit/score/src/heapsizeofuserarea.c
index 7c4d9f3..4d9fd9a 100644
--- a/cpukit/score/src/heapsizeofuserarea.c
+++ b/cpukit/score/src/heapsizeofuserarea.c
@@ -20,7 +20,6 @@
#endif
#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/heapimpl.h>
bool _Heap_Size_of_alloc_area(
diff --git a/cpukit/score/src/objectallocate.c b/cpukit/score/src/objectallocate.c
index 9083075..6d18182 100644
--- a/cpukit/score/src/objectallocate.c
+++ b/cpukit/score/src/objectallocate.c
@@ -27,7 +27,6 @@
#endif
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
/* #define RTEMS_DEBUG_OBJECT_ALLOCATION */
diff --git a/cpukit/score/src/objectextendinformation.c b/cpukit/score/src/objectextendinformation.c
index 63eae12..96b26f3 100644
--- a/cpukit/score/src/objectextendinformation.c
+++ b/cpukit/score/src/objectextendinformation.c
@@ -27,7 +27,6 @@
#endif
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
#include <string.h> /* for memcpy() */
diff --git a/cpukit/score/src/objectfree.c b/cpukit/score/src/objectfree.c
index b10f7f8..d686111 100644
--- a/cpukit/score/src/objectfree.c
+++ b/cpukit/score/src/objectfree.c
@@ -27,7 +27,6 @@
#endif
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
void _Objects_Free(
diff --git a/cpukit/score/src/objectget.c b/cpukit/score/src/objectget.c
index eca8ea9..5d05cc8 100644
--- a/cpukit/score/src/objectget.c
+++ b/cpukit/score/src/objectget.c
@@ -27,7 +27,6 @@
#endif
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
Objects_Control *_Objects_Get(
diff --git a/cpukit/score/src/objectgetisr.c b/cpukit/score/src/objectgetisr.c
index 56f7471..a707384 100644
--- a/cpukit/score/src/objectgetisr.c
+++ b/cpukit/score/src/objectgetisr.c
@@ -27,7 +27,6 @@
#endif
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
Objects_Control *_Objects_Get_isr_disable(
diff --git a/cpukit/score/src/objectgetnext.c b/cpukit/score/src/objectgetnext.c
index 16e16cd..2a0ef43 100644
--- a/cpukit/score/src/objectgetnext.c
+++ b/cpukit/score/src/objectgetnext.c
@@ -27,7 +27,6 @@
#endif
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
/*
diff --git a/cpukit/score/src/objectgetnoprotection.c b/cpukit/score/src/objectgetnoprotection.c
index 30b61cc..e2083b4 100644
--- a/cpukit/score/src/objectgetnoprotection.c
+++ b/cpukit/score/src/objectgetnoprotection.c
@@ -27,7 +27,6 @@
#endif
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
Objects_Control *_Objects_Get_no_protection(
diff --git a/cpukit/score/src/objectnametoid.c b/cpukit/score/src/objectnametoid.c
index 7648f22..bf3bb4c 100644
--- a/cpukit/score/src/objectnametoid.c
+++ b/cpukit/score/src/objectnametoid.c
@@ -27,7 +27,6 @@
#endif
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
Objects_Name_or_id_lookup_errors _Objects_Name_to_id_u32(
diff --git a/cpukit/score/src/objectnametoidstring.c b/cpukit/score/src/objectnametoidstring.c
index 1b88e06..4023635 100644
--- a/cpukit/score/src/objectnametoidstring.c
+++ b/cpukit/score/src/objectnametoidstring.c
@@ -29,7 +29,6 @@
#endif
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
#if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES)
diff --git a/cpukit/score/src/objectshrinkinformation.c b/cpukit/score/src/objectshrinkinformation.c
index dd26252..686d0f2 100644
--- a/cpukit/score/src/objectshrinkinformation.c
+++ b/cpukit/score/src/objectshrinkinformation.c
@@ -27,7 +27,6 @@
#endif
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
void _Objects_Shrink_information(
diff --git a/cpukit/score/src/threadclearstate.c b/cpukit/score/src/threadclearstate.c
index cf59f3b..6e8cb48 100644
--- a/cpukit/score/src/threadclearstate.c
+++ b/cpukit/score/src/threadclearstate.c
@@ -27,7 +27,6 @@
#include <rtems/score/priority.h>
#include <rtems/score/scheduler.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadclose.c b/cpukit/score/src/threadclose.c
index e6fec85..912e5d4 100644
--- a/cpukit/score/src/threadclose.c
+++ b/cpukit/score/src/threadclose.c
@@ -27,7 +27,6 @@
#include <rtems/score/priority.h>
#include <rtems/score/scheduler.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threaddispatch.h>
#include <rtems/score/threadq.h>
diff --git a/cpukit/score/src/threadcreateidle.c b/cpukit/score/src/threadcreateidle.c
index d11b296..cef6d03 100644
--- a/cpukit/score/src/threadcreateidle.c
+++ b/cpukit/score/src/threadcreateidle.c
@@ -28,7 +28,6 @@
#include <rtems/score/smp.h>
#include <rtems/score/stackimpl.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threaddelayended.c b/cpukit/score/src/threaddelayended.c
index dc8ccb4..98b2f03 100644
--- a/cpukit/score/src/threaddelayended.c
+++ b/cpukit/score/src/threaddelayended.c
@@ -26,7 +26,6 @@
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threaddispatch.h>
#include <rtems/score/threadq.h>
diff --git a/cpukit/score/src/threaddisabledispatch.c b/cpukit/score/src/threaddisabledispatch.c
index d89bc92..de19b89 100644
--- a/cpukit/score/src/threaddisabledispatch.c
+++ b/cpukit/score/src/threaddisabledispatch.c
@@ -21,6 +21,7 @@
#endif
#include <rtems/system.h>
+#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threaddispatch.h>
diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c
index adce3a1..177a3d8 100644
--- a/cpukit/score/src/threaddispatch.c
+++ b/cpukit/score/src/threaddispatch.c
@@ -26,7 +26,6 @@
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threaddispatch.h>
#include <rtems/score/threadq.h>
diff --git a/cpukit/score/src/threaddispatchdisablelevel.c b/cpukit/score/src/threaddispatchdisablelevel.c
index d5f3ff6..439a6e6 100644
--- a/cpukit/score/src/threaddispatchdisablelevel.c
+++ b/cpukit/score/src/threaddispatchdisablelevel.c
@@ -23,7 +23,6 @@
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/threaddispatch.h>
#define NO_OWNER_CPU 0xffffffffU
diff --git a/cpukit/score/src/threadget.c b/cpukit/score/src/threadget.c
index 69551f0..a2b81b3 100644
--- a/cpukit/score/src/threadget.c
+++ b/cpukit/score/src/threadget.c
@@ -27,7 +27,6 @@
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threaddispatch.h>
#include <rtems/score/threadq.h>
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index 85f8f6e..fa57fc5 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -26,7 +26,6 @@
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threaddispatch.h>
#include <rtems/score/threadq.h>
diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c
index f3b25e9..5c778a8 100644
--- a/cpukit/score/src/threadinitialize.c
+++ b/cpukit/score/src/threadinitialize.c
@@ -28,7 +28,6 @@
#include <rtems/score/scheduler.h>
#include <rtems/score/stackimpl.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/userextimpl.h>
diff --git a/cpukit/score/src/threadloadenv.c b/cpukit/score/src/threadloadenv.c
index 6cce54f..b368b74 100644
--- a/cpukit/score/src/threadloadenv.c
+++ b/cpukit/score/src/threadloadenv.c
@@ -27,7 +27,6 @@
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadready.c b/cpukit/score/src/threadready.c
index d1e57a4..0b5149c 100644
--- a/cpukit/score/src/threadready.c
+++ b/cpukit/score/src/threadready.c
@@ -27,7 +27,6 @@
#include <rtems/score/priority.h>
#include <rtems/score/scheduler.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadreset.c b/cpukit/score/src/threadreset.c
index 575cd27..fb4278d 100644
--- a/cpukit/score/src/threadreset.c
+++ b/cpukit/score/src/threadreset.c
@@ -26,7 +26,6 @@
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c
index 2409e69..26dd61a 100644
--- a/cpukit/score/src/threadrestart.c
+++ b/cpukit/score/src/threadrestart.c
@@ -26,7 +26,6 @@
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/userextimpl.h>
diff --git a/cpukit/score/src/threadsetstate.c b/cpukit/score/src/threadsetstate.c
index f72cdec..abe5eeb 100644
--- a/cpukit/score/src/threadsetstate.c
+++ b/cpukit/score/src/threadsetstate.c
@@ -30,7 +30,6 @@
#include <rtems/score/priority.h>
#include <rtems/score/scheduler.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadsettransient.c b/cpukit/score/src/threadsettransient.c
index b099396..5d22a52 100644
--- a/cpukit/score/src/threadsettransient.c
+++ b/cpukit/score/src/threadsettransient.c
@@ -29,7 +29,6 @@
#include <rtems/score/scheduler.h>
#include <rtems/score/schedulerpriority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadstackallocate.c b/cpukit/score/src/threadstackallocate.c
index 0f64f59..5d9230e 100644
--- a/cpukit/score/src/threadstackallocate.c
+++ b/cpukit/score/src/threadstackallocate.c
@@ -28,7 +28,6 @@
#include <rtems/score/priority.h>
#include <rtems/score/stackimpl.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadstackfree.c b/cpukit/score/src/threadstackfree.c
index 8a44100..0e59ef7 100644
--- a/cpukit/score/src/threadstackfree.c
+++ b/cpukit/score/src/threadstackfree.c
@@ -26,7 +26,6 @@
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadstart.c b/cpukit/score/src/threadstart.c
index 4e24f39..dddf744 100644
--- a/cpukit/score/src/threadstart.c
+++ b/cpukit/score/src/threadstart.c
@@ -27,7 +27,6 @@
#include <rtems/score/object.h>
#include <rtems/score/priority.h>
#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
#include <rtems/score/thread.h>
#include <rtems/score/threadq.h>
#include <rtems/score/userextimpl.h>
diff --git a/testsuites/libtests/heapwalk/init.c b/testsuites/libtests/heapwalk/init.c
index 4e01428..f00b9b8 100644
--- a/testsuites/libtests/heapwalk/init.c
+++ b/testsuites/libtests/heapwalk/init.c
@@ -23,6 +23,7 @@
#include <errno.h>
#include <string.h>
#include <rtems/score/heapimpl.h>
+#include <rtems/score/sysstate.h>
#include <rtems/dumpbuf.h>
#define TEST_HEAP_SIZE 1024
diff --git a/testsuites/sptests/sp08/init.c b/testsuites/sptests/sp08/init.c
index 48ec913..ddb55a9 100644
--- a/testsuites/sptests/sp08/init.c
+++ b/testsuites/sptests/sp08/init.c
@@ -13,6 +13,8 @@
#include <tmacros.h>
+#include <rtems/score/sysstate.h>
+
/* forward declarations to avoid warnings */
rtems_task Init(rtems_task_argument argument);
diff --git a/testsuites/sptests/spfatal23/testcase.h b/testsuites/sptests/spfatal23/testcase.h
index 4eb5650..28010e1 100644
--- a/testsuites/sptests/spfatal23/testcase.h
+++ b/testsuites/sptests/spfatal23/testcase.h
@@ -7,7 +7,8 @@
* http://www.rtems.com/license/LICENSE.
*/
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+#include <rtems/score/sysstate.h>
+
#define FATAL_ERROR_TEST_NAME "SHUTDOWN WHEN NOT UP"
#define FATAL_ERROR_DESCRIPTION "SHUTDOWN WHEN NOT UP"
#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE
More information about the vc
mailing list