summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2019-04-04 09:18:11 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2019-04-04 09:18:55 +0200
commit4c20da4be441c519074df7d488d1e54354dac85b (patch)
tree0f31d260ce352aa1623fda9c982732c9685a067d /cpukit
parent7b0903293b56cb9c7fd3630ba9a2bebdc07da2ea (diff)
downloadrtems-4c20da4be441c519074df7d488d1e54354dac85b.tar.bz2
doxygen: Rename Score* groups in RTEMSScore*
Update #3706
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/include/rtems/score/address.h4
-rw-r--r--cpukit/include/rtems/score/apimutex.h10
-rw-r--r--cpukit/include/rtems/score/atomic.h6
-rw-r--r--cpukit/include/rtems/score/basedefs.h6
-rw-r--r--cpukit/include/rtems/score/chain.h6
-rw-r--r--cpukit/include/rtems/score/chainimpl.h2
-rw-r--r--cpukit/include/rtems/score/context.h4
-rw-r--r--cpukit/include/rtems/score/copyrt.h2
-rw-r--r--cpukit/include/rtems/score/corebarrier.h4
-rw-r--r--cpukit/include/rtems/score/corebarrierimpl.h2
-rw-r--r--cpukit/include/rtems/score/coremsg.h4
-rw-r--r--cpukit/include/rtems/score/coremsgimpl.h2
-rw-r--r--cpukit/include/rtems/score/coremutex.h4
-rw-r--r--cpukit/include/rtems/score/coremuteximpl.h4
-rw-r--r--cpukit/include/rtems/score/corerwlockimpl.h4
-rw-r--r--cpukit/include/rtems/score/coresem.h4
-rw-r--r--cpukit/include/rtems/score/coresemimpl.h2
-rw-r--r--cpukit/include/rtems/score/freechain.h6
-rw-r--r--cpukit/include/rtems/score/heap.h6
-rw-r--r--cpukit/include/rtems/score/heapimpl.h4
-rw-r--r--cpukit/include/rtems/score/heapinfo.h4
-rw-r--r--cpukit/include/rtems/score/interr.h4
-rw-r--r--cpukit/include/rtems/score/isr.h4
-rw-r--r--cpukit/include/rtems/score/isrlevel.h2
-rw-r--r--cpukit/include/rtems/score/isrlock.h6
-rw-r--r--cpukit/include/rtems/score/mpci.h6
-rw-r--r--cpukit/include/rtems/score/mpciimpl.h4
-rw-r--r--cpukit/include/rtems/score/mppkt.h4
-rw-r--r--cpukit/include/rtems/score/mrsp.h4
-rw-r--r--cpukit/include/rtems/score/mrspimpl.h2
-rw-r--r--cpukit/include/rtems/score/object.h8
-rw-r--r--cpukit/include/rtems/score/objectdata.h4
-rw-r--r--cpukit/include/rtems/score/objectimpl.h2
-rw-r--r--cpukit/include/rtems/score/objectmp.h4
-rw-r--r--cpukit/include/rtems/score/onceimpl.h6
-rw-r--r--cpukit/include/rtems/score/percpu.h2
-rw-r--r--cpukit/include/rtems/score/priority.h4
-rw-r--r--cpukit/include/rtems/score/prioritybitmap.h4
-rw-r--r--cpukit/include/rtems/score/prioritybitmapimpl.h2
-rw-r--r--cpukit/include/rtems/score/processormask.h6
-rw-r--r--cpukit/include/rtems/score/profiling.h6
-rw-r--r--cpukit/include/rtems/score/protectedheap.h6
-rw-r--r--cpukit/include/rtems/score/rbtree.h4
-rw-r--r--cpukit/include/rtems/score/rbtreeimpl.h2
-rw-r--r--cpukit/include/rtems/score/scheduler.h4
-rw-r--r--cpukit/include/rtems/score/schedulercbs.h4
-rw-r--r--cpukit/include/rtems/score/schedulercbsimpl.h4
-rw-r--r--cpukit/include/rtems/score/scheduleredf.h4
-rw-r--r--cpukit/include/rtems/score/scheduleredfimpl.h4
-rw-r--r--cpukit/include/rtems/score/scheduleredfsmp.h6
-rw-r--r--cpukit/include/rtems/score/schedulerimpl.h2
-rw-r--r--cpukit/include/rtems/score/schedulerpriority.h4
-rw-r--r--cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h6
-rw-r--r--cpukit/include/rtems/score/schedulerpriorityimpl.h2
-rw-r--r--cpukit/include/rtems/score/schedulerprioritysmp.h6
-rw-r--r--cpukit/include/rtems/score/schedulerprioritysmpimpl.h4
-rw-r--r--cpukit/include/rtems/score/schedulersimple.h4
-rw-r--r--cpukit/include/rtems/score/schedulersimpleimpl.h2
-rw-r--r--cpukit/include/rtems/score/schedulersimplesmp.h6
-rw-r--r--cpukit/include/rtems/score/schedulersmp.h6
-rw-r--r--cpukit/include/rtems/score/schedulersmpimpl.h4
-rw-r--r--cpukit/include/rtems/score/schedulerstrongapa.h6
-rw-r--r--cpukit/include/rtems/score/smp.h6
-rw-r--r--cpukit/include/rtems/score/smpbarrier.h6
-rw-r--r--cpukit/include/rtems/score/smpimpl.h4
-rw-r--r--cpukit/include/rtems/score/smplock.h6
-rw-r--r--cpukit/include/rtems/score/smplockmcs.h4
-rw-r--r--cpukit/include/rtems/score/smplockseq.h4
-rw-r--r--cpukit/include/rtems/score/smplockstats.h4
-rw-r--r--cpukit/include/rtems/score/smplockticket.h4
-rw-r--r--cpukit/include/rtems/score/stack.h4
-rw-r--r--cpukit/include/rtems/score/stackimpl.h2
-rw-r--r--cpukit/include/rtems/score/states.h4
-rw-r--r--cpukit/include/rtems/score/statesimpl.h2
-rw-r--r--cpukit/include/rtems/score/sysstate.h6
-rw-r--r--cpukit/include/rtems/score/thread.h4
-rw-r--r--cpukit/include/rtems/score/threaddispatch.h2
-rw-r--r--cpukit/include/rtems/score/threadimpl.h2
-rw-r--r--cpukit/include/rtems/score/threadmp.h4
-rw-r--r--cpukit/include/rtems/score/threadq.h4
-rw-r--r--cpukit/include/rtems/score/threadqimpl.h2
-rw-r--r--cpukit/include/rtems/score/timecounter.h6
-rw-r--r--cpukit/include/rtems/score/timecounterimpl.h4
-rw-r--r--cpukit/include/rtems/score/timespec.h2
-rw-r--r--cpukit/include/rtems/score/timestamp.h2
-rw-r--r--cpukit/include/rtems/score/tls.h6
-rw-r--r--cpukit/include/rtems/score/todimpl.h8
-rw-r--r--cpukit/include/rtems/score/userext.h6
-rw-r--r--cpukit/include/rtems/score/userextdata.h4
-rw-r--r--cpukit/include/rtems/score/userextimpl.h4
-rw-r--r--cpukit/include/rtems/score/watchdog.h6
-rw-r--r--cpukit/include/rtems/score/watchdogimpl.h2
-rw-r--r--cpukit/include/rtems/score/watchdogticks.h4
-rw-r--r--cpukit/include/rtems/score/wkspace.h4
-rw-r--r--cpukit/include/rtems/seterr.h4
-rw-r--r--cpukit/include/rtems/system.h4
-rw-r--r--cpukit/sapi/src/rbtreefind.c2
-rw-r--r--cpukit/score/cpu/i386/include/rtems/score/cpu.h2
-rw-r--r--cpukit/score/src/apimutexisowner.c2
-rw-r--r--cpukit/score/src/apimutexlock.c2
-rw-r--r--cpukit/score/src/apimutexunlock.c2
-rw-r--r--cpukit/score/src/chain.c2
-rw-r--r--cpukit/score/src/corebarrier.c2
-rw-r--r--cpukit/score/src/corebarrierrelease.c2
-rw-r--r--cpukit/score/src/corebarrierwait.c2
-rw-r--r--cpukit/score/src/coremsg.c2
-rw-r--r--cpukit/score/src/coremsgbroadcast.c2
-rw-r--r--cpukit/score/src/coremsgclose.c2
-rw-r--r--cpukit/score/src/coremsgflush.c2
-rw-r--r--cpukit/score/src/coremsgflushwait.c2
-rw-r--r--cpukit/score/src/coremsginsert.c2
-rw-r--r--cpukit/score/src/coremsgseize.c2
-rw-r--r--cpukit/score/src/coremsgsubmit.c2
-rw-r--r--cpukit/score/src/coremutexseize.c2
-rw-r--r--cpukit/score/src/corerwlock.c2
-rw-r--r--cpukit/score/src/corerwlockobtainread.c2
-rw-r--r--cpukit/score/src/corerwlockobtainwrite.c2
-rw-r--r--cpukit/score/src/corerwlockrelease.c2
-rw-r--r--cpukit/score/src/coresem.c2
-rw-r--r--cpukit/score/src/coretod.c2
-rw-r--r--cpukit/score/src/coretodadjust.c2
-rw-r--r--cpukit/score/src/coretodset.c2
-rw-r--r--cpukit/score/src/coretodtickspersec.c2
-rw-r--r--cpukit/score/src/freechain.c2
-rw-r--r--cpukit/score/src/heap.c2
-rw-r--r--cpukit/score/src/heapallocate.c2
-rw-r--r--cpukit/score/src/heapextend.c2
-rw-r--r--cpukit/score/src/heapfree.c2
-rw-r--r--cpukit/score/src/heapgetfreeinfo.c2
-rw-r--r--cpukit/score/src/heapgetinfo.c2
-rw-r--r--cpukit/score/src/heapgreedy.c2
-rw-r--r--cpukit/score/src/heapiterate.c2
-rw-r--r--cpukit/score/src/heapnoextend.c2
-rw-r--r--cpukit/score/src/heapresizeblock.c2
-rw-r--r--cpukit/score/src/heapsizeofuserarea.c2
-rw-r--r--cpukit/score/src/heapwalk.c2
-rw-r--r--cpukit/score/src/interr.c2
-rw-r--r--cpukit/score/src/isr.c2
-rw-r--r--cpukit/score/src/isrisinprogress.c2
-rw-r--r--cpukit/score/src/iterateoverthreads.c2
-rw-r--r--cpukit/score/src/log2table.c2
-rw-r--r--cpukit/score/src/mpci.c2
-rw-r--r--cpukit/score/src/objectallocate.c2
-rw-r--r--cpukit/score/src/objectapimaximumclass.c2
-rw-r--r--cpukit/score/src/objectclose.c2
-rw-r--r--cpukit/score/src/objectextendinformation.c2
-rw-r--r--cpukit/score/src/objectfree.c2
-rw-r--r--cpukit/score/src/objectgetinfo.c2
-rw-r--r--cpukit/score/src/objectgetinfoid.c2
-rw-r--r--cpukit/score/src/objectgetlocal.c2
-rw-r--r--cpukit/score/src/objectgetnameasstring.c2
-rw-r--r--cpukit/score/src/objectgetnext.c2
-rw-r--r--cpukit/score/src/objectgetnoprotection.c2
-rw-r--r--cpukit/score/src/objectidtoname.c2
-rw-r--r--cpukit/score/src/objectinitializeinformation.c2
-rw-r--r--cpukit/score/src/objectmp.c2
-rw-r--r--cpukit/score/src/objectnamespaceremove.c2
-rw-r--r--cpukit/score/src/objectnametoid.c2
-rw-r--r--cpukit/score/src/objectnametoidstring.c2
-rw-r--r--cpukit/score/src/objectsetname.c2
-rw-r--r--cpukit/score/src/pheapallocate.c2
-rw-r--r--cpukit/score/src/pheapextend.c2
-rw-r--r--cpukit/score/src/pheapfree.c2
-rw-r--r--cpukit/score/src/pheapgetblocksize.c2
-rw-r--r--cpukit/score/src/pheapgetfreeinfo.c2
-rw-r--r--cpukit/score/src/pheapgetinfo.c2
-rw-r--r--cpukit/score/src/pheapgetsize.c2
-rw-r--r--cpukit/score/src/pheapinit.c2
-rw-r--r--cpukit/score/src/pheapiterate.c2
-rw-r--r--cpukit/score/src/pheapresizeblock.c2
-rw-r--r--cpukit/score/src/pheapwalk.c2
-rw-r--r--cpukit/score/src/processormaskcopy.c2
-rw-r--r--cpukit/score/src/rbtreeiterate.c2
-rw-r--r--cpukit/score/src/rbtreenext.c2
-rw-r--r--cpukit/score/src/rbtreepostorder.c2
-rw-r--r--cpukit/score/src/rbtreereplace.c2
-rw-r--r--cpukit/score/src/scheduler.c2
-rw-r--r--cpukit/score/src/schedulercbs.c2
-rw-r--r--cpukit/score/src/schedulercbsattachthread.c2
-rw-r--r--cpukit/score/src/schedulercbscleanup.c2
-rw-r--r--cpukit/score/src/schedulercbscreateserver.c2
-rw-r--r--cpukit/score/src/schedulercbsdestroyserver.c2
-rw-r--r--cpukit/score/src/schedulercbsdetachthread.c2
-rw-r--r--cpukit/score/src/schedulercbsgetapprovedbudget.c2
-rw-r--r--cpukit/score/src/schedulercbsgetexecutiontime.c2
-rw-r--r--cpukit/score/src/schedulercbsgetparameters.c2
-rw-r--r--cpukit/score/src/schedulercbsgetremainingbudget.c2
-rw-r--r--cpukit/score/src/schedulercbsgetserverid.c2
-rw-r--r--cpukit/score/src/schedulercbsnodeinit.c2
-rw-r--r--cpukit/score/src/schedulercbsreleasejob.c2
-rw-r--r--cpukit/score/src/schedulercbssetparameters.c2
-rw-r--r--cpukit/score/src/schedulercbsunblock.c2
-rw-r--r--cpukit/score/src/schedulerdefaultnodedestroy.c2
-rw-r--r--cpukit/score/src/schedulerdefaultnodeinit.c2
-rw-r--r--cpukit/score/src/schedulerdefaultreleasejob.c2
-rw-r--r--cpukit/score/src/schedulerdefaultsetaffinity.c2
-rw-r--r--cpukit/score/src/schedulerdefaulttick.c2
-rw-r--r--cpukit/score/src/scheduleredf.c2
-rw-r--r--cpukit/score/src/scheduleredfblock.c2
-rw-r--r--cpukit/score/src/scheduleredfchangepriority.c2
-rw-r--r--cpukit/score/src/scheduleredfnodeinit.c2
-rw-r--r--cpukit/score/src/scheduleredfreleasejob.c2
-rw-r--r--cpukit/score/src/scheduleredfschedule.c2
-rw-r--r--cpukit/score/src/scheduleredfsmp.c2
-rw-r--r--cpukit/score/src/scheduleredfunblock.c2
-rw-r--r--cpukit/score/src/scheduleredfyield.c2
-rw-r--r--cpukit/score/src/schedulerpriority.c2
-rw-r--r--cpukit/score/src/schedulerpriorityaffinitysmp.c2
-rw-r--r--cpukit/score/src/schedulerpriorityblock.c2
-rw-r--r--cpukit/score/src/schedulerprioritychangepriority.c2
-rw-r--r--cpukit/score/src/schedulerpriorityschedule.c2
-rw-r--r--cpukit/score/src/schedulerprioritysmp.c2
-rw-r--r--cpukit/score/src/schedulerpriorityunblock.c2
-rw-r--r--cpukit/score/src/schedulerpriorityyield.c2
-rw-r--r--cpukit/score/src/schedulersimple.c2
-rw-r--r--cpukit/score/src/schedulersimpleblock.c2
-rw-r--r--cpukit/score/src/schedulersimplechangepriority.c2
-rw-r--r--cpukit/score/src/schedulersimpleschedule.c2
-rw-r--r--cpukit/score/src/schedulersimplesmp.c2
-rw-r--r--cpukit/score/src/schedulersimpleunblock.c2
-rw-r--r--cpukit/score/src/schedulersimpleyield.c2
-rw-r--r--cpukit/score/src/schedulerstrongapa.c2
-rw-r--r--cpukit/score/src/smp.c2
-rw-r--r--cpukit/score/src/thread.c2
-rw-r--r--cpukit/score/src/threadchangepriority.c2
-rw-r--r--cpukit/score/src/threadclearstate.c2
-rw-r--r--cpukit/score/src/threadcreateidle.c2
-rw-r--r--cpukit/score/src/threaddispatch.c2
-rw-r--r--cpukit/score/src/threadget.c2
-rw-r--r--cpukit/score/src/threadhandler.c2
-rw-r--r--cpukit/score/src/threadinitialize.c2
-rw-r--r--cpukit/score/src/threadloadenv.c2
-rw-r--r--cpukit/score/src/threadmp.c2
-rw-r--r--cpukit/score/src/threadq.c2
-rw-r--r--cpukit/score/src/threadqenqueue.c2
-rw-r--r--cpukit/score/src/threadqfirst.c2
-rw-r--r--cpukit/score/src/threadqflush.c2
-rw-r--r--cpukit/score/src/threadrestart.c2
-rw-r--r--cpukit/score/src/threadsetstate.c2
-rw-r--r--cpukit/score/src/threadstackallocate.c2
-rw-r--r--cpukit/score/src/threadstackfree.c2
-rw-r--r--cpukit/score/src/threadstart.c2
-rw-r--r--cpukit/score/src/threadstartmultitasking.c2
-rw-r--r--cpukit/score/src/threadtimeout.c2
-rw-r--r--cpukit/score/src/threadyield.c2
-rw-r--r--cpukit/score/src/userext.c2
-rw-r--r--cpukit/score/src/userextaddset.c2
-rw-r--r--cpukit/score/src/userextiterate.c2
-rw-r--r--cpukit/score/src/userextremoveset.c2
-rw-r--r--cpukit/score/src/watchdoginsert.c2
-rw-r--r--cpukit/score/src/watchdogremove.c2
-rw-r--r--cpukit/score/src/watchdogtickssinceboot.c2
-rw-r--r--cpukit/score/src/wkspace.c2
-rw-r--r--cpukit/score/src/wkstringduplicate.c2
254 files changed, 360 insertions, 360 deletions
diff --git a/cpukit/include/rtems/score/address.h b/cpukit/include/rtems/score/address.h
index 28502e25e4..5fc5976599 100644
--- a/cpukit/include/rtems/score/address.h
+++ b/cpukit/include/rtems/score/address.h
@@ -26,9 +26,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreAddress Address Handler
+ * @defgroup RTEMSScoreAddress Address Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which abstracts address
* manipulation in a portable manner.
diff --git a/cpukit/include/rtems/score/apimutex.h b/cpukit/include/rtems/score/apimutex.h
index f43edf23f4..a5aa2bf3c5 100644
--- a/cpukit/include/rtems/score/apimutex.h
+++ b/cpukit/include/rtems/score/apimutex.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreAPIMutex
+ * @ingroup RTEMSScoreAPIMutex
*
* @brief API Mutex Handler API
*/
@@ -23,9 +23,9 @@
#include <sys/lock.h>
/**
- * @defgroup ScoreAPIMutex API Mutex Handler
+ * @defgroup RTEMSScoreAPIMutex API Mutex Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief Provides routines to ensure mutual exclusion on API level.
*/
@@ -81,9 +81,9 @@ bool _API_Mutex_Is_owner( const API_Mutex_Control *mutex );
/** @} */
/**
- * @defgroup ScoreAllocatorMutex RTEMS Allocator Mutex
+ * @defgroup RTEMSScoreAllocatorMutex RTEMS Allocator Mutex
*
- * @ingroup ScoreAPIMutex
+ * @ingroup RTEMSScoreAPIMutex
*
* @brief Protection for all memory allocations and deallocations in RTEMS.
*
diff --git a/cpukit/include/rtems/score/atomic.h b/cpukit/include/rtems/score/atomic.h
index 526926926f..f7d8b99af4 100644
--- a/cpukit/include/rtems/score/atomic.h
+++ b/cpukit/include/rtems/score/atomic.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreAtomic
+ * @ingroup RTEMSScoreAtomic
*
* @brief Atomic Operations API
*/
@@ -20,9 +20,9 @@
#include <rtems/score/cpuatomic.h>
/**
- * @defgroup ScoreAtomic Atomic Operations
+ * @defgroup RTEMSScoreAtomic Atomic Operations
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief Support for atomic operations.
*
diff --git a/cpukit/include/rtems/score/basedefs.h b/cpukit/include/rtems/score/basedefs.h
index e4846816f4..770865bb80 100644
--- a/cpukit/include/rtems/score/basedefs.h
+++ b/cpukit/include/rtems/score/basedefs.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief Basic Definitions
*/
@@ -21,9 +21,9 @@
#define _RTEMS_BASEDEFS_H
/**
- * @defgroup ScoreBaseDefs Basic Definitions
+ * @defgroup RTEMSScoreBaseDefs Basic Definitions
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/**@{*/
diff --git a/cpukit/include/rtems/score/chain.h b/cpukit/include/rtems/score/chain.h
index e358262e6e..0c905d5016 100644
--- a/cpukit/include/rtems/score/chain.h
+++ b/cpukit/include/rtems/score/chain.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreChain
+ * @ingroup RTEMSScoreChain
*
* @brief Chain Handler API
*/
@@ -25,9 +25,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreChain Chain Handler
+ * @defgroup RTEMSScoreChain Chain Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* The Chain Handler is used to manage sets of entities. This handler
* provides two data structures. The Chain Node data structure is included
diff --git a/cpukit/include/rtems/score/chainimpl.h b/cpukit/include/rtems/score/chainimpl.h
index 1c32ecc530..0b9c193044 100644
--- a/cpukit/include/rtems/score/chainimpl.h
+++ b/cpukit/include/rtems/score/chainimpl.h
@@ -26,7 +26,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreChain
+ * @addtogroup RTEMSScoreChain
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/context.h b/cpukit/include/rtems/score/context.h
index 317575538a..1b23d9682a 100644
--- a/cpukit/include/rtems/score/context.h
+++ b/cpukit/include/rtems/score/context.h
@@ -19,9 +19,9 @@
#define _RTEMS_SCORE_CONTEXT_H
/**
- * @defgroup ScoreContext Context Handler
+ * @defgroup RTEMSScoreContext Context Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which abstracts thread context
* management in a portable manner.
diff --git a/cpukit/include/rtems/score/copyrt.h b/cpukit/include/rtems/score/copyrt.h
index 8647bd9d0d..02f95010ae 100644
--- a/cpukit/include/rtems/score/copyrt.h
+++ b/cpukit/include/rtems/score/copyrt.h
@@ -22,7 +22,7 @@
/**
* @defgroup SuperCoreCopyright RTEMS Copyright Notice
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/**@{*/
diff --git a/cpukit/include/rtems/score/corebarrier.h b/cpukit/include/rtems/score/corebarrier.h
index 785c7729a3..73872cbfa8 100644
--- a/cpukit/include/rtems/score/corebarrier.h
+++ b/cpukit/include/rtems/score/corebarrier.h
@@ -26,9 +26,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreBarrier Barrier Handler
+ * @defgroup RTEMSScoreBarrier Barrier Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which provides the foundation
* Barrier services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/corebarrierimpl.h b/cpukit/include/rtems/score/corebarrierimpl.h
index d5d63659d0..48061e6fe8 100644
--- a/cpukit/include/rtems/score/corebarrierimpl.h
+++ b/cpukit/include/rtems/score/corebarrierimpl.h
@@ -28,7 +28,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreBarrier
+ * @addtogroup RTEMSScoreBarrier
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/coremsg.h b/cpukit/include/rtems/score/coremsg.h
index 90bf9d8a9e..e2dd14bd24 100644
--- a/cpukit/include/rtems/score/coremsg.h
+++ b/cpukit/include/rtems/score/coremsg.h
@@ -29,9 +29,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreMessageQueue Message Queue Handler
+ * @defgroup RTEMSScoreMessageQueue Message Queue Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which provides the foundation
* Message Queue services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/coremsgimpl.h b/cpukit/include/rtems/score/coremsgimpl.h
index e33e3308b2..bb90797e96 100644
--- a/cpukit/include/rtems/score/coremsgimpl.h
+++ b/cpukit/include/rtems/score/coremsgimpl.h
@@ -33,7 +33,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreMessageQueue
+ * @addtogroup RTEMSScoreMessageQueue
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/coremutex.h b/cpukit/include/rtems/score/coremutex.h
index fd1f27c697..447eafb913 100644
--- a/cpukit/include/rtems/score/coremutex.h
+++ b/cpukit/include/rtems/score/coremutex.h
@@ -34,9 +34,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreMutex Mutex Handler
+ * @defgroup RTEMSScoreMutex Mutex Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which provides the foundation
* Mutex services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/coremuteximpl.h b/cpukit/include/rtems/score/coremuteximpl.h
index 78fafca6e1..85cff5510f 100644
--- a/cpukit/include/rtems/score/coremuteximpl.h
+++ b/cpukit/include/rtems/score/coremuteximpl.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreMutex
+ * @ingroup RTEMSScoreMutex
*
* @brief CORE Mutex Implementation
*/
@@ -30,7 +30,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreMutex
+ * @addtogroup RTEMSScoreMutex
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/corerwlockimpl.h b/cpukit/include/rtems/score/corerwlockimpl.h
index 3c376c9793..508879d022 100644
--- a/cpukit/include/rtems/score/corerwlockimpl.h
+++ b/cpukit/include/rtems/score/corerwlockimpl.h
@@ -26,9 +26,9 @@
#include <rtems/score/watchdog.h>
/**
- * @defgroup ScoreRWLock ScoreRWLock
+ * @defgroup RTEMSScoreRWLock ScoreRWLock
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief ScoreRWLock
*/
diff --git a/cpukit/include/rtems/score/coresem.h b/cpukit/include/rtems/score/coresem.h
index 4df7b6c49a..b44daf56aa 100644
--- a/cpukit/include/rtems/score/coresem.h
+++ b/cpukit/include/rtems/score/coresem.h
@@ -28,9 +28,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreSemaphore Semaphore Handler
+ * @defgroup RTEMSScoreSemaphore Semaphore Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which provides the foundation
* Semaphore services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/coresemimpl.h b/cpukit/include/rtems/score/coresemimpl.h
index 00f77e61dd..661a213f85 100644
--- a/cpukit/include/rtems/score/coresemimpl.h
+++ b/cpukit/include/rtems/score/coresemimpl.h
@@ -32,7 +32,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreSemaphore
+ * @addtogroup RTEMSScoreSemaphore
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/freechain.h b/cpukit/include/rtems/score/freechain.h
index 6282178347..6b1a15476c 100644
--- a/cpukit/include/rtems/score/freechain.h
+++ b/cpukit/include/rtems/score/freechain.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreFreechain
+ * @ingroup RTEMSScoreFreechain
*
* @brief Freechain Handler API
*/
@@ -24,9 +24,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreFreechain Freechain Handler
+ * @defgroup RTEMSScoreFreechain Freechain Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* The Freechain Handler is used to manage a chain of nodes, of which size can
* automatically increase when there is no free node left. This handler
diff --git a/cpukit/include/rtems/score/heap.h b/cpukit/include/rtems/score/heap.h
index a9d75e7a86..c7c80a07d5 100644
--- a/cpukit/include/rtems/score/heap.h
+++ b/cpukit/include/rtems/score/heap.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler API
*/
@@ -30,9 +30,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreHeap Heap Handler
+ * @defgroup RTEMSScoreHeap Heap Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief The Heap Handler provides a heap.
*
diff --git a/cpukit/include/rtems/score/heapimpl.h b/cpukit/include/rtems/score/heapimpl.h
index a8948edd6f..12da2defea 100644
--- a/cpukit/include/rtems/score/heapimpl.h
+++ b/cpukit/include/rtems/score/heapimpl.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler Implementation
*/
@@ -25,7 +25,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreHeap
+ * @addtogroup RTEMSScoreHeap
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/heapinfo.h b/cpukit/include/rtems/score/heapinfo.h
index 1f84387304..078cc69364 100644
--- a/cpukit/include/rtems/score/heapinfo.h
+++ b/cpukit/include/rtems/score/heapinfo.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler Information API
*/
@@ -25,7 +25,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreHeap
+ * @addtogroup RTEMSScoreHeap
*
* @{
*/
diff --git a/cpukit/include/rtems/score/interr.h b/cpukit/include/rtems/score/interr.h
index 16f3907b05..109b2a519b 100644
--- a/cpukit/include/rtems/score/interr.h
+++ b/cpukit/include/rtems/score/interr.h
@@ -22,9 +22,9 @@
#include <rtems/score/cpu.h>
/**
- * @defgroup ScoreIntErr Internal Error Handler
+ * @defgroup RTEMSScoreIntErr Internal Error Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which provides the foundation
* Semaphore services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/isr.h b/cpukit/include/rtems/score/isr.h
index 0d6f2a21ee..d29fc7f147 100644
--- a/cpukit/include/rtems/score/isr.h
+++ b/cpukit/include/rtems/score/isr.h
@@ -24,9 +24,9 @@
#include <rtems/score/isrlevel.h>
/**
- * @defgroup ScoreISR ISR Handler
+ * @defgroup RTEMSScoreISR ISR Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which provides the foundation
* ISR services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/isrlevel.h b/cpukit/include/rtems/score/isrlevel.h
index aadce022e6..9340706f22 100644
--- a/cpukit/include/rtems/score/isrlevel.h
+++ b/cpukit/include/rtems/score/isrlevel.h
@@ -27,7 +27,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreISR ISR Handler
+ * @addtogroup RTEMSScoreISR ISR Handler
*/
/** @{ */
diff --git a/cpukit/include/rtems/score/isrlock.h b/cpukit/include/rtems/score/isrlock.h
index 8e13e27eff..b1aea62bf0 100644
--- a/cpukit/include/rtems/score/isrlock.h
+++ b/cpukit/include/rtems/score/isrlock.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreISRLocks
+ * @ingroup RTEMSScoreISRLocks
*
* @brief ISR Locks
*/
@@ -31,9 +31,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreISRLocks ISR Locks
+ * @defgroup RTEMSScoreISRLocks ISR Locks
*
- * @ingroup ScoreISR
+ * @ingroup RTEMSScoreISR
*
* @brief Low-level lock to protect critical sections accessed by threads and
* interrupt service routines.
diff --git a/cpukit/include/rtems/score/mpci.h b/cpukit/include/rtems/score/mpci.h
index c20b45c3e1..2c04b288f9 100644
--- a/cpukit/include/rtems/score/mpci.h
+++ b/cpukit/include/rtems/score/mpci.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreMPCI
+ * @ingroup RTEMSScoreMPCI
*
* @brief MPCI Layer API
*/
@@ -28,9 +28,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreMPCI MPCI Handler
+ * @defgroup RTEMSScoreMPCI MPCI Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* The MPCI Handler encapsulates functionality which is related to the
* generation, receipt, and processing of remote operations in a
diff --git a/cpukit/include/rtems/score/mpciimpl.h b/cpukit/include/rtems/score/mpciimpl.h
index eb03a1d7b3..4565e81eac 100644
--- a/cpukit/include/rtems/score/mpciimpl.h
+++ b/cpukit/include/rtems/score/mpciimpl.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreMPCI
+ * @ingroup RTEMSScoreMPCI
*
* @brief MPCI Layer Implementation
*/
@@ -26,7 +26,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreMPCI
+ * @addtogroup RTEMSScoreMPCI
*
* @{
*/
diff --git a/cpukit/include/rtems/score/mppkt.h b/cpukit/include/rtems/score/mppkt.h
index 74d7e3d55b..12bda1b8ca 100644
--- a/cpukit/include/rtems/score/mppkt.h
+++ b/cpukit/include/rtems/score/mppkt.h
@@ -31,9 +31,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreMPPacket MP Packet Handler
+ * @defgroup RTEMSScoreMPPacket MP Packet Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates the primary definition of MPCI packets. This
* handler defines the part of the packet that is common to all remote
diff --git a/cpukit/include/rtems/score/mrsp.h b/cpukit/include/rtems/score/mrsp.h
index 85cbff784f..4d67b272dd 100644
--- a/cpukit/include/rtems/score/mrsp.h
+++ b/cpukit/include/rtems/score/mrsp.h
@@ -26,9 +26,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreMRSP Multiprocessor Resource Sharing Protocol Handler
+ * @defgroup RTEMSScoreMRSP Multiprocessor Resource Sharing Protocol Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief Multiprocessor Resource Sharing Protocol (MrsP).
*
diff --git a/cpukit/include/rtems/score/mrspimpl.h b/cpukit/include/rtems/score/mrspimpl.h
index b9c7441401..da3cee3e16 100644
--- a/cpukit/include/rtems/score/mrspimpl.h
+++ b/cpukit/include/rtems/score/mrspimpl.h
@@ -30,7 +30,7 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @addtogroup ScoreMRSP
+ * @addtogroup RTEMSScoreMRSP
*
* @{
*/
diff --git a/cpukit/include/rtems/score/object.h b/cpukit/include/rtems/score/object.h
index eb21382c16..3f3e1b84dd 100644
--- a/cpukit/include/rtems/score/object.h
+++ b/cpukit/include/rtems/score/object.h
@@ -28,7 +28,7 @@ extern "C" {
#endif
/**
- * @defgroup Score SuperCore
+ * @defgroup RTEMSScore SuperCore
*
* @ingroup RTEMSInternal
*
@@ -39,16 +39,16 @@ extern "C" {
/**
* @defgroup RTEMSScoreCPU CPU Architecture Support
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief Provides CPU architecture dependent services.
*/
/**@{*/
/**
- * @defgroup ScoreObject Object Handler
+ * @defgroup RTEMSScoreObject Object Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/**@{*/
diff --git a/cpukit/include/rtems/score/objectdata.h b/cpukit/include/rtems/score/objectdata.h
index 528089892d..f6ece16c0e 100644
--- a/cpukit/include/rtems/score/objectdata.h
+++ b/cpukit/include/rtems/score/objectdata.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*
* @brief Object Handler Data Structures
*/
@@ -27,7 +27,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreObject
+ * @addtogroup RTEMSScoreObject
*
* @{
*/
diff --git a/cpukit/include/rtems/score/objectimpl.h b/cpukit/include/rtems/score/objectimpl.h
index c5a315e57f..9c8b9ce626 100644
--- a/cpukit/include/rtems/score/objectimpl.h
+++ b/cpukit/include/rtems/score/objectimpl.h
@@ -29,7 +29,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreObject
+ * @addtogroup RTEMSScoreObject
*
* @{
*/
diff --git a/cpukit/include/rtems/score/objectmp.h b/cpukit/include/rtems/score/objectmp.h
index d52b83fdff..c32d88545b 100644
--- a/cpukit/include/rtems/score/objectmp.h
+++ b/cpukit/include/rtems/score/objectmp.h
@@ -30,9 +30,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreObjectMP Object Handler Multiprocessing Support
+ * @defgroup RTEMSScoreObjectMP Object Handler Multiprocessing Support
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which is used to manage
* objects which have been declared to be globally visible. This handler
diff --git a/cpukit/include/rtems/score/onceimpl.h b/cpukit/include/rtems/score/onceimpl.h
index f3afe1cd13..eee318982f 100644
--- a/cpukit/include/rtems/score/onceimpl.h
+++ b/cpukit/include/rtems/score/onceimpl.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreOnce
+ * @ingroup RTEMSScoreOnce
*
* @brief Once API
*/
@@ -30,9 +30,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreOnce Once Functions.
+ * @defgroup RTEMSScoreOnce Once Functions.
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief The _Once() function for pthread_once() and rtems_gxx_once().
*
diff --git a/cpukit/include/rtems/score/percpu.h b/cpukit/include/rtems/score/percpu.h
index b9f23ac394..26ae8c68d0 100644
--- a/cpukit/include/rtems/score/percpu.h
+++ b/cpukit/include/rtems/score/percpu.h
@@ -78,7 +78,7 @@ struct Scheduler_Context;
/**
* @defgroup PerCPU RTEMS Per CPU Information
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This defines the per CPU state information required by RTEMS
* and the BSP. In an SMP configuration, there will be multiple
diff --git a/cpukit/include/rtems/score/priority.h b/cpukit/include/rtems/score/priority.h
index 7a8ddba763..a5df551209 100644
--- a/cpukit/include/rtems/score/priority.h
+++ b/cpukit/include/rtems/score/priority.h
@@ -29,9 +29,9 @@ extern "C" {
#endif
/**
- * @defgroup ScorePriority Priority Handler
+ * @defgroup RTEMSScorePriority Priority Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which is used to manage thread
* priorities. The actual priority of a thread is an aggregation of priority
diff --git a/cpukit/include/rtems/score/prioritybitmap.h b/cpukit/include/rtems/score/prioritybitmap.h
index ac769c1ea4..b6b566dfa9 100644
--- a/cpukit/include/rtems/score/prioritybitmap.h
+++ b/cpukit/include/rtems/score/prioritybitmap.h
@@ -26,9 +26,9 @@ extern "C" {
#endif
/**
- * @defgroup ScorePriorityBitmap Bitmap Priority Thread Routines
+ * @defgroup RTEMSScorePriorityBitmap Bitmap Priority Thread Routines
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/**@{*/
diff --git a/cpukit/include/rtems/score/prioritybitmapimpl.h b/cpukit/include/rtems/score/prioritybitmapimpl.h
index 82c92eb5d6..58e168dbb0 100644
--- a/cpukit/include/rtems/score/prioritybitmapimpl.h
+++ b/cpukit/include/rtems/score/prioritybitmapimpl.h
@@ -28,7 +28,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScorePriority
+ * @addtogroup RTEMSScorePriority
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/processormask.h b/cpukit/include/rtems/score/processormask.h
index a06aa2a56b..ce87e9926b 100644
--- a/cpukit/include/rtems/score/processormask.h
+++ b/cpukit/include/rtems/score/processormask.h
@@ -3,7 +3,7 @@
*
* @brief Processor Mask API
*
- * @ingroup ScoreProcessorMask
+ * @ingroup RTEMSScoreProcessorMask
*/
/*
@@ -34,9 +34,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreProcessorMask Processor Mask
+ * @defgroup RTEMSScoreProcessorMask Processor Mask
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* The processor mask provides a bit map large enough to provide one bit for
* each processor in the system. It is a fixed size internal data type
diff --git a/cpukit/include/rtems/score/profiling.h b/cpukit/include/rtems/score/profiling.h
index 5f9f2c2a50..83aa3345a5 100644
--- a/cpukit/include/rtems/score/profiling.h
+++ b/cpukit/include/rtems/score/profiling.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProfiling
+ * @ingroup RTEMSScoreProfiling
*
* @brief Profiling Support API
*/
@@ -31,9 +31,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreProfiling Profiling Support
+ * @defgroup RTEMSScoreProfiling Profiling Support
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief Profiling support.
*
diff --git a/cpukit/include/rtems/score/protectedheap.h b/cpukit/include/rtems/score/protectedheap.h
index a08fa36cf3..aa5d48b5fa 100644
--- a/cpukit/include/rtems/score/protectedheap.h
+++ b/cpukit/include/rtems/score/protectedheap.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler API
*/
@@ -26,9 +26,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreProtHeap Protected Heap Handler
+ * @defgroup RTEMSScoreProtHeap Protected Heap Handler
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Provides protected heap services.
*
diff --git a/cpukit/include/rtems/score/rbtree.h b/cpukit/include/rtems/score/rbtree.h
index c01a893b6e..b63c5cb4c2 100644
--- a/cpukit/include/rtems/score/rbtree.h
+++ b/cpukit/include/rtems/score/rbtree.h
@@ -27,9 +27,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreRBTree Red-Black Tree Handler
+ * @defgroup RTEMSScoreRBTree Red-Black Tree Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* The Red-Black Tree Handler is used to manage sets of entities. This handler
* provides two data structures. The rbtree Node data structure is included
diff --git a/cpukit/include/rtems/score/rbtreeimpl.h b/cpukit/include/rtems/score/rbtreeimpl.h
index bf92e29228..a6d1a059da 100644
--- a/cpukit/include/rtems/score/rbtreeimpl.h
+++ b/cpukit/include/rtems/score/rbtreeimpl.h
@@ -29,7 +29,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreRBTree
+ * @addtogroup RTEMSScoreRBTree
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/scheduler.h b/cpukit/include/rtems/score/scheduler.h
index c36353cf6b..6e87dbc5e3 100644
--- a/cpukit/include/rtems/score/scheduler.h
+++ b/cpukit/include/rtems/score/scheduler.h
@@ -28,9 +28,9 @@ extern "C" {
struct Per_CPU_Control;
/**
- * @defgroup ScoreScheduler Scheduler Handler
+ * @defgroup RTEMSScoreScheduler Scheduler Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality related to managing sets of threads
* that are ready for execution.
diff --git a/cpukit/include/rtems/score/schedulercbs.h b/cpukit/include/rtems/score/schedulercbs.h
index 2b5ffb94aa..757c6ae6d8 100644
--- a/cpukit/include/rtems/score/schedulercbs.h
+++ b/cpukit/include/rtems/score/schedulercbs.h
@@ -33,9 +33,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreSchedulerCBS CBS Scheduler
+ * @defgroup RTEMSScoreSchedulerCBS CBS Scheduler
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/**@{*/
diff --git a/cpukit/include/rtems/score/schedulercbsimpl.h b/cpukit/include/rtems/score/schedulercbsimpl.h
index ed75979f75..d4a9ae2ba2 100644
--- a/cpukit/include/rtems/score/schedulercbsimpl.h
+++ b/cpukit/include/rtems/score/schedulercbsimpl.h
@@ -3,7 +3,7 @@
*
* @brief CBS Scheduler Implementation
*
- * @ingroup ScoreSchedulerCBS
+ * @ingroup RTEMSScoreSchedulerCBS
*/
/*
@@ -31,7 +31,7 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @addtogroup ScoreSchedulerCBS
+ * @addtogroup RTEMSScoreSchedulerCBS
*
* @{
*/
diff --git a/cpukit/include/rtems/score/scheduleredf.h b/cpukit/include/rtems/score/scheduleredf.h
index c3849e825e..b38651cd80 100644
--- a/cpukit/include/rtems/score/scheduleredf.h
+++ b/cpukit/include/rtems/score/scheduleredf.h
@@ -31,9 +31,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreSchedulerEDF EDF Scheduler
+ * @defgroup RTEMSScoreSchedulerEDF EDF Scheduler
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/**@{*/
diff --git a/cpukit/include/rtems/score/scheduleredfimpl.h b/cpukit/include/rtems/score/scheduleredfimpl.h
index f6bd7d8384..fa0be25db8 100644
--- a/cpukit/include/rtems/score/scheduleredfimpl.h
+++ b/cpukit/include/rtems/score/scheduleredfimpl.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSchedulerEDF
+ * @ingroup RTEMSScoreSchedulerEDF
*
* @brief EDF Scheduler Implementation
*/
@@ -26,7 +26,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreSchedulerEDF
+ * @addtogroup RTEMSScoreSchedulerEDF
*
* @{
*/
diff --git a/cpukit/include/rtems/score/scheduleredfsmp.h b/cpukit/include/rtems/score/scheduleredfsmp.h
index 72c906eefe..961fa97f5f 100644
--- a/cpukit/include/rtems/score/scheduleredfsmp.h
+++ b/cpukit/include/rtems/score/scheduleredfsmp.h
@@ -3,7 +3,7 @@
*
* @brief EDF SMP Scheduler API
*
- * @ingroup ScoreSchedulerSMPEDF
+ * @ingroup RTEMSScoreSchedulerSMPEDF
*/
/*
@@ -26,9 +26,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreSchedulerSMPEDF EDF Priority SMP Scheduler
+ * @defgroup RTEMSScoreSchedulerSMPEDF EDF Priority SMP Scheduler
*
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
*
* @{
*/
diff --git a/cpukit/include/rtems/score/schedulerimpl.h b/cpukit/include/rtems/score/schedulerimpl.h
index fda043ea5a..6ad6157926 100644
--- a/cpukit/include/rtems/score/schedulerimpl.h
+++ b/cpukit/include/rtems/score/schedulerimpl.h
@@ -32,7 +32,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreScheduler
+ * @addtogroup RTEMSScoreScheduler
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/schedulerpriority.h b/cpukit/include/rtems/score/schedulerpriority.h
index ad146076e5..c0cf47561a 100644
--- a/cpukit/include/rtems/score/schedulerpriority.h
+++ b/cpukit/include/rtems/score/schedulerpriority.h
@@ -28,9 +28,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreSchedulerDPS Deterministic Priority Scheduler
+ * @defgroup RTEMSScoreSchedulerDPS Deterministic Priority Scheduler
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/**@{*/
diff --git a/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h b/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h
index e8ee528c90..2dea33ed56 100644
--- a/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h
+++ b/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSchedulerPriorityAffinitySMP
+ * @ingroup RTEMSScoreSchedulerPriorityAffinitySMP
*
* @brief Deterministic Priority Affinity SMP Scheduler API
*/
@@ -30,9 +30,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreSchedulerPriorityAffinitySMP Deterministic Priority Affinity SMP Scheduler
+ * @defgroup RTEMSScoreSchedulerPriorityAffinitySMP Deterministic Priority Affinity SMP Scheduler
*
- * @ingroup ScoreSchedulerPrioritySMP
+ * @ingroup RTEMSScoreSchedulerPrioritySMP
*
* This is an extension of the Deterministic Priority SMP Scheduler. which
* is an implementation of the global fixed priority scheduler (G-FP).
diff --git a/cpukit/include/rtems/score/schedulerpriorityimpl.h b/cpukit/include/rtems/score/schedulerpriorityimpl.h
index 354065fac4..bf1d411502 100644
--- a/cpukit/include/rtems/score/schedulerpriorityimpl.h
+++ b/cpukit/include/rtems/score/schedulerpriorityimpl.h
@@ -31,7 +31,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreSchedulerDPS
+ * @addtogroup RTEMSScoreSchedulerDPS
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/schedulerprioritysmp.h b/cpukit/include/rtems/score/schedulerprioritysmp.h
index 7d579f1846..ced6ce6651 100644
--- a/cpukit/include/rtems/score/schedulerprioritysmp.h
+++ b/cpukit/include/rtems/score/schedulerprioritysmp.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSchedulerPrioritySMP
+ * @ingroup RTEMSScoreSchedulerPrioritySMP
*
* @brief Deterministic Priority SMP Scheduler API
*/
@@ -32,9 +32,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreSchedulerPrioritySMP Deterministic Priority SMP Scheduler
+ * @defgroup RTEMSScoreSchedulerPrioritySMP Deterministic Priority SMP Scheduler
*
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
*
* This is an implementation of the global fixed priority scheduler (G-FP). It
* uses one ready chain per priority to ensure constant time insert operations.
diff --git a/cpukit/include/rtems/score/schedulerprioritysmpimpl.h b/cpukit/include/rtems/score/schedulerprioritysmpimpl.h
index 17d6e552f3..28f59396ff 100644
--- a/cpukit/include/rtems/score/schedulerprioritysmpimpl.h
+++ b/cpukit/include/rtems/score/schedulerprioritysmpimpl.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSchedulerPrioritySMP
+ * @ingroup RTEMSScoreSchedulerPrioritySMP
*
* @brief Deterministic Priority SMP Scheduler API
*/
@@ -33,7 +33,7 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @ingroup ScoreSchedulerPrioritySMP
+ * @ingroup RTEMSScoreSchedulerPrioritySMP
* @{
*/
diff --git a/cpukit/include/rtems/score/schedulersimple.h b/cpukit/include/rtems/score/schedulersimple.h
index 280105568f..3f67e138af 100644
--- a/cpukit/include/rtems/score/schedulersimple.h
+++ b/cpukit/include/rtems/score/schedulersimple.h
@@ -26,9 +26,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreSchedulerSimple Simple Priority Scheduler
+ * @defgroup RTEMSScoreSchedulerSimple Simple Priority Scheduler
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/**@{*/
diff --git a/cpukit/include/rtems/score/schedulersimpleimpl.h b/cpukit/include/rtems/score/schedulersimpleimpl.h
index 3891839281..8667e039bd 100644
--- a/cpukit/include/rtems/score/schedulersimpleimpl.h
+++ b/cpukit/include/rtems/score/schedulersimpleimpl.h
@@ -28,7 +28,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreSchedulerSimple
+ * @addtogroup RTEMSScoreSchedulerSimple
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/schedulersimplesmp.h b/cpukit/include/rtems/score/schedulersimplesmp.h
index d9b4c1d46c..647d4af9d3 100644
--- a/cpukit/include/rtems/score/schedulersimplesmp.h
+++ b/cpukit/include/rtems/score/schedulersimplesmp.h
@@ -3,7 +3,7 @@
*
* @brief Simple SMP Scheduler API
*
- * @ingroup ScoreSchedulerSMPSimple
+ * @ingroup RTEMSScoreSchedulerSMPSimple
*/
/*
@@ -28,9 +28,9 @@ extern "C" {
#include <rtems/score/schedulersmp.h>
/**
- * @defgroup ScoreSchedulerSMPSimple Simple Priority SMP Scheduler
+ * @defgroup RTEMSScoreSchedulerSMPSimple Simple Priority SMP Scheduler
*
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
*
* The Simple Priority SMP Scheduler allocates a processor for the processor
* count highest priority ready threads. The thread priority and position in
diff --git a/cpukit/include/rtems/score/schedulersmp.h b/cpukit/include/rtems/score/schedulersmp.h
index 0bd899a6a6..afc504bb83 100644
--- a/cpukit/include/rtems/score/schedulersmp.h
+++ b/cpukit/include/rtems/score/schedulersmp.h
@@ -3,7 +3,7 @@
*
* @brief SMP Scheduler API
*
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
*/
/*
@@ -31,9 +31,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreSchedulerSMP SMP Scheduler
+ * @defgroup RTEMSScoreSchedulerSMP SMP Scheduler
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*
* @{
*/
diff --git a/cpukit/include/rtems/score/schedulersmpimpl.h b/cpukit/include/rtems/score/schedulersmpimpl.h
index 0abe82b1f0..0f4805d7f5 100644
--- a/cpukit/include/rtems/score/schedulersmpimpl.h
+++ b/cpukit/include/rtems/score/schedulersmpimpl.h
@@ -3,7 +3,7 @@
*
* @brief SMP Scheduler Implementation
*
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
*/
/*
@@ -34,7 +34,7 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @addtogroup ScoreSchedulerSMP
+ * @addtogroup RTEMSScoreSchedulerSMP
*
* The scheduler nodes can be in four states
* - @ref SCHEDULER_SMP_NODE_BLOCKED,
diff --git a/cpukit/include/rtems/score/schedulerstrongapa.h b/cpukit/include/rtems/score/schedulerstrongapa.h
index bc113197e7..902c53c095 100644
--- a/cpukit/include/rtems/score/schedulerstrongapa.h
+++ b/cpukit/include/rtems/score/schedulerstrongapa.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSchedulerStrongAPA
+ * @ingroup RTEMSScoreSchedulerStrongAPA
*
* @brief Strong APA Scheduler API
*/
@@ -32,9 +32,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreSchedulerStrongAPA Strong APA Scheduler
+ * @defgroup RTEMSScoreSchedulerStrongAPA Strong APA Scheduler
*
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
*
* This is an implementation of the global fixed priority scheduler (G-FP). It
* uses one ready chain per priority to ensure constant time insert operations.
diff --git a/cpukit/include/rtems/score/smp.h b/cpukit/include/rtems/score/smp.h
index 469025e5dc..cc682a4823 100644
--- a/cpukit/include/rtems/score/smp.h
+++ b/cpukit/include/rtems/score/smp.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSMP
+ * @ingroup RTEMSScoreSMP
*
* @brief SuperCore SMP Support API
*/
@@ -25,9 +25,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreSMP SMP Support
+ * @defgroup RTEMSScoreSMP SMP Support
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This defines the interface of the SuperCore SMP support.
*
diff --git a/cpukit/include/rtems/score/smpbarrier.h b/cpukit/include/rtems/score/smpbarrier.h
index fddf7bb1cd..a8bdc91c31 100644
--- a/cpukit/include/rtems/score/smpbarrier.h
+++ b/cpukit/include/rtems/score/smpbarrier.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSMPBarrier
+ * @ingroup RTEMSScoreSMPBarrier
*
* @brief SMP Barrier API
*/
@@ -31,9 +31,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreSMPBarrier SMP Barriers
+ * @defgroup RTEMSScoreSMPBarrier SMP Barriers
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief The SMP barrier provides barrier synchronization for SMP systems at
* the lowest level.
diff --git a/cpukit/include/rtems/score/smpimpl.h b/cpukit/include/rtems/score/smpimpl.h
index 0e6168362c..117b78cb74 100644
--- a/cpukit/include/rtems/score/smpimpl.h
+++ b/cpukit/include/rtems/score/smpimpl.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSMPImpl
+ * @ingroup RTEMSScoreSMPImpl
*
* @brief SuperCore SMP Implementation
*/
@@ -29,7 +29,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreSMP
+ * @addtogroup RTEMSScoreSMP
*
* This defines the interface of the SuperCore SMP support.
*
diff --git a/cpukit/include/rtems/score/smplock.h b/cpukit/include/rtems/score/smplock.h
index 096f8ba0c4..1c37db465b 100644
--- a/cpukit/include/rtems/score/smplock.h
+++ b/cpukit/include/rtems/score/smplock.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSMPLock
+ * @ingroup RTEMSScoreSMPLock
*
* @brief SMP Lock API
*/
@@ -23,9 +23,9 @@
#include <rtems/score/cpuopts.h>
/**
- * @defgroup ScoreSMPLock SMP Locks
+ * @defgroup RTEMSScoreSMPLock SMP Locks
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief The SMP lock provides mutual exclusion for SMP systems at the lowest
* level.
diff --git a/cpukit/include/rtems/score/smplockmcs.h b/cpukit/include/rtems/score/smplockmcs.h
index 5a1ad23dc9..977f807fe8 100644
--- a/cpukit/include/rtems/score/smplockmcs.h
+++ b/cpukit/include/rtems/score/smplockmcs.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSMPLock
+ * @ingroup RTEMSScoreSMPLock
*
* @brief SMP Lock API
*/
@@ -29,7 +29,7 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @addtogroup ScoreSMPLock
+ * @addtogroup RTEMSScoreSMPLock
*
* @{
*/
diff --git a/cpukit/include/rtems/score/smplockseq.h b/cpukit/include/rtems/score/smplockseq.h
index 5daaee9c6e..f65595a10b 100644
--- a/cpukit/include/rtems/score/smplockseq.h
+++ b/cpukit/include/rtems/score/smplockseq.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSMPLock
+ * @ingroup RTEMSScoreSMPLock
*
* @brief SMP Lock API
*/
@@ -29,7 +29,7 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @addtogroup ScoreSMPLock
+ * @addtogroup RTEMSScoreSMPLock
*
* @{
*/
diff --git a/cpukit/include/rtems/score/smplockstats.h b/cpukit/include/rtems/score/smplockstats.h
index c434b15cb2..951f4f42fa 100644
--- a/cpukit/include/rtems/score/smplockstats.h
+++ b/cpukit/include/rtems/score/smplockstats.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSMPLock
+ * @ingroup RTEMSScoreSMPLock
*
* @brief SMP Lock API
*/
@@ -28,7 +28,7 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @addtogroup ScoreSMPLock
+ * @addtogroup RTEMSScoreSMPLock
*
* @{
*/
diff --git a/cpukit/include/rtems/score/smplockticket.h b/cpukit/include/rtems/score/smplockticket.h
index e04c4056a5..e8d0fb7ef9 100644
--- a/cpukit/include/rtems/score/smplockticket.h
+++ b/cpukit/include/rtems/score/smplockticket.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSMPLock
+ * @ingroup RTEMSScoreSMPLock
*
* @brief SMP Lock API
*/
@@ -29,7 +29,7 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @addtogroup ScoreSMPLock
+ * @addtogroup RTEMSScoreSMPLock
*
* @{
*/
diff --git a/cpukit/include/rtems/score/stack.h b/cpukit/include/rtems/score/stack.h
index 62be3ea5ef..3f80a1e12c 100644
--- a/cpukit/include/rtems/score/stack.h
+++ b/cpukit/include/rtems/score/stack.h
@@ -27,9 +27,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreStack Stack Handler
+ * @defgroup RTEMSScoreStack Stack Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which is used in the management
* of thread stacks.
diff --git a/cpukit/include/rtems/score/stackimpl.h b/cpukit/include/rtems/score/stackimpl.h
index 4c622345ff..a7cea81e52 100644
--- a/cpukit/include/rtems/score/stackimpl.h
+++ b/cpukit/include/rtems/score/stackimpl.h
@@ -26,7 +26,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreStack
+ * @addtogroup RTEMSScoreStack
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/states.h b/cpukit/include/rtems/score/states.h
index 68aa1d699f..76fa270073 100644
--- a/cpukit/include/rtems/score/states.h
+++ b/cpukit/include/rtems/score/states.h
@@ -25,9 +25,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreStates SuperCore Thread States
+ * @defgroup RTEMSScoreStates SuperCore Thread States
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which relates to the management of
* the state bitmap associated with each thread.
diff --git a/cpukit/include/rtems/score/statesimpl.h b/cpukit/include/rtems/score/statesimpl.h
index db462fbb9a..292cae874a 100644
--- a/cpukit/include/rtems/score/statesimpl.h
+++ b/cpukit/include/rtems/score/statesimpl.h
@@ -27,7 +27,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreStates
+ * @addtogroup RTEMSScoreStates
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/sysstate.h b/cpukit/include/rtems/score/sysstate.h
index 0e01927d9a..15820a0d3e 100644
--- a/cpukit/include/rtems/score/sysstate.h
+++ b/cpukit/include/rtems/score/sysstate.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSysState
+ * @ingroup RTEMSScoreSysState
*
* @brief System State Handler API
*/
@@ -25,9 +25,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreSysState System State Handler
+ * @defgroup RTEMSScoreSysState System State Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief Management of the internal system state of RTEMS.
*/
diff --git a/cpukit/include/rtems/score/thread.h b/cpukit/include/rtems/score/thread.h
index 061d7cb14f..79853b8d79 100644
--- a/cpukit/include/rtems/score/thread.h
+++ b/cpukit/include/rtems/score/thread.h
@@ -54,9 +54,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreThread Thread Handler
+ * @defgroup RTEMSScoreThread Thread Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality related to the management of
* threads. This includes the creation, deletion, and scheduling of threads.
diff --git a/cpukit/include/rtems/score/threaddispatch.h b/cpukit/include/rtems/score/threaddispatch.h
index f5d5c48035..89c737c057 100644
--- a/cpukit/include/rtems/score/threaddispatch.h
+++ b/cpukit/include/rtems/score/threaddispatch.h
@@ -23,7 +23,7 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @addtogroup ScoreThread
+ * @addtogroup RTEMSScoreThread
*
* @{
*/
diff --git a/cpukit/include/rtems/score/threadimpl.h b/cpukit/include/rtems/score/threadimpl.h
index d3e69ed91c..2232d57dd0 100644
--- a/cpukit/include/rtems/score/threadimpl.h
+++ b/cpukit/include/rtems/score/threadimpl.h
@@ -42,7 +42,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreThread
+ * @addtogroup RTEMSScoreThread
*/
/**@{**/
diff --git a/cpukit/include/rtems/score/threadmp.h b/cpukit/include/rtems/score/threadmp.h
index bcc71f7b88..257f9beeec 100644
--- a/cpukit/include/rtems/score/threadmp.h
+++ b/cpukit/include/rtems/score/threadmp.h
@@ -30,9 +30,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreThreadMP Thread Handler Multiprocessing Support
+ * @defgroup RTEMSScoreThreadMP Thread Handler Multiprocessing Support
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality which is related to managing
* threads in a multiprocessor system configuration. This handler must
diff --git a/cpukit/include/rtems/score/threadq.h b/cpukit/include/rtems/score/threadq.h
index c0a11770fb..a63cc62151 100644
--- a/cpukit/include/rtems/score/threadq.h
+++ b/cpukit/include/rtems/score/threadq.h
@@ -36,9 +36,9 @@ struct Per_CPU_Control;
struct Scheduler_Node;
/**
- * @defgroup ScoreThreadQueue Thread Queue Handler
+ * @defgroup RTEMSScoreThreadQueue Thread Queue Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler provides the capability to have threads block in
* ordered sets. The sets may be ordered using the FIFO or priority
diff --git a/cpukit/include/rtems/score/threadqimpl.h b/cpukit/include/rtems/score/threadqimpl.h
index 789184c0dd..21d0a46517 100644
--- a/cpukit/include/rtems/score/threadqimpl.h
+++ b/cpukit/include/rtems/score/threadqimpl.h
@@ -37,7 +37,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreThreadQueue
+ * @addtogroup RTEMSScoreThreadQueue
*/
/**@{*/
diff --git a/cpukit/include/rtems/score/timecounter.h b/cpukit/include/rtems/score/timecounter.h
index 9d688eebe8..a719ab0fa8 100644
--- a/cpukit/include/rtems/score/timecounter.h
+++ b/cpukit/include/rtems/score/timecounter.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreTimecounter
+ * @ingroup RTEMSScoreTimecounter
*
* @brief Timecounter API
*/
@@ -34,9 +34,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreTimecounter Timecounter Handler
+ * @defgroup RTEMSScoreTimecounter Timecounter Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @{
*/
diff --git a/cpukit/include/rtems/score/timecounterimpl.h b/cpukit/include/rtems/score/timecounterimpl.h
index a48ac70683..ac09d9b1a6 100644
--- a/cpukit/include/rtems/score/timecounterimpl.h
+++ b/cpukit/include/rtems/score/timecounterimpl.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreTimecounter
+ * @ingroup RTEMSScoreTimecounter
*
* @brief Timecounter Implementation
*/
@@ -31,7 +31,7 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @addtogroup ScoreTimecounter
+ * @addtogroup RTEMSScoreTimecounter
*
* @{
*/
diff --git a/cpukit/include/rtems/score/timespec.h b/cpukit/include/rtems/score/timespec.h
index a453aadf5e..cefe508285 100644
--- a/cpukit/include/rtems/score/timespec.h
+++ b/cpukit/include/rtems/score/timespec.h
@@ -19,7 +19,7 @@
/**
* @defgroup Timespec Helpers
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality related to manipulating
* POSIX struct timespecs.
diff --git a/cpukit/include/rtems/score/timestamp.h b/cpukit/include/rtems/score/timestamp.h
index 002584d3d8..2645c51a11 100644
--- a/cpukit/include/rtems/score/timestamp.h
+++ b/cpukit/include/rtems/score/timestamp.h
@@ -21,7 +21,7 @@
/**
* @defgroup SuperCoreTimeStamp Score Timestamp
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality related to manipulating
* SuperCore Timestamps. SuperCore Timestamps may be used to
diff --git a/cpukit/include/rtems/score/tls.h b/cpukit/include/rtems/score/tls.h
index 644e54e6f7..9ae0953935 100644
--- a/cpukit/include/rtems/score/tls.h
+++ b/cpukit/include/rtems/score/tls.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreTLS
+ * @ingroup RTEMSScoreTLS
*
* @brief Thread-Local Storage (TLS)
*/
@@ -32,9 +32,9 @@ extern "C" {
#endif /* __cplusplus */
/**
- * @defgroup ScoreTLS Thread-Local Storage (TLS)
+ * @defgroup RTEMSScoreTLS Thread-Local Storage (TLS)
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief Thread-local storage (TLS) support.
*
diff --git a/cpukit/include/rtems/score/todimpl.h b/cpukit/include/rtems/score/todimpl.h
index edc12e1fda..4173b91d89 100644
--- a/cpukit/include/rtems/score/todimpl.h
+++ b/cpukit/include/rtems/score/todimpl.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreTOD
+ * @ingroup RTEMSScoreTOD
*
* @brief Time of Day Handler API
*/
@@ -30,9 +30,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreTOD Time of Day Handler
+ * @defgroup RTEMSScoreTOD Time of Day Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* The following constants are related to the time of day and are
* independent of RTEMS.
@@ -118,7 +118,7 @@ extern "C" {
#define TOD_BASE_YEAR 1988
/**
- * @addtogroup ScoreTOD
+ * @addtogroup RTEMSScoreTOD
*
* This handler encapsulates functionality used to manage time of day.
*/
diff --git a/cpukit/include/rtems/score/userext.h b/cpukit/include/rtems/score/userext.h
index 216b795f86..aec795cd57 100644
--- a/cpukit/include/rtems/score/userext.h
+++ b/cpukit/include/rtems/score/userext.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
*
* @brief User Extension Handler API
*/
@@ -29,9 +29,9 @@ struct _Thread_Control;
typedef void User_extensions_routine RTEMS_DEPRECATED;
/**
- * @defgroup ScoreUserExt User Extension Handler
+ * @defgroup RTEMSScoreUserExt User Extension Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* @brief The User Extension Handler provides invocation of application
* dependent routines at critical points in the life of each thread and the
diff --git a/cpukit/include/rtems/score/userextdata.h b/cpukit/include/rtems/score/userextdata.h
index 100ae21647..7b7a2eb95f 100644
--- a/cpukit/include/rtems/score/userextdata.h
+++ b/cpukit/include/rtems/score/userextdata.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
*
* @brief User Extension Handler Data Structures
*/
@@ -26,7 +26,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreUserExt
+ * @addtogroup RTEMSScoreUserExt
*
* @{
*/
diff --git a/cpukit/include/rtems/score/userextimpl.h b/cpukit/include/rtems/score/userextimpl.h
index 6c5aae7640..b781773863 100644
--- a/cpukit/include/rtems/score/userextimpl.h
+++ b/cpukit/include/rtems/score/userextimpl.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
*
* @brief User Extension Handler API
*/
@@ -29,7 +29,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreUserExt
+ * @addtogroup RTEMSScoreUserExt
*/
/** @{ **/
diff --git a/cpukit/include/rtems/score/watchdog.h b/cpukit/include/rtems/score/watchdog.h
index 9db87adae8..5f7d6fa3f3 100644
--- a/cpukit/include/rtems/score/watchdog.h
+++ b/cpukit/include/rtems/score/watchdog.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreWatchdog
+ * @ingroup RTEMSScoreWatchdog
*
* @brief Constants and Structures Associated with Watchdog Timers
*
@@ -33,9 +33,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreWatchdog Watchdog Handler
+ * @defgroup RTEMSScoreWatchdog Watchdog Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality related to the scheduling of
* watchdog functions to be called at specific times in the future.
diff --git a/cpukit/include/rtems/score/watchdogimpl.h b/cpukit/include/rtems/score/watchdogimpl.h
index 5a024069ca..1e711f28b6 100644
--- a/cpukit/include/rtems/score/watchdogimpl.h
+++ b/cpukit/include/rtems/score/watchdogimpl.h
@@ -34,7 +34,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreWatchdog
+ * @addtogroup RTEMSScoreWatchdog
* @{
*/
diff --git a/cpukit/include/rtems/score/watchdogticks.h b/cpukit/include/rtems/score/watchdogticks.h
index 8a69a288fc..a51bf41952 100644
--- a/cpukit/include/rtems/score/watchdogticks.h
+++ b/cpukit/include/rtems/score/watchdogticks.h
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreWatchdog
+ * @ingroup RTEMSScoreWatchdog
*/
/*
@@ -23,7 +23,7 @@ extern "C" {
#endif
/**
- * @addtogroup ScoreWatchdog
+ * @addtogroup RTEMSScoreWatchdog
*
* @{
*/
diff --git a/cpukit/include/rtems/score/wkspace.h b/cpukit/include/rtems/score/wkspace.h
index 551a10d50d..e88ccb0548 100644
--- a/cpukit/include/rtems/score/wkspace.h
+++ b/cpukit/include/rtems/score/wkspace.h
@@ -28,9 +28,9 @@ extern "C" {
#endif
/**
- * @defgroup ScoreWorkspace Workspace Handler
+ * @defgroup RTEMSScoreWorkspace Workspace Handler
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
* This handler encapsulates functionality related to the management of
* the RTEMS Executive Workspace.
diff --git a/cpukit/include/rtems/seterr.h b/cpukit/include/rtems/seterr.h
index 99997745b6..27faca7694 100644
--- a/cpukit/include/rtems/seterr.h
+++ b/cpukit/include/rtems/seterr.h
@@ -20,9 +20,9 @@
#define _RTEMS_SETERR_H
/**
- * @defgroup ScoreSetErr Set Errno
+ * @defgroup RTEMSScoreSetErr Set Errno
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*
*/
/**@{*/
diff --git a/cpukit/include/rtems/system.h b/cpukit/include/rtems/system.h
index 723145ac9c..c72859195c 100644
--- a/cpukit/include/rtems/system.h
+++ b/cpukit/include/rtems/system.h
@@ -23,9 +23,9 @@
#include <rtems/score/cpu.h>
/**
- * @defgroup ScoreSystem System Information
+ * @defgroup RTEMSScoreSystem System Information
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/**@{*/
diff --git a/cpukit/sapi/src/rbtreefind.c b/cpukit/sapi/src/rbtreefind.c
index d3f67a6462..1e4d445fb2 100644
--- a/cpukit/sapi/src/rbtreefind.c
+++ b/cpukit/sapi/src/rbtreefind.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Find the control structure of the tree containing the given node
- * @ingroup Scorertems_rbtree
+ * @ingroup RTEMSScorertems_rbtree
*/
/*
diff --git a/cpukit/score/cpu/i386/include/rtems/score/cpu.h b/cpukit/score/cpu/i386/include/rtems/score/cpu.h
index 19562e7623..5d14455563 100644
--- a/cpukit/score/cpu/i386/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/cpu.h
@@ -34,7 +34,7 @@ extern "C" {
#include <rtems/score/i386.h>
/**
- * @defgroup ScoreCPUi386 i386 Specific Support
+ * @defgroup RTEMSScoreCPUi386 i386 Specific Support
*
* @ingroup RTEMSScoreCPUi386
*
diff --git a/cpukit/score/src/apimutexisowner.c b/cpukit/score/src/apimutexisowner.c
index 3c6f2a1b21..f67517dae5 100644
--- a/cpukit/score/src/apimutexisowner.c
+++ b/cpukit/score/src/apimutexisowner.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreAPIMutex
+ * @ingroup RTEMSScoreAPIMutex
*/
/*
diff --git a/cpukit/score/src/apimutexlock.c b/cpukit/score/src/apimutexlock.c
index 46a48a3e50..51454ef0d0 100644
--- a/cpukit/score/src/apimutexlock.c
+++ b/cpukit/score/src/apimutexlock.c
@@ -3,7 +3,7 @@
*
* @brief Acquires the specified API mutex.
*
- * @ingroup ScoreAPIMutex
+ * @ingroup RTEMSScoreAPIMutex
*/
/*
diff --git a/cpukit/score/src/apimutexunlock.c b/cpukit/score/src/apimutexunlock.c
index b4a5592059..2e7395c101 100644
--- a/cpukit/score/src/apimutexunlock.c
+++ b/cpukit/score/src/apimutexunlock.c
@@ -3,7 +3,7 @@
*
* @brief Releases the Specified API Mutex
*
- * @ingroup ScoreAPIMutex
+ * @ingroup RTEMSScoreAPIMutex
*/
/*
diff --git a/cpukit/score/src/chain.c b/cpukit/score/src/chain.c
index 7f7af71706..b7c04a001d 100644
--- a/cpukit/score/src/chain.c
+++ b/cpukit/score/src/chain.c
@@ -3,7 +3,7 @@
*
* @brief Initialize a Chain Header
*
- * @ingroup ScoreChain
+ * @ingroup RTEMSScoreChain
*/
/*
diff --git a/cpukit/score/src/corebarrier.c b/cpukit/score/src/corebarrier.c
index 98dfd0bb4e..15c6053194 100644
--- a/cpukit/score/src/corebarrier.c
+++ b/cpukit/score/src/corebarrier.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Initialize CORE Barrier
- * @ingroup ScoreBarrier
+ * @ingroup RTEMSScoreBarrier
*/
/*
diff --git a/cpukit/score/src/corebarrierrelease.c b/cpukit/score/src/corebarrierrelease.c
index 8a23856d53..3ef3dea46e 100644
--- a/cpukit/score/src/corebarrierrelease.c
+++ b/cpukit/score/src/corebarrierrelease.c
@@ -3,7 +3,7 @@
*
* @brief Manually releases the Barrier
*
- * @ingroup ScoreBarrier
+ * @ingroup RTEMSScoreBarrier
*/
/*
diff --git a/cpukit/score/src/corebarrierwait.c b/cpukit/score/src/corebarrierwait.c
index 08acce9d86..b410dc0267 100644
--- a/cpukit/score/src/corebarrierwait.c
+++ b/cpukit/score/src/corebarrierwait.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Wait For The Barrier
- * @ingroup ScoreBarrier
+ * @ingroup RTEMSScoreBarrier
*/
/*
diff --git a/cpukit/score/src/coremsg.c b/cpukit/score/src/coremsg.c
index 1dbadc25c7..840405446c 100644
--- a/cpukit/score/src/coremsg.c
+++ b/cpukit/score/src/coremsg.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Initialize a Message Queue
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
*/
/*
diff --git a/cpukit/score/src/coremsgbroadcast.c b/cpukit/score/src/coremsgbroadcast.c
index ed92dbc620..aeb1b37955 100644
--- a/cpukit/score/src/coremsgbroadcast.c
+++ b/cpukit/score/src/coremsgbroadcast.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Broadcast a Message to the Message Queue
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
*/
/*
diff --git a/cpukit/score/src/coremsgclose.c b/cpukit/score/src/coremsgclose.c
index f8a53a2fcd..616d73c933 100644
--- a/cpukit/score/src/coremsgclose.c
+++ b/cpukit/score/src/coremsgclose.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Close a Message Queue
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
*/
/*
diff --git a/cpukit/score/src/coremsgflush.c b/cpukit/score/src/coremsgflush.c
index e5b51f9306..c73d8a9708 100644
--- a/cpukit/score/src/coremsgflush.c
+++ b/cpukit/score/src/coremsgflush.c
@@ -3,7 +3,7 @@
*
* @brief Flush Messages Routine
*
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
*/
/*
diff --git a/cpukit/score/src/coremsgflushwait.c b/cpukit/score/src/coremsgflushwait.c
index a53f922cb4..f309f8ed59 100644
--- a/cpukit/score/src/coremsgflushwait.c
+++ b/cpukit/score/src/coremsgflushwait.c
@@ -3,7 +3,7 @@
*
* @brief Flush Waiting Threads.
*
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
*/
/*
diff --git a/cpukit/score/src/coremsginsert.c b/cpukit/score/src/coremsginsert.c
index a9aa1e584e..c254a0d869 100644
--- a/cpukit/score/src/coremsginsert.c
+++ b/cpukit/score/src/coremsginsert.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Insert a Message into the Message Queue
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
*/
/*
diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c
index 7e7cb8f131..0efc63a8e3 100644
--- a/cpukit/score/src/coremsgseize.c
+++ b/cpukit/score/src/coremsgseize.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Seize a Message from the Message Queue
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
*/
/*
diff --git a/cpukit/score/src/coremsgsubmit.c b/cpukit/score/src/coremsgsubmit.c
index 49c90256cd..86c35d29ef 100644
--- a/cpukit/score/src/coremsgsubmit.c
+++ b/cpukit/score/src/coremsgsubmit.c
@@ -3,7 +3,7 @@
*
* @brief CORE Message Queue Submit
*
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
*/
/*
diff --git a/cpukit/score/src/coremutexseize.c b/cpukit/score/src/coremutexseize.c
index e07458573d..1fd7a11a8b 100644
--- a/cpukit/score/src/coremutexseize.c
+++ b/cpukit/score/src/coremutexseize.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Seize Mutex with Blocking
- * @ingroup ScoreMutex
+ * @ingroup RTEMSScoreMutex
*/
/*
diff --git a/cpukit/score/src/corerwlock.c b/cpukit/score/src/corerwlock.c
index 9ebb796ac4..19739e14e1 100644
--- a/cpukit/score/src/corerwlock.c
+++ b/cpukit/score/src/corerwlock.c
@@ -2,7 +2,7 @@
* @file
*
* @brief
- * @ingroup ScoreRWLock
+ * @ingroup RTEMSScoreRWLock
*/
/*
diff --git a/cpukit/score/src/corerwlockobtainread.c b/cpukit/score/src/corerwlockobtainread.c
index 19685b9131..5d097a8be4 100644
--- a/cpukit/score/src/corerwlockobtainread.c
+++ b/cpukit/score/src/corerwlockobtainread.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Obtain RWLock for reading
- * @ingroup ScoreRWLock
+ * @ingroup RTEMSScoreRWLock
*/
/*
diff --git a/cpukit/score/src/corerwlockobtainwrite.c b/cpukit/score/src/corerwlockobtainwrite.c
index 7b296169d9..6d2e6a2c1f 100644
--- a/cpukit/score/src/corerwlockobtainwrite.c
+++ b/cpukit/score/src/corerwlockobtainwrite.c
@@ -2,7 +2,7 @@
* @file
*
* @brief RWLock Obtain for Writing
- * @ingroup ScoreRWLock
+ * @ingroup RTEMSScoreRWLock
*/
/*
diff --git a/cpukit/score/src/corerwlockrelease.c b/cpukit/score/src/corerwlockrelease.c
index 772d16dc25..c3c6cb9ca8 100644
--- a/cpukit/score/src/corerwlockrelease.c
+++ b/cpukit/score/src/corerwlockrelease.c
@@ -3,7 +3,7 @@
*
* @brief Releases the RWLock
*
- * @ingroup ScoreRWLock
+ * @ingroup RTEMSScoreRWLock
*/
/*
diff --git a/cpukit/score/src/coresem.c b/cpukit/score/src/coresem.c
index f8966448e3..9cb1a73e69 100644
--- a/cpukit/score/src/coresem.c
+++ b/cpukit/score/src/coresem.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Core Semaphore Initialize
- * @ingroup ScoreSemaphore
+ * @ingroup RTEMSScoreSemaphore
*/
/*
diff --git a/cpukit/score/src/coretod.c b/cpukit/score/src/coretod.c
index cd8428c15d..f19cff21f0 100644
--- a/cpukit/score/src/coretod.c
+++ b/cpukit/score/src/coretod.c
@@ -3,7 +3,7 @@
*
* @brief Initializes the Time of Day Handler
*
- * @ingroup ScoreTOD
+ * @ingroup RTEMSScoreTOD
*/
/* COPYRIGHT (c) 1989-2014.
diff --git a/cpukit/score/src/coretodadjust.c b/cpukit/score/src/coretodadjust.c
index f493a40b9d..accb99b40a 100644
--- a/cpukit/score/src/coretodadjust.c
+++ b/cpukit/score/src/coretodadjust.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Adjust the Time of Time
- * @ingroup ScoreTOD
+ * @ingroup RTEMSScoreTOD
*/
/*
diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c
index 020b8878c0..f348596213 100644
--- a/cpukit/score/src/coretodset.c
+++ b/cpukit/score/src/coretodset.c
@@ -3,7 +3,7 @@
*
* @brief Set Time of Day Given a Timestamp
*
- * @ingroup ScoreTOD
+ * @ingroup RTEMSScoreTOD
*/
/* COPYRIGHT (c) 1989-2007.
diff --git a/cpukit/score/src/coretodtickspersec.c b/cpukit/score/src/coretodtickspersec.c
index cfe53cea86..7fb52fc350 100644
--- a/cpukit/score/src/coretodtickspersec.c
+++ b/cpukit/score/src/coretodtickspersec.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Convert Ticks To Seconds
- * @ingroup ScoreTOD
+ * @ingroup RTEMSScoreTOD
*/
/* COPYRIGHT (c) 1989-2014.
diff --git a/cpukit/score/src/freechain.c b/cpukit/score/src/freechain.c
index 57ba293d4b..f7da12216d 100644
--- a/cpukit/score/src/freechain.c
+++ b/cpukit/score/src/freechain.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreFreechain
+ * @ingroup RTEMSScoreFreechain
*
* @brief Freechain Handler Implementation
*/
diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c
index 402f6310cd..371944160c 100644
--- a/cpukit/score/src/heap.c
+++ b/cpukit/score/src/heap.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler implementation.
*/
diff --git a/cpukit/score/src/heapallocate.c b/cpukit/score/src/heapallocate.c
index e1ea68e5e4..3984881835 100644
--- a/cpukit/score/src/heapallocate.c
+++ b/cpukit/score/src/heapallocate.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler implementation.
*/
diff --git a/cpukit/score/src/heapextend.c b/cpukit/score/src/heapextend.c
index 6dde6b23c5..3e77924757 100644
--- a/cpukit/score/src/heapextend.c
+++ b/cpukit/score/src/heapextend.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler implementation.
*/
diff --git a/cpukit/score/src/heapfree.c b/cpukit/score/src/heapfree.c
index 13bf5eed81..04994c507b 100644
--- a/cpukit/score/src/heapfree.c
+++ b/cpukit/score/src/heapfree.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler implementation.
*/
diff --git a/cpukit/score/src/heapgetfreeinfo.c b/cpukit/score/src/heapgetfreeinfo.c
index b0480b8b63..ab7ef7174f 100644
--- a/cpukit/score/src/heapgetfreeinfo.c
+++ b/cpukit/score/src/heapgetfreeinfo.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler implementation.
*/
diff --git a/cpukit/score/src/heapgetinfo.c b/cpukit/score/src/heapgetinfo.c
index 36afe957d0..241934fd1c 100644
--- a/cpukit/score/src/heapgetinfo.c
+++ b/cpukit/score/src/heapgetinfo.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler implementation.
*/
diff --git a/cpukit/score/src/heapgreedy.c b/cpukit/score/src/heapgreedy.c
index 615d3066cf..faf12fbd73 100644
--- a/cpukit/score/src/heapgreedy.c
+++ b/cpukit/score/src/heapgreedy.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler API.
*/
diff --git a/cpukit/score/src/heapiterate.c b/cpukit/score/src/heapiterate.c
index 38e8d68e3c..de6bbb12c9 100644
--- a/cpukit/score/src/heapiterate.c
+++ b/cpukit/score/src/heapiterate.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief _Heap_Iterate() implementation.
*/
diff --git a/cpukit/score/src/heapnoextend.c b/cpukit/score/src/heapnoextend.c
index d961c5a77e..3be7e37483 100644
--- a/cpukit/score/src/heapnoextend.c
+++ b/cpukit/score/src/heapnoextend.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler implementation.
*/
diff --git a/cpukit/score/src/heapresizeblock.c b/cpukit/score/src/heapresizeblock.c
index 79d13a1954..bef25272bd 100644
--- a/cpukit/score/src/heapresizeblock.c
+++ b/cpukit/score/src/heapresizeblock.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler implementation.
*/
diff --git a/cpukit/score/src/heapsizeofuserarea.c b/cpukit/score/src/heapsizeofuserarea.c
index d0d0303237..b9b75a2b13 100644
--- a/cpukit/score/src/heapsizeofuserarea.c
+++ b/cpukit/score/src/heapsizeofuserarea.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler implementation.
*/
diff --git a/cpukit/score/src/heapwalk.c b/cpukit/score/src/heapwalk.c
index f1ac20ddb5..b9351795a2 100644
--- a/cpukit/score/src/heapwalk.c
+++ b/cpukit/score/src/heapwalk.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
*
* @brief Heap Handler implementation.
*/
diff --git a/cpukit/score/src/interr.c b/cpukit/score/src/interr.c
index 3a74f95cee..7ccd3de613 100644
--- a/cpukit/score/src/interr.c
+++ b/cpukit/score/src/interr.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Initiates system termination
- * @ingroup ScoreIntErr
+ * @ingroup RTEMSScoreIntErr
*/
/*
diff --git a/cpukit/score/src/isr.c b/cpukit/score/src/isr.c
index 4a7bc5fcce..436055dc24 100644
--- a/cpukit/score/src/isr.c
+++ b/cpukit/score/src/isr.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Initialize the ISR handler
- * @ingroup ScoreISR
+ * @ingroup RTEMSScoreISR
*/
/*
diff --git a/cpukit/score/src/isrisinprogress.c b/cpukit/score/src/isrisinprogress.c
index e2f210a6f6..267136d094 100644
--- a/cpukit/score/src/isrisinprogress.c
+++ b/cpukit/score/src/isrisinprogress.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreISR
+ * @ingroup RTEMSScoreISR
*
* @brief ISR Is In Progress Default Implementation
*/
diff --git a/cpukit/score/src/iterateoverthreads.c b/cpukit/score/src/iterateoverthreads.c
index e829fc9edb..0fdcee4bcb 100644
--- a/cpukit/score/src/iterateoverthreads.c
+++ b/cpukit/score/src/iterateoverthreads.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Iterates Over All Threads
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/log2table.c b/cpukit/score/src/log2table.c
index 19a9c8a446..ae63d3ebe2 100644
--- a/cpukit/score/src/log2table.c
+++ b/cpukit/score/src/log2table.c
@@ -3,7 +3,7 @@
*
* @brief Priority Bit Map Implementation
*
- * @ingroup ScorePriorityBitmap
+ * @ingroup RTEMSScorePriorityBitmap
*/
/*
diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c
index 9b09caa074..f488325fc5 100644
--- a/cpukit/score/src/mpci.c
+++ b/cpukit/score/src/mpci.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Multiprocessing Communications Interface (MPCI) Handler
- * @ingroup ScoreMPCI
+ * @ingroup RTEMSScoreMPCI
*/
/*
diff --git a/cpukit/score/src/objectallocate.c b/cpukit/score/src/objectallocate.c
index ad73884a07..ac7579dc78 100644
--- a/cpukit/score/src/objectallocate.c
+++ b/cpukit/score/src/objectallocate.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Allocate Object
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectapimaximumclass.c b/cpukit/score/src/objectapimaximumclass.c
index dc6b6c4681..0fb87ab772 100644
--- a/cpukit/score/src/objectapimaximumclass.c
+++ b/cpukit/score/src/objectapimaximumclass.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Object API Maximum Class
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectclose.c b/cpukit/score/src/objectclose.c
index e5ee4b5d46..05ac7f4c54 100644
--- a/cpukit/score/src/objectclose.c
+++ b/cpukit/score/src/objectclose.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Close Object
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectextendinformation.c b/cpukit/score/src/objectextendinformation.c
index b26f591f6e..688d0f90bb 100644
--- a/cpukit/score/src/objectextendinformation.c
+++ b/cpukit/score/src/objectextendinformation.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Extend Set of Objects
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectfree.c b/cpukit/score/src/objectfree.c
index c9af8ba7cf..af71245689 100644
--- a/cpukit/score/src/objectfree.c
+++ b/cpukit/score/src/objectfree.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Free Object
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectgetinfo.c b/cpukit/score/src/objectgetinfo.c
index c927d1c944..b0ca7e2766 100644
--- a/cpukit/score/src/objectgetinfo.c
+++ b/cpukit/score/src/objectgetinfo.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Get Object Information
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectgetinfoid.c b/cpukit/score/src/objectgetinfoid.c
index 415bfc253e..99243cc938 100644
--- a/cpukit/score/src/objectgetinfoid.c
+++ b/cpukit/score/src/objectgetinfoid.c
@@ -3,7 +3,7 @@
*
* @brief Get Information of an Object from an ID
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/*
diff --git a/cpukit/score/src/objectgetlocal.c b/cpukit/score/src/objectgetlocal.c
index e8a109f457..64215eab53 100644
--- a/cpukit/score/src/objectgetlocal.c
+++ b/cpukit/score/src/objectgetlocal.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Object Get Local
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectgetnameasstring.c b/cpukit/score/src/objectgetnameasstring.c
index 845334075a..dc0ec9372d 100644
--- a/cpukit/score/src/objectgetnameasstring.c
+++ b/cpukit/score/src/objectgetnameasstring.c
@@ -3,7 +3,7 @@
*
* @brief Extracts a Node from a Chain
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/*
diff --git a/cpukit/score/src/objectgetnext.c b/cpukit/score/src/objectgetnext.c
index 156bee72a4..25640d10eb 100644
--- a/cpukit/score/src/objectgetnext.c
+++ b/cpukit/score/src/objectgetnext.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Get Pointer to Next Object that is Active
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectgetnoprotection.c b/cpukit/score/src/objectgetnoprotection.c
index e5045b26de..71ce1f5228 100644
--- a/cpukit/score/src/objectgetnoprotection.c
+++ b/cpukit/score/src/objectgetnoprotection.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Get Object without Dispatching Protection
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectidtoname.c b/cpukit/score/src/objectidtoname.c
index 63948160e6..c4ecc3cf28 100644
--- a/cpukit/score/src/objectidtoname.c
+++ b/cpukit/score/src/objectidtoname.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Object id to name
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/*
diff --git a/cpukit/score/src/objectinitializeinformation.c b/cpukit/score/src/objectinitializeinformation.c
index 39d836db76..54920b52f4 100644
--- a/cpukit/score/src/objectinitializeinformation.c
+++ b/cpukit/score/src/objectinitializeinformation.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Initialize Object Information
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectmp.c b/cpukit/score/src/objectmp.c
index 75a0fdb15f..74ed22033a 100644
--- a/cpukit/score/src/objectmp.c
+++ b/cpukit/score/src/objectmp.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Objects MP Support
- * @ingroup ScoreObjectMP
+ * @ingroup RTEMSScoreObjectMP
*/
/*
diff --git a/cpukit/score/src/objectnamespaceremove.c b/cpukit/score/src/objectnamespaceremove.c
index 122ed862b7..32603119de 100644
--- a/cpukit/score/src/objectnamespaceremove.c
+++ b/cpukit/score/src/objectnamespaceremove.c
@@ -3,7 +3,7 @@
*
* @brief Removes Object from Namespace
*
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/*
diff --git a/cpukit/score/src/objectnametoid.c b/cpukit/score/src/objectnametoid.c
index 6a89b874e7..8603819a7e 100644
--- a/cpukit/score/src/objectnametoid.c
+++ b/cpukit/score/src/objectnametoid.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Object Name To Id
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/*
diff --git a/cpukit/score/src/objectnametoidstring.c b/cpukit/score/src/objectnametoidstring.c
index d357339ea7..cd2954896b 100644
--- a/cpukit/score/src/objectnametoidstring.c
+++ b/cpukit/score/src/objectnametoidstring.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Object ID to Name
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/objectsetname.c b/cpukit/score/src/objectsetname.c
index 32197a3cf8..30b640ed52 100644
--- a/cpukit/score/src/objectsetname.c
+++ b/cpukit/score/src/objectsetname.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Set Objects Name
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
*/
/*
diff --git a/cpukit/score/src/pheapallocate.c b/cpukit/score/src/pheapallocate.c
index 00c3865b50..2ceb2756e4 100644
--- a/cpukit/score/src/pheapallocate.c
+++ b/cpukit/score/src/pheapallocate.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler implementation.
*/
diff --git a/cpukit/score/src/pheapextend.c b/cpukit/score/src/pheapextend.c
index 118a9e6c93..b6054aaf1f 100644
--- a/cpukit/score/src/pheapextend.c
+++ b/cpukit/score/src/pheapextend.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler implementation.
*/
diff --git a/cpukit/score/src/pheapfree.c b/cpukit/score/src/pheapfree.c
index f1c1776b21..cce9868c71 100644
--- a/cpukit/score/src/pheapfree.c
+++ b/cpukit/score/src/pheapfree.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler implementation.
*/
diff --git a/cpukit/score/src/pheapgetblocksize.c b/cpukit/score/src/pheapgetblocksize.c
index 85a5e9ce6c..6281720682 100644
--- a/cpukit/score/src/pheapgetblocksize.c
+++ b/cpukit/score/src/pheapgetblocksize.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler implementation.
*/
diff --git a/cpukit/score/src/pheapgetfreeinfo.c b/cpukit/score/src/pheapgetfreeinfo.c
index 326b57739a..4c226f79e4 100644
--- a/cpukit/score/src/pheapgetfreeinfo.c
+++ b/cpukit/score/src/pheapgetfreeinfo.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler implementation.
*/
diff --git a/cpukit/score/src/pheapgetinfo.c b/cpukit/score/src/pheapgetinfo.c
index 27dea965cb..0fff3fff60 100644
--- a/cpukit/score/src/pheapgetinfo.c
+++ b/cpukit/score/src/pheapgetinfo.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler implementation.
*/
diff --git a/cpukit/score/src/pheapgetsize.c b/cpukit/score/src/pheapgetsize.c
index d60986b996..d1318cb165 100644
--- a/cpukit/score/src/pheapgetsize.c
+++ b/cpukit/score/src/pheapgetsize.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler implementation.
*/
diff --git a/cpukit/score/src/pheapinit.c b/cpukit/score/src/pheapinit.c
index e5a65966bd..03e5477c15 100644
--- a/cpukit/score/src/pheapinit.c
+++ b/cpukit/score/src/pheapinit.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler implementation.
*/
diff --git a/cpukit/score/src/pheapiterate.c b/cpukit/score/src/pheapiterate.c
index 9b6d945a2d..924667c807 100644
--- a/cpukit/score/src/pheapiterate.c
+++ b/cpukit/score/src/pheapiterate.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief _Heap_Iterate() implementation.
*/
diff --git a/cpukit/score/src/pheapresizeblock.c b/cpukit/score/src/pheapresizeblock.c
index de8b5b94eb..da60b7defa 100644
--- a/cpukit/score/src/pheapresizeblock.c
+++ b/cpukit/score/src/pheapresizeblock.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler implementation.
*/
diff --git a/cpukit/score/src/pheapwalk.c b/cpukit/score/src/pheapwalk.c
index 5605470773..f15070c79f 100644
--- a/cpukit/score/src/pheapwalk.c
+++ b/cpukit/score/src/pheapwalk.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
*
* @brief Protected Heap Handler implementation.
*/
diff --git a/cpukit/score/src/processormaskcopy.c b/cpukit/score/src/processormaskcopy.c
index 677c886e60..d10eeecfd9 100644
--- a/cpukit/score/src/processormaskcopy.c
+++ b/cpukit/score/src/processormaskcopy.c
@@ -3,7 +3,7 @@
*
* @brief Processor Mask Implementation
*
- * @ingroup ScoreProcessorMask
+ * @ingroup RTEMSScoreProcessorMask
*/
/*
diff --git a/cpukit/score/src/rbtreeiterate.c b/cpukit/score/src/rbtreeiterate.c
index 46a0e43fcd..e642c7b29e 100644
--- a/cpukit/score/src/rbtreeiterate.c
+++ b/cpukit/score/src/rbtreeiterate.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreRBTree
+ * @ingroup RTEMSScoreRBTree
*
* @brief _RBTree_Iterate() implementation.
*/
diff --git a/cpukit/score/src/rbtreenext.c b/cpukit/score/src/rbtreenext.c
index 7096b4b22f..4783ea1e6d 100644
--- a/cpukit/score/src/rbtreenext.c
+++ b/cpukit/score/src/rbtreenext.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreRBTree
+ * @ingroup RTEMSScoreRBTree
*
* @brief _RBTree_Next() and _RBTree_Next() implementation.
*/
diff --git a/cpukit/score/src/rbtreepostorder.c b/cpukit/score/src/rbtreepostorder.c
index 26555c8848..acbf54114f 100644
--- a/cpukit/score/src/rbtreepostorder.c
+++ b/cpukit/score/src/rbtreepostorder.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreRBTree
+ * @ingroup RTEMSScoreRBTree
*
* @brief _RBTree_Postorder_first() and _RBTree_Postorder_next()
* implementation.
diff --git a/cpukit/score/src/rbtreereplace.c b/cpukit/score/src/rbtreereplace.c
index 7a54000854..975d539fc2 100644
--- a/cpukit/score/src/rbtreereplace.c
+++ b/cpukit/score/src/rbtreereplace.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreRBTree
+ * @ingroup RTEMSScoreRBTree
*
* @brief _RBTree_Replace_node() implementation.
*/
diff --git a/cpukit/score/src/scheduler.c b/cpukit/score/src/scheduler.c
index e5b9688faf..db2c43502d 100644
--- a/cpukit/score/src/scheduler.c
+++ b/cpukit/score/src/scheduler.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler Initialize
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbs.c b/cpukit/score/src/schedulercbs.c
index f114d4fa02..d4001d8ed3 100644
--- a/cpukit/score/src/schedulercbs.c
+++ b/cpukit/score/src/schedulercbs.c
@@ -2,7 +2,7 @@
* @file
*
* @brief CBS Scheduler Budget Handler
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsattachthread.c b/cpukit/score/src/schedulercbsattachthread.c
index faabbbba8d..4193882d6b 100644
--- a/cpukit/score/src/schedulercbsattachthread.c
+++ b/cpukit/score/src/schedulercbsattachthread.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Attach Scheduler CBS Thread
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbscleanup.c b/cpukit/score/src/schedulercbscleanup.c
index 01dd0d8317..cd6e13803a 100644
--- a/cpukit/score/src/schedulercbscleanup.c
+++ b/cpukit/score/src/schedulercbscleanup.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler CBS Cleanup
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbscreateserver.c b/cpukit/score/src/schedulercbscreateserver.c
index 9d1cc0b1d8..15262cf286 100644
--- a/cpukit/score/src/schedulercbscreateserver.c
+++ b/cpukit/score/src/schedulercbscreateserver.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler CBS Create Server
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsdestroyserver.c b/cpukit/score/src/schedulercbsdestroyserver.c
index 2407a48bf8..5121e3a088 100644
--- a/cpukit/score/src/schedulercbsdestroyserver.c
+++ b/cpukit/score/src/schedulercbsdestroyserver.c
@@ -3,7 +3,7 @@
*
* @brief Scheduler CBS Destroy Server
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsdetachthread.c b/cpukit/score/src/schedulercbsdetachthread.c
index 6df0f2df3a..c840c8b376 100644
--- a/cpukit/score/src/schedulercbsdetachthread.c
+++ b/cpukit/score/src/schedulercbsdetachthread.c
@@ -3,7 +3,7 @@
*
* @brief Detach from the CBS Server
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsgetapprovedbudget.c b/cpukit/score/src/schedulercbsgetapprovedbudget.c
index 1377ea0847..e72ef3bae8 100644
--- a/cpukit/score/src/schedulercbsgetapprovedbudget.c
+++ b/cpukit/score/src/schedulercbsgetapprovedbudget.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler CBS Get Approved Budget
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsgetexecutiontime.c b/cpukit/score/src/schedulercbsgetexecutiontime.c
index 608560bf54..b18ce9a44d 100644
--- a/cpukit/score/src/schedulercbsgetexecutiontime.c
+++ b/cpukit/score/src/schedulercbsgetexecutiontime.c
@@ -3,7 +3,7 @@
*
* @brief Get Thread Execution Info
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsgetparameters.c b/cpukit/score/src/schedulercbsgetparameters.c
index f4adae34d9..1abe5d91e1 100644
--- a/cpukit/score/src/schedulercbsgetparameters.c
+++ b/cpukit/score/src/schedulercbsgetparameters.c
@@ -2,7 +2,7 @@
* @file
*
* @brief _Scheduler_CBS_Get_parameters
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsgetremainingbudget.c b/cpukit/score/src/schedulercbsgetremainingbudget.c
index 46049bf2cd..d556f33901 100644
--- a/cpukit/score/src/schedulercbsgetremainingbudget.c
+++ b/cpukit/score/src/schedulercbsgetremainingbudget.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler CBS Get Remaining Budget
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsgetserverid.c b/cpukit/score/src/schedulercbsgetserverid.c
index 8ceff89fcc..276c08f89d 100644
--- a/cpukit/score/src/schedulercbsgetserverid.c
+++ b/cpukit/score/src/schedulercbsgetserverid.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler CBS Get Server id
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsnodeinit.c b/cpukit/score/src/schedulercbsnodeinit.c
index 89b6f8e2df..08f63a100e 100644
--- a/cpukit/score/src/schedulercbsnodeinit.c
+++ b/cpukit/score/src/schedulercbsnodeinit.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler CBS Allocate
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsreleasejob.c b/cpukit/score/src/schedulercbsreleasejob.c
index 186f95c779..3ac07eb256 100644
--- a/cpukit/score/src/schedulercbsreleasejob.c
+++ b/cpukit/score/src/schedulercbsreleasejob.c
@@ -3,7 +3,7 @@
*
* @brief Scheduler CBS Release Job
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbssetparameters.c b/cpukit/score/src/schedulercbssetparameters.c
index 04682a0f20..0b8b664794 100644
--- a/cpukit/score/src/schedulercbssetparameters.c
+++ b/cpukit/score/src/schedulercbssetparameters.c
@@ -3,7 +3,7 @@
*
* @brief Set Parameters for CBS Scheduling
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulercbsunblock.c b/cpukit/score/src/schedulercbsunblock.c
index 9b7a0ca424..4d751f9b90 100644
--- a/cpukit/score/src/schedulercbsunblock.c
+++ b/cpukit/score/src/schedulercbsunblock.c
@@ -3,7 +3,7 @@
*
* @brief Unblocks a Thread from the Queue
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerdefaultnodedestroy.c b/cpukit/score/src/schedulerdefaultnodedestroy.c
index 537c824558..ae1ba2440b 100644
--- a/cpukit/score/src/schedulerdefaultnodedestroy.c
+++ b/cpukit/score/src/schedulerdefaultnodedestroy.c
@@ -3,7 +3,7 @@
*
* @brief Scheduler Default Node Destruction Operation
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerdefaultnodeinit.c b/cpukit/score/src/schedulerdefaultnodeinit.c
index 53aed5274f..de12babdee 100644
--- a/cpukit/score/src/schedulerdefaultnodeinit.c
+++ b/cpukit/score/src/schedulerdefaultnodeinit.c
@@ -3,7 +3,7 @@
*
* @brief Scheduler Default Node Initialization Operation
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerdefaultreleasejob.c b/cpukit/score/src/schedulerdefaultreleasejob.c
index 490d58b05f..52c19424cf 100644
--- a/cpukit/score/src/schedulerdefaultreleasejob.c
+++ b/cpukit/score/src/schedulerdefaultreleasejob.c
@@ -3,7 +3,7 @@
*
* @brief Default Scheduler Release Job Operation
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerdefaultsetaffinity.c b/cpukit/score/src/schedulerdefaultsetaffinity.c
index bd8fc95099..ad7fc0d43d 100644
--- a/cpukit/score/src/schedulerdefaultsetaffinity.c
+++ b/cpukit/score/src/schedulerdefaultsetaffinity.c
@@ -3,7 +3,7 @@
*
* @brief Scheduler Default Set Affinity Operation
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerdefaulttick.c b/cpukit/score/src/schedulerdefaulttick.c
index 19acd3b2b8..21ae594f6d 100644
--- a/cpukit/score/src/schedulerdefaulttick.c
+++ b/cpukit/score/src/schedulerdefaulttick.c
@@ -3,7 +3,7 @@
*
* @brief Default Scheduler At Tick Handler
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/scheduleredf.c b/cpukit/score/src/scheduleredf.c
index 21bbe240c8..99592c1fcc 100644
--- a/cpukit/score/src/scheduleredf.c
+++ b/cpukit/score/src/scheduleredf.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler EDF Initialize and Support
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/scheduleredfblock.c b/cpukit/score/src/scheduleredfblock.c
index 1269e8e5bc..47e815efa1 100644
--- a/cpukit/score/src/scheduleredfblock.c
+++ b/cpukit/score/src/scheduleredfblock.c
@@ -3,7 +3,7 @@
*
* @brief Removes the Thread from Ready Queue
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/scheduleredfchangepriority.c b/cpukit/score/src/scheduleredfchangepriority.c
index d3d1f94cbf..9cd4a3cec9 100644
--- a/cpukit/score/src/scheduleredfchangepriority.c
+++ b/cpukit/score/src/scheduleredfchangepriority.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler EDF Extract
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/scheduleredfnodeinit.c b/cpukit/score/src/scheduleredfnodeinit.c
index 94f8facbe3..f448c8738a 100644
--- a/cpukit/score/src/scheduleredfnodeinit.c
+++ b/cpukit/score/src/scheduleredfnodeinit.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler EDF Allocate
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/scheduleredfreleasejob.c b/cpukit/score/src/scheduleredfreleasejob.c
index f95e8bdc0b..6f9667d0e2 100644
--- a/cpukit/score/src/scheduleredfreleasejob.c
+++ b/cpukit/score/src/scheduleredfreleasejob.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler EDF Release Job
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/scheduleredfschedule.c b/cpukit/score/src/scheduleredfschedule.c
index 7840eed2dc..0b30b6704b 100644
--- a/cpukit/score/src/scheduleredfschedule.c
+++ b/cpukit/score/src/scheduleredfschedule.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler EDF Allocate
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/scheduleredfsmp.c b/cpukit/score/src/scheduleredfsmp.c
index 62ddbdafa0..e6bf64836e 100644
--- a/cpukit/score/src/scheduleredfsmp.c
+++ b/cpukit/score/src/scheduleredfsmp.c
@@ -3,7 +3,7 @@
*
* @brief EDF SMP Scheduler Implementation
*
- * @ingroup ScoreSchedulerSMPEDF
+ * @ingroup RTEMSScoreSchedulerSMPEDF
*/
/*
diff --git a/cpukit/score/src/scheduleredfunblock.c b/cpukit/score/src/scheduleredfunblock.c
index 91295f511c..05fce9da51 100644
--- a/cpukit/score/src/scheduleredfunblock.c
+++ b/cpukit/score/src/scheduleredfunblock.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler EDF Unblock
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/scheduleredfyield.c b/cpukit/score/src/scheduleredfyield.c
index 4adb4f5121..116e525e43 100644
--- a/cpukit/score/src/scheduleredfyield.c
+++ b/cpukit/score/src/scheduleredfyield.c
@@ -3,7 +3,7 @@
*
* @brief Scheduler EDF Yield
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerpriority.c b/cpukit/score/src/schedulerpriority.c
index 5ac16a49a1..f94d82e1fd 100644
--- a/cpukit/score/src/schedulerpriority.c
+++ b/cpukit/score/src/schedulerpriority.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Initialize Scheduler Priority
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerpriorityaffinitysmp.c b/cpukit/score/src/schedulerpriorityaffinitysmp.c
index a82106566b..f4f302fb4a 100644
--- a/cpukit/score/src/schedulerpriorityaffinitysmp.c
+++ b/cpukit/score/src/schedulerpriorityaffinitysmp.c
@@ -3,7 +3,7 @@
*
* @brief Deterministic Priority Affinity SMP Scheduler Implementation
*
- * @ingroup ScoreSchedulerPriorityAffinitySMP
+ * @ingroup RTEMSScoreSchedulerPriorityAffinitySMP
*/
/*
diff --git a/cpukit/score/src/schedulerpriorityblock.c b/cpukit/score/src/schedulerpriorityblock.c
index 611c4cd343..c192122ee4 100644
--- a/cpukit/score/src/schedulerpriorityblock.c
+++ b/cpukit/score/src/schedulerpriorityblock.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler Priority Block
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerprioritychangepriority.c b/cpukit/score/src/schedulerprioritychangepriority.c
index 6af475a8d6..247d1b28a9 100644
--- a/cpukit/score/src/schedulerprioritychangepriority.c
+++ b/cpukit/score/src/schedulerprioritychangepriority.c
@@ -3,7 +3,7 @@
*
* @brief Removes Thread from Thread Queue
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerpriorityschedule.c b/cpukit/score/src/schedulerpriorityschedule.c
index ffc1351bba..c2ea83466f 100644
--- a/cpukit/score/src/schedulerpriorityschedule.c
+++ b/cpukit/score/src/schedulerpriorityschedule.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Priority Scheduler Schedule Method
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerprioritysmp.c b/cpukit/score/src/schedulerprioritysmp.c
index 6479563eb0..207dd3cd87 100644
--- a/cpukit/score/src/schedulerprioritysmp.c
+++ b/cpukit/score/src/schedulerprioritysmp.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSchedulerPrioritySMP
+ * @ingroup RTEMSScoreSchedulerPrioritySMP
*
* @brief Deterministic Priority SMP Scheduler Implementation
*/
diff --git a/cpukit/score/src/schedulerpriorityunblock.c b/cpukit/score/src/schedulerpriorityunblock.c
index 784bc58611..80fef57e08 100644
--- a/cpukit/score/src/schedulerpriorityunblock.c
+++ b/cpukit/score/src/schedulerpriorityunblock.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler Priority Unblock
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerpriorityyield.c b/cpukit/score/src/schedulerpriorityyield.c
index c12b759f83..796e9acd0a 100644
--- a/cpukit/score/src/schedulerpriorityyield.c
+++ b/cpukit/score/src/schedulerpriorityyield.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler Priority Yield
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulersimple.c b/cpukit/score/src/schedulersimple.c
index 38fb194f44..3caa016b21 100644
--- a/cpukit/score/src/schedulersimple.c
+++ b/cpukit/score/src/schedulersimple.c
@@ -3,7 +3,7 @@
*
* @brief Scheduler Simple Functions
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulersimpleblock.c b/cpukit/score/src/schedulersimpleblock.c
index 2fd50b74cb..36310348ee 100644
--- a/cpukit/score/src/schedulersimpleblock.c
+++ b/cpukit/score/src/schedulersimpleblock.c
@@ -3,7 +3,7 @@
*
* @brief Simple Scheduler Block a Thread
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulersimplechangepriority.c b/cpukit/score/src/schedulersimplechangepriority.c
index c2c60a5f01..01e35da1d4 100644
--- a/cpukit/score/src/schedulersimplechangepriority.c
+++ b/cpukit/score/src/schedulersimplechangepriority.c
@@ -3,7 +3,7 @@
*
* @brief Removes a Thread from the Simple Queue
*
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulersimpleschedule.c b/cpukit/score/src/schedulersimpleschedule.c
index fcc1398b48..34e1fafa8a 100644
--- a/cpukit/score/src/schedulersimpleschedule.c
+++ b/cpukit/score/src/schedulersimpleschedule.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Simple Schedule Determine Heir
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulersimplesmp.c b/cpukit/score/src/schedulersimplesmp.c
index e0f56ffe67..4730c64d8d 100644
--- a/cpukit/score/src/schedulersimplesmp.c
+++ b/cpukit/score/src/schedulersimplesmp.c
@@ -3,7 +3,7 @@
*
* @brief Simple SMP Scheduler Implementation
*
- * @ingroup ScoreSchedulerSMPSimple
+ * @ingroup RTEMSScoreSchedulerSMPSimple
*/
/*
diff --git a/cpukit/score/src/schedulersimpleunblock.c b/cpukit/score/src/schedulersimpleunblock.c
index 3c99add581..4e5b798505 100644
--- a/cpukit/score/src/schedulersimpleunblock.c
+++ b/cpukit/score/src/schedulersimpleunblock.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Scheduler Simple Handler / Unblock
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulersimpleyield.c b/cpukit/score/src/schedulersimpleyield.c
index 95f9cd3540..1bd7a0154f 100644
--- a/cpukit/score/src/schedulersimpleyield.c
+++ b/cpukit/score/src/schedulersimpleyield.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Simple Schedule Yield CPU
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
*/
/*
diff --git a/cpukit/score/src/schedulerstrongapa.c b/cpukit/score/src/schedulerstrongapa.c
index 865c11832e..906cc83fb3 100644
--- a/cpukit/score/src/schedulerstrongapa.c
+++ b/cpukit/score/src/schedulerstrongapa.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreSchedulerStrongAPA
+ * @ingroup RTEMSScoreSchedulerStrongAPA
*
* @brief Strong APA Scheduler Implementation
*/
diff --git a/cpukit/score/src/smp.c b/cpukit/score/src/smp.c
index 1c7eb6d947..7864640829 100644
--- a/cpukit/score/src/smp.c
+++ b/cpukit/score/src/smp.c
@@ -2,7 +2,7 @@
* @file
*
* @brief SMP Support
- * @ingroup Score
+ * @ingroup RTEMSScore
*/
/*
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
index 822fb7cb37..812d9296af 100644
--- a/cpukit/score/src/thread.c
+++ b/cpukit/score/src/thread.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Initialize Thread Handler
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadchangepriority.c b/cpukit/score/src/threadchangepriority.c
index 102c9d1fa2..71a01e05a3 100644
--- a/cpukit/score/src/threadchangepriority.c
+++ b/cpukit/score/src/threadchangepriority.c
@@ -3,7 +3,7 @@
*
* @brief Changes the Priority of a Thread
*
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadclearstate.c b/cpukit/score/src/threadclearstate.c
index a67850ebfb..90ce0e8a49 100644
--- a/cpukit/score/src/threadclearstate.c
+++ b/cpukit/score/src/threadclearstate.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Clear Thread state
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadcreateidle.c b/cpukit/score/src/threadcreateidle.c
index cdb2b1eebd..eaf5d50389 100644
--- a/cpukit/score/src/threadcreateidle.c
+++ b/cpukit/score/src/threadcreateidle.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Create Idle Thread
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c
index fc6a172080..55dc437eaf 100644
--- a/cpukit/score/src/threaddispatch.c
+++ b/cpukit/score/src/threaddispatch.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Dispatch Thread
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadget.c b/cpukit/score/src/threadget.c
index f363f9f204..f453c309f8 100644
--- a/cpukit/score/src/threadget.c
+++ b/cpukit/score/src/threadget.c
@@ -3,7 +3,7 @@
*
* @brief Maps Thread IDs to TCB Pointer
*
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index 097c8e1a2d..6ddb303299 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Thread Handler
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c
index e2bb694f18..83c689eee4 100644
--- a/cpukit/score/src/threadinitialize.c
+++ b/cpukit/score/src/threadinitialize.c
@@ -3,7 +3,7 @@
*
* @brief Initialize Thread
*
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
* COPYRIGHT (c) 1989-2014.
diff --git a/cpukit/score/src/threadloadenv.c b/cpukit/score/src/threadloadenv.c
index 22606ddd08..828e8eca82 100644
--- a/cpukit/score/src/threadloadenv.c
+++ b/cpukit/score/src/threadloadenv.c
@@ -3,7 +3,7 @@
*
* @brief Initializes Enviroment for A Thread
*
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadmp.c b/cpukit/score/src/threadmp.c
index 006d0f5bcf..e0c9da15e7 100644
--- a/cpukit/score/src/threadmp.c
+++ b/cpukit/score/src/threadmp.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Distributed MP Support
- * @ingroup ScoreThreadMP
+ * @ingroup RTEMSScoreThreadMP
*/
/*
diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c
index 8991a3a182..4483c9e03b 100644
--- a/cpukit/score/src/threadq.c
+++ b/cpukit/score/src/threadq.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Thread Queue Initialize
- * @ingroup ScoreThreadQ
+ * @ingroup RTEMSScoreThreadQ
*/
/*
diff --git a/cpukit/score/src/threadqenqueue.c b/cpukit/score/src/threadqenqueue.c
index f62ec29b02..d2e8c48381 100644
--- a/cpukit/score/src/threadqenqueue.c
+++ b/cpukit/score/src/threadqenqueue.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Thread Queue Operations
- * @ingroup ScoreThreadQ
+ * @ingroup RTEMSScoreThreadQ
*/
/*
diff --git a/cpukit/score/src/threadqfirst.c b/cpukit/score/src/threadqfirst.c
index 0828c1f717..e68fb9f5fa 100644
--- a/cpukit/score/src/threadqfirst.c
+++ b/cpukit/score/src/threadqfirst.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Thread Queue First
- * @ingroup ScoreThreadQ
+ * @ingroup RTEMSScoreThreadQ
*/
/*
diff --git a/cpukit/score/src/threadqflush.c b/cpukit/score/src/threadqflush.c
index 4310e06edf..af48d54a20 100644
--- a/cpukit/score/src/threadqflush.c
+++ b/cpukit/score/src/threadqflush.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Thread Queue Flush
- * @ingroup ScoreThreadQ
+ * @ingroup RTEMSScoreThreadQ
*/
/*
diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c
index bcd900aa69..83aef28c30 100644
--- a/cpukit/score/src/threadrestart.c
+++ b/cpukit/score/src/threadrestart.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Restart Thread
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadsetstate.c b/cpukit/score/src/threadsetstate.c
index c863d1732a..763c2839e2 100644
--- a/cpukit/score/src/threadsetstate.c
+++ b/cpukit/score/src/threadsetstate.c
@@ -3,7 +3,7 @@
*
* @brief Sets States for a Thread
*
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadstackallocate.c b/cpukit/score/src/threadstackallocate.c
index 1d4d2c9e21..fd89d7f07f 100644
--- a/cpukit/score/src/threadstackallocate.c
+++ b/cpukit/score/src/threadstackallocate.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Stack Allocate Helper
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
diff --git a/cpukit/score/src/threadstackfree.c b/cpukit/score/src/threadstackfree.c
index 37c20f7aee..312a10c7f3 100644
--- a/cpukit/score/src/threadstackfree.c
+++ b/cpukit/score/src/threadstackfree.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Deallocate Thread Stack
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadstart.c b/cpukit/score/src/threadstart.c
index 676e34da49..9e9ea1cb4a 100644
--- a/cpukit/score/src/threadstart.c
+++ b/cpukit/score/src/threadstart.c
@@ -3,7 +3,7 @@
*
* @brief Initializes Thread and Executes it
*
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadstartmultitasking.c b/cpukit/score/src/threadstartmultitasking.c
index 291e42cffa..67bbba45f5 100644
--- a/cpukit/score/src/threadstartmultitasking.c
+++ b/cpukit/score/src/threadstartmultitasking.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Start Thread Multitasking
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadtimeout.c b/cpukit/score/src/threadtimeout.c
index 8ea5a651f0..61e86599d1 100644
--- a/cpukit/score/src/threadtimeout.c
+++ b/cpukit/score/src/threadtimeout.c
@@ -3,7 +3,7 @@
*
* @brief Thread Wait Timeout
*
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/threadyield.c b/cpukit/score/src/threadyield.c
index cfd8118665..462f04fee2 100644
--- a/cpukit/score/src/threadyield.c
+++ b/cpukit/score/src/threadyield.c
@@ -3,7 +3,7 @@
*
* @brief Thread Yield
*
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
*/
/*
diff --git a/cpukit/score/src/userext.c b/cpukit/score/src/userext.c
index 4a667de3e4..a2e70dc4d3 100644
--- a/cpukit/score/src/userext.c
+++ b/cpukit/score/src/userext.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
*
* @brief User Extension Handler implementation.
*/
diff --git a/cpukit/score/src/userextaddset.c b/cpukit/score/src/userextaddset.c
index ea2d214ffc..585712e043 100644
--- a/cpukit/score/src/userextaddset.c
+++ b/cpukit/score/src/userextaddset.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
*
* @brief User Extension Handler implementation.
*/
diff --git a/cpukit/score/src/userextiterate.c b/cpukit/score/src/userextiterate.c
index 04fe278639..0bd32262e9 100644
--- a/cpukit/score/src/userextiterate.c
+++ b/cpukit/score/src/userextiterate.c
@@ -3,7 +3,7 @@
*
* @brief User Extension Iteration Helpers
*
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
*/
/*
diff --git a/cpukit/score/src/userextremoveset.c b/cpukit/score/src/userextremoveset.c
index b25cc344b4..adaf049677 100644
--- a/cpukit/score/src/userextremoveset.c
+++ b/cpukit/score/src/userextremoveset.c
@@ -1,7 +1,7 @@
/**
* @file
*
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
*
* @brief User Extension Handler implementation.
*/
diff --git a/cpukit/score/src/watchdoginsert.c b/cpukit/score/src/watchdoginsert.c
index b9f5eb88fb..c6dbed22f3 100644
--- a/cpukit/score/src/watchdoginsert.c
+++ b/cpukit/score/src/watchdoginsert.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Watchdog Insert
- * @ingroup ScoreWatchdog
+ * @ingroup RTEMSScoreWatchdog
*/
/*
diff --git a/cpukit/score/src/watchdogremove.c b/cpukit/score/src/watchdogremove.c
index 2605a67fa4..cda4a62032 100644
--- a/cpukit/score/src/watchdogremove.c
+++ b/cpukit/score/src/watchdogremove.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Remove Watchdog
- * @ingroup ScoreWatchdog
+ * @ingroup RTEMSScoreWatchdog
*/
/*
diff --git a/cpukit/score/src/watchdogtickssinceboot.c b/cpukit/score/src/watchdogtickssinceboot.c
index 0857d0ef73..b255c4ee6e 100644
--- a/cpukit/score/src/watchdogtickssinceboot.c
+++ b/cpukit/score/src/watchdogtickssinceboot.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Watchdog Ticks Since Boot
- * @ingroup ScoreWatchdog
+ * @ingroup RTEMSScoreWatchdog
*/
/*
diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c
index 9f91ac5a5d..bafc0db6d5 100644
--- a/cpukit/score/src/wkspace.c
+++ b/cpukit/score/src/wkspace.c
@@ -2,7 +2,7 @@
* @file
*
* @brief Workspace Handler Support
- * @ingroup ScoreWorkspace
+ * @ingroup RTEMSScoreWorkspace
*/
/*
diff --git a/cpukit/score/src/wkstringduplicate.c b/cpukit/score/src/wkstringduplicate.c
index ff6f973198..8fc1c9705d 100644
--- a/cpukit/score/src/wkstringduplicate.c
+++ b/cpukit/score/src/wkstringduplicate.c
@@ -3,7 +3,7 @@
*
* @brief Duplicates String with Memory from the Workspace
*
- * @ingroup ScoreWorkspace
+ * @ingroup RTEMSScoreWorkspace
*/
/*