12 files changed, 81 insertions, 106 deletions
diff --git a/cpukit/score/src/corebarrier.c b/cpukit/score/src/corebarrier.c
index bab4182466..5eb620a42e 100644
--- a/cpukit/score/src/corebarrier.c
+++ b/cpukit/score/src/corebarrier.c
@@ -1,10 +1,11 @@
-/*
- *  SuperCore Barrier Handler
- *
- *  DESCRIPTION:
- *
- *  This package is part of the implementation of the SuperCore Barrier Handler.
+/**
+ *  @file
  *
+ *  @brief Initialize CORE Barrier
+ *  @ingroup ScoreBarrier
+ */
+
+/*
  *  COPYRIGHT (c) 1989-2006.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -23,19 +24,6 @@
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 
-/*
- *  _CORE_barrier_Initialize
- *
- *  This function initialize a barrier and sets the initial value based
- *  on the given count.
- *
- *  Input parameters:
- *    the_barrier            - the barrier control block to initialize
- *    the_barrier_attributes - the attributes specified at create time
- *
- *  Output parameters:  NONE
- */
-
 void _CORE_barrier_Initialize(
   CORE_barrier_Control       *the_barrier,
   CORE_barrier_Attributes    *the_barrier_attributes
diff --git a/cpukit/score/src/coremutexseize.c b/cpukit/score/src/coremutexseize.c
index 8394a1db23..b6465b2730 100644
--- a/cpukit/score/src/coremutexseize.c
+++ b/cpukit/score/src/coremutexseize.c
@@ -1,11 +1,11 @@
-/*
- *  Mutex Handler
- *
- *  DESCRIPTION:
- *
- *  This package is the implementation of the Mutex Handler.
- *  This handler provides synchronization and mutual exclusion capabilities.
+/**
+ *  @file
  *
+ *  @brief Seize Mutex with Blocking
+ *  @ingroup ScoreMutex
+ */
+
+/*
  *  COPYRIGHT (c) 1989-2006.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -38,17 +38,6 @@ void _CORE_mutex_Seize(
 }
 #endif
 
-/*
- *  _CORE_mutex_Seize (interrupt blocking support)
- *
- *  This routine blocks the caller thread after an attempt attempts to obtain
- *  the specified mutex has failed.
- *
- *  Input parameters:
- *    the_mutex - pointer to mutex control block
- *    timeout   - number of ticks to wait (0 means forever)
- */
-
 void _CORE_mutex_Seize_interrupt_blocking(
   CORE_mutex_Control  *the_mutex,
   Watchdog_Interval    timeout
diff --git a/cpukit/score/src/objectfree.c b/cpukit/score/src/objectfree.c
index f5db7469ee..2e1f657141 100644
--- a/cpukit/score/src/objectfree.c
+++ b/cpukit/score/src/objectfree.c
@@ -1,7 +1,11 @@
-/*
- *  Object Handler
- *
+/**
+ *  @file
  *
+ *  @brief Free Object
+ *  @ingroup ScoreObject
+ */
+
+/*
  *  COPYRIGHT (c) 1989-1999.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -26,15 +30,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
-/*
- *  _Objects_Free
- *
- *  DESCRIPTION:
- *
- *  This function frees a object control block to the
- *  inactive chain of free object control blocks.
- */
-
 void _Objects_Free(
   Objects_Information *information,
   Objects_Control     *the_object
diff --git a/cpukit/score/src/scheduleredfallocate.c b/cpukit/score/src/scheduleredfallocate.c
index 5e6ff6a2d2..4982fd4886 100644
--- a/cpukit/score/src/scheduleredfallocate.c
+++ b/cpukit/score/src/scheduleredfallocate.c
@@ -1,3 +1,10 @@
+/**
+ *  @file
+ *
+ *  @brief Scheduler EDF Allocate
+ *  @ingroup ScoreScheduler
+ */
+
 /*
  *  Copyright (C) 2011 Petr Benes.
  *  Copyright (C) 2011 On-Line Applications Research Corporation (OAR).
diff --git a/cpukit/score/src/scheduleredfupdate.c b/cpukit/score/src/scheduleredfupdate.c
index d79e592c39..1e1c0ab645 100644
--- a/cpukit/score/src/scheduleredfupdate.c
+++ b/cpukit/score/src/scheduleredfupdate.c
@@ -1,3 +1,10 @@
+/**
+ *  @file
+ *
+ *  @brief Scheduler EDF Update
+ *  @ingroup ScoreScheduler
+ */
+
 /*
  *  Copyright (C) 2011 Petr Benes.
  *  Copyright (C) 2011 On-Line Applications Research Corporation (OAR).
diff --git a/cpukit/score/src/schedulerpriorityenqueue.c b/cpukit/score/src/schedulerpriorityenqueue.c
index 9829335ec0..89cf4a22b7 100644
--- a/cpukit/score/src/schedulerpriorityenqueue.c
+++ b/cpukit/score/src/schedulerpriorityenqueue.c
@@ -1,3 +1,10 @@
+/**
+ *  @file
+ *
+ *  @brief Scheduler Priority Enqueue
+ *  @ingroup ScoreScheduler
+ */
+
 /*
  *  COPYRIGHT (c) 2011.
  *  On-Line Applications Research Corporation (OAR).
diff --git a/cpukit/score/src/schedulerpriorityfree.c b/cpukit/score/src/schedulerpriorityfree.c
index b882e6a00b..1f56cb4d31 100644
--- a/cpukit/score/src/schedulerpriorityfree.c
+++ b/cpukit/score/src/schedulerpriorityfree.c
@@ -1,6 +1,11 @@
-/*
- *  Scheduler Handler
+/**
+ *  @file
  *
+ *  @brief Free Scheduler Priority
+ *  @ingroup ScoreScheduler
+ */
+
+/*
  *  Copyright (C) 2010 Gedare Bloom.
  *  Copyright (C) 2011 On-Line Applications Research Corporation (OAR).
  *
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
index b598627740..b266d6ec82 100644
--- a/cpukit/score/src/thread.c
+++ b/cpukit/score/src/thread.c
@@ -1,7 +1,11 @@
-/*
- *  Thread Handler
- *
+/**
+ *  @file
  *
+ *  @brief Initialize Thread Handler
+ *  @ingroup ScoreThread
+ */
+
+/*
  *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -34,16 +38,6 @@
   #include <rtems/bspsmp.h>
 #endif
 
-/*
- *  _Thread_Handler_initialization
- *
- *  This routine initializes all thread manager related data structures.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- */
-
 void _Thread_Handler_initialization(void)
 {
   uint32_t ticks_per_timeslice =
diff --git a/cpukit/score/src/threadqdequeuefifo.c b/cpukit/score/src/threadqdequeuefifo.c
index 119c2d67cf..fcad820c2f 100644
--- a/cpukit/score/src/threadqdequeuefifo.c
+++ b/cpukit/score/src/threadqdequeuefifo.c
@@ -1,7 +1,11 @@
-/*
- *  Thread Queue Handler
- *
+/**
+ *  @file
  *
+ *  @brief Thread Queue Dequeue FIFO
+ *  @ingroup ScoreThreadQ
+ */
+
+/*
  *  COPYRIGHT (c) 1989-2008.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -23,22 +27,6 @@
 #include <rtems/score/threadq.h>
 #include <rtems/score/tqdata.h>
 
-/*
- *  _Thread_queue_Dequeue_fifo
- *
- *  This routine removes a thread from the specified threadq.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to threadq
- *
- *  Output parameters:
- *    returns - thread dequeued or NULL
- *
- *  INTERRUPT LATENCY:
- *    check sync
- *    FIFO
- */
-
 Thread_Control *_Thread_queue_Dequeue_fifo(
   Thread_queue_Control *the_thread_queue
 )
diff --git a/cpukit/score/src/threadqfirstfifo.c b/cpukit/score/src/threadqfirstfifo.c
index 6bf362f433..c22debdd0f 100644
--- a/cpukit/score/src/threadqfirstfifo.c
+++ b/cpukit/score/src/threadqfirstfifo.c
@@ -1,7 +1,11 @@
-/*
- *  Thread Queue Handler
- *
+/**
+ *  @file
  *
+ *  @brief Thread Queue First FIFO
+ *  @ingroup ScoreThreadQ
+ */
+
+/*
  *  COPYRIGHT (c) 1989-2008.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -23,19 +27,6 @@
 #include <rtems/score/threadq.h>
 #include <rtems/score/tqdata.h>
 
-/*
- *  _Thread_queue_First_fifo
- *
- *  This routines returns a pointer to the first thread on the
- *  specified threadq.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to threadq
- *
- *  Output parameters:
- *    returns - first thread or NULL
- */
-
 Thread_Control *_Thread_queue_First_fifo(
   Thread_queue_Control *the_thread_queue
 )
diff --git a/cpukit/score/src/timespecaddto.c b/cpukit/score/src/timespecaddto.c
index 4d14cabc65..a71e1d63bf 100644
--- a/cpukit/score/src/timespecaddto.c
+++ b/cpukit/score/src/timespecaddto.c
@@ -1,5 +1,8 @@
 /**
- *  @file  score/src/timespecaddto.c
+ *  @file
+ *
+ *  @brief Add to a Timespec
+ *  @ingroup Timespec
  */
 
 /*
@@ -21,12 +24,6 @@
 #include <rtems/score/tod.h>
 #include <rtems/score/watchdog.h>
 
-/**
- *
- *  This routines adds two timespecs.  The second argument is added
- *  to the first.
- */
-
 uint32_t _Timespec_Add_to(
   struct timespec       *time,
   const struct timespec *add
diff --git a/cpukit/score/src/watchdognanoseconds.c b/cpukit/score/src/watchdognanoseconds.c
index 37b56b4691..41353bcc35 100644
--- a/cpukit/score/src/watchdognanoseconds.c
+++ b/cpukit/score/src/watchdognanoseconds.c
@@ -1,3 +1,10 @@
+/**
+ *  @file
+ *
+ *  @brief Default Nanoseconds Since Last Tick Handler
+ *  @ingroup ScoreWatchdog
+ */
+
 /*
  * Copyright (c) 2010 embedded brains GmbH.  All rights reserved.
  *