[rtems commit] cpukit: Use Consistent Beginning of Doxygen Group Notation

Joel Sherrill joel at rtems.org
Thu Jan 10 23:02:06 UTC 2013


Module:    rtems
Branch:    master
Commit:    b697bc6a44a4a41f3025b833847adf96f6052bdd
Changeset: http://git.rtems.org/rtems/commit/?id=b697bc6a44a4a41f3025b833847adf96f6052bdd

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Thu Jan 10 15:06:42 2013 -0600

cpukit: Use Consistent Beginning of Doxygen Group Notation

This is the result of a sed script which converts all uses
of @{ into a consistent form.

---

 cpukit/include/rtems/irq-extension.h               |    3 +-
 cpukit/include/rtems/status-checks.h               |   12 +++------
 cpukit/include/rtems/userenv.h                     |    3 +-
 cpukit/libblock/include/rtems/bdbuf.h              |    3 +-
 cpukit/libblock/include/rtems/bdpart.h             |    6 +---
 cpukit/libblock/include/rtems/blkdev.h             |   12 +++------
 cpukit/libblock/include/rtems/diskdevs.h           |   12 +++------
 cpukit/libblock/include/rtems/flashdisk.h          |    3 +-
 cpukit/libblock/include/rtems/media.h              |   14 +++------
 cpukit/libblock/include/rtems/ramdisk.h            |    8 ++---
 cpukit/libblock/include/rtems/sparse-disk.h        |    2 +-
 cpukit/libcsupport/include/rtc.h                   |    3 +-
 cpukit/libcsupport/include/rtems/libcsupport.h     |    2 +-
 cpukit/libcsupport/include/rtems/libio.h           |   27 ++++++-------------
 cpukit/libcsupport/include/rtems/libio_.h          |    2 +-
 cpukit/libcsupport/include/sys/termios.h           |    2 +-
 cpukit/libcsupport/src/lstat.c                     |    2 +-
 cpukit/libfs/src/dosfs/dosfs.h                     |    2 +-
 cpukit/libi2c/libi2c.h                             |    2 +-
 cpukit/libmisc/fsmount/fsmount.h                   |    2 +-
 cpukit/libnetworking/rtems/ftpfs.h                 |    3 +-
 cpukit/posix/include/aio.h                         |    2 +-
 cpukit/posix/include/mqueue.h                      |    2 +-
 cpukit/posix/include/rtems/posix/barrier.h         |    2 +-
 cpukit/posix/include/rtems/posix/cond.h            |    2 +-
 cpukit/posix/include/rtems/posix/key.h             |    2 +-
 cpukit/posix/include/rtems/posix/mqueue.h          |    2 +-
 cpukit/posix/include/rtems/posix/mutex.h           |    2 +-
 cpukit/posix/include/rtems/posix/posixapi.h        |    2 +-
 cpukit/posix/include/rtems/posix/priority.h        |    2 +-
 cpukit/posix/include/rtems/posix/psignalimpl.h     |    2 +-
 cpukit/posix/include/rtems/posix/pthread.h         |    2 +-
 cpukit/posix/include/rtems/posix/ptimer.h          |    2 +-
 cpukit/posix/include/rtems/posix/rwlock.h          |    2 +-
 cpukit/posix/include/rtems/posix/spinlock.h        |    2 +-
 cpukit/posix/include/rtems/posix/threadsup.h       |    2 +-
 cpukit/posix/include/rtems/posix/time.h            |    2 +-
 cpukit/rtems/include/rtems/rtems/event.h           |    6 +---
 cpukit/rtems/include/rtems/rtems/support.h         |    6 +---
 cpukit/rtems/include/rtems/rtems/types.h           |    3 +-
 cpukit/rtems/inline/rtems/rtems/region.inl         |    2 +-
 cpukit/rtems/inline/rtems/rtems/support.inl        |    3 +-
 cpukit/sapi/include/rtems/chain.h                  |    6 +---
 cpukit/sapi/include/rtems/extension.h              |    3 +-
 cpukit/sapi/include/rtems/fatal.h                  |    3 +-
 cpukit/sapi/include/rtems/io.h                     |    5 +--
 cpukit/sapi/inline/rtems/chain.inl                 |    3 +-
 cpukit/sapi/inline/rtems/timespec.inl              |    3 +-
 cpukit/score/cpu/arm/rtems/asm.h                   |    3 +-
 cpukit/score/cpu/arm/rtems/score/arm.h             |    3 +-
 cpukit/score/cpu/arm/rtems/score/cpu.h             |   15 +++-------
 cpukit/score/cpu/arm/rtems/score/types.h           |    3 +-
 cpukit/score/cpu/avr/avr/delay.h                   |    2 +-
 cpukit/score/cpu/avr/avr/io.h                      |    2 +-
 cpukit/score/cpu/avr/avr/io2333.h                  |    6 ++--
 cpukit/score/cpu/avr/avr/io43u35x.h                |    6 ++--
 cpukit/score/cpu/avr/avr/io4414.h                  |    2 +-
 cpukit/score/cpu/avr/avr/io76c711.h                |    2 +-
 cpukit/score/cpu/avr/avr/io8534.h                  |    2 +-
 cpukit/score/cpu/avr/avr/io8535.h                  |    2 +-
 cpukit/score/cpu/avr/avr/io90pwm1.h                |    2 +-
 cpukit/score/cpu/avr/avr/io90pwm216.h              |    2 +-
 cpukit/score/cpu/avr/avr/io90pwm2b.h               |    2 +-
 cpukit/score/cpu/avr/avr/io90pwm3b.h               |    2 +-
 cpukit/score/cpu/avr/avr/io90pwm81.h               |    2 +-
 cpukit/score/cpu/avr/avr/io90pwmx.h                |    2 +-
 cpukit/score/cpu/avr/avr/ioa6289.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iocan32.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom103.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iom1280.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom164.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iom165.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iom169.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iom169p.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom169pa.h                |    2 +-
 cpukit/score/cpu/avr/avr/iom16a.h                  |   14 +++++-----
 cpukit/score/cpu/avr/avr/iom16hva.h                |    2 +-
 cpukit/score/cpu/avr/avr/iom2560.h                 |    8 +++---
 cpukit/score/cpu/avr/avr/iom325.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iom3250.h                 |   12 ++++----
 cpukit/score/cpu/avr/avr/iom328p.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom329.h                  |   12 ++++----
 cpukit/score/cpu/avr/avr/iom3290.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom32c1.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom32m1.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom32u2.h                 |   10 +++---
 cpukit/score/cpu/avr/avr/iom32u4.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom640.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iom644.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iom644p.h                 |    8 +++---
 cpukit/score/cpu/avr/avr/iom6450.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom64c1.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom64m1.h                 |   12 ++++----
 cpukit/score/cpu/avr/avr/iom8.h                    |    2 +-
 cpukit/score/cpu/avr/avr/iom8535.h                 |   12 ++++----
 cpukit/score/cpu/avr/avr/iom88.h                   |    2 +-
 cpukit/score/cpu/avr/avr/iom8hva.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iom8u2.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iomx8.h                   |    4 +-
 cpukit/score/cpu/avr/avr/iomxx4.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iotn13a.h                 |   12 ++++----
 cpukit/score/cpu/avr/avr/iotn15.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iotn167.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iotn2313.h                |    2 +-
 cpukit/score/cpu/avr/avr/iotn26.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iotn261.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iotn28.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iotn461.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iotn85.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iotn861.h                 |    8 +++---
 cpukit/score/cpu/avr/avr/iotn88.h                  |    2 +-
 cpukit/score/cpu/avr/avr/iotnx4.h                  |    4 +-
 cpukit/score/cpu/avr/avr/iotnx61.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iousb162.h                |    8 +++---
 cpukit/score/cpu/avr/avr/iousb647.h                |    2 +-
 cpukit/score/cpu/avr/avr/iousb82.h                 |    2 +-
 cpukit/score/cpu/avr/avr/iousbxx2.h                |    2 +-
 cpukit/score/cpu/avr/avr/iox128a1.h                |   18 ++++++------
 cpukit/score/cpu/avr/avr/iox256d3.h                |    2 +-
 cpukit/score/cpu/avr/avr/iox32d4.h                 |    2 +-
 cpukit/score/cpu/avr/avr/parity.h                  |    2 +-
 cpukit/score/cpu/avr/avr/pgmspace.h                |    2 +-
 cpukit/score/cpu/avr/avr/sfr_defs.h                |    9 ++----
 cpukit/score/cpu/avr/avr/sleep.h                   |    2 +-
 cpukit/score/cpu/bfin/rtems/score/cpu.h            |   17 ++++--------
 cpukit/score/cpu/i386/rtems/score/interrupts.h     |    2 +-
 cpukit/score/cpu/lm32/rtems/score/cpu.h            |   20 +++++---------
 cpukit/score/cpu/m32c/rtems/score/cpu.h            |    8 +++---
 cpukit/score/cpu/m32r/rtems/score/cpu.h            |   17 ++++--------
 cpukit/score/cpu/no_cpu/rtems/score/cpu.h          |    8 +++---
 cpukit/score/cpu/sparc/rtems/score/cpu.h           |    3 +-
 cpukit/score/cpu/v850/rtems/score/cpu.h            |   17 ++++--------
 cpukit/score/include/rtems/score/apimutex.h        |    6 +---
 cpukit/score/include/rtems/score/heap.h            |    3 +-
 cpukit/score/include/rtems/score/protectedheap.h   |    2 +-
 cpukit/score/include/rtems/score/sysstate.h        |    3 +-
 cpukit/score/include/rtems/score/userext.h         |    3 +-
 cpukit/score/include/rtems/score/userextimpl.h     |    9 ++----
 cpukit/score/inline/rtems/score/address.inl        |    3 +-
 cpukit/score/inline/rtems/score/chain.inl          |    3 +-
 cpukit/score/inline/rtems/score/corebarrier.inl    |    3 +-
 cpukit/score/inline/rtems/score/coremsg.inl        |    3 +-
 cpukit/score/inline/rtems/score/coremutex.inl      |    3 +-
 cpukit/score/inline/rtems/score/corerwlock.inl     |    3 +-
 cpukit/score/inline/rtems/score/coresem.inl        |    3 +-
 cpukit/score/inline/rtems/score/corespinlock.inl   |    3 +-
 cpukit/score/inline/rtems/score/heap.inl           |    3 +-
 cpukit/score/inline/rtems/score/isr.inl            |    3 +-
 cpukit/score/inline/rtems/score/mppkt.inl          |    3 +-
 cpukit/score/inline/rtems/score/objectmp.inl       |    3 +-
 cpukit/score/inline/rtems/score/priority.inl       |    3 +-
 cpukit/score/inline/rtems/score/prioritybitmap.inl |    3 +-
 cpukit/score/inline/rtems/score/rbtree.inl         |    3 +-
 cpukit/score/inline/rtems/score/scheduler.inl      |    3 +-
 .../score/inline/rtems/score/schedulerpriority.inl |    3 +-
 .../score/inline/rtems/score/schedulersimple.inl   |    3 +-
 cpukit/score/inline/rtems/score/stack.inl          |    3 +-
 cpukit/score/inline/rtems/score/states.inl         |    5 +--
 cpukit/score/inline/rtems/score/sysstate.inl       |    3 +-
 cpukit/score/inline/rtems/score/thread.inl         |    3 +-
 cpukit/score/inline/rtems/score/threadmp.inl       |    3 +-
 cpukit/score/inline/rtems/score/threadq.inl        |    3 +-
 cpukit/score/inline/rtems/score/tod.inl            |    3 +-
 cpukit/score/inline/rtems/score/tqdata.inl         |    3 +-
 164 files changed, 290 insertions(+), 405 deletions(-)

diff --git a/cpukit/include/rtems/irq-extension.h b/cpukit/include/rtems/irq-extension.h
index 644091b..ff2c6da 100644
--- a/cpukit/include/rtems/irq-extension.h
+++ b/cpukit/include/rtems/irq-extension.h
@@ -38,9 +38,8 @@ extern "C" {
  * In addition to the Classic API interrupt handler with a handle are
  * supported.  You can also install multiple shared handler for one interrupt
  * vector.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Makes the interrupt handler unique.  Prevents other handler from
diff --git a/cpukit/include/rtems/status-checks.h b/cpukit/include/rtems/status-checks.h
index 631c9f4..a1e2698 100644
--- a/cpukit/include/rtems/status-checks.h
+++ b/cpukit/include/rtems/status-checks.h
@@ -29,15 +29,13 @@ extern "C" {
 
 /**
  * @defgroup rtems_status_checks Status Checks
- *
- * @{
  */
+/**@{**/
 
 /**
  * @name Print Macros
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief General purpose debug print macro.
@@ -142,9 +140,8 @@ extern "C" {
 
 /**
  * @name Check Macros
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Prints message @a msg and returns with status code @a sc if the status
@@ -248,9 +245,8 @@ extern "C" {
 
 /**
  * @name Cleanup Macros
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Prints message @a msg and jumps to @a label if the status code @a sc
diff --git a/cpukit/include/rtems/userenv.h b/cpukit/include/rtems/userenv.h
index 53ec42d..edbef20 100644
--- a/cpukit/include/rtems/userenv.h
+++ b/cpukit/include/rtems/userenv.h
@@ -40,9 +40,8 @@ extern "C" {
  * @ingroup LibIO
  *
  * @brief Provides a POSIX like user environment for tasks.
- *
- * @{
  */
+/**@{**/
 
 #ifndef LOGIN_NAME_MAX
   #ifdef _POSIX_LOGIN_NAME_MAX
diff --git a/cpukit/libblock/include/rtems/bdbuf.h b/cpukit/libblock/include/rtems/bdbuf.h
index 197c20d..cde32d7 100644
--- a/cpukit/libblock/include/rtems/bdbuf.h
+++ b/cpukit/libblock/include/rtems/bdbuf.h
@@ -171,9 +171,8 @@ extern "C" {
  * issue with this design.  The reallocation of a group may forced recently
  * accessed buffers out of the cache when they should not.  The design should be
  * change to have groups on a LRU list if they have no buffers in use.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief State of a buffer of the cache.
diff --git a/cpukit/libblock/include/rtems/bdpart.h b/cpukit/libblock/include/rtems/bdpart.h
index 566864d..c3141e6 100644
--- a/cpukit/libblock/include/rtems/bdpart.h
+++ b/cpukit/libblock/include/rtems/bdpart.h
@@ -79,15 +79,13 @@ extern "C" {
  *  - <a href="http://en.wikipedia.org/wiki/Extended_boot_record">Extended Boot Record</a>
  *  - <a href="http://en.wikipedia.org/wiki/Cylinder-head-sector">Cylinder Head Sector</a>
  *  - <a href="http://www.win.tue.nl/~aeb/partitions/partition_types-1.html">Partition Types</a>
- *
- * @{
  */
+/**@{**/
 
 /**
  * @name MBR Partition Types and Flags
- *
- * @{
  */
+/**@{**/
 
 #define RTEMS_BDPART_MBR_EMPTY 0x0U
 
diff --git a/cpukit/libblock/include/rtems/blkdev.h b/cpukit/libblock/include/rtems/blkdev.h
index fb2dcd4..f934871 100644
--- a/cpukit/libblock/include/rtems/blkdev.h
+++ b/cpukit/libblock/include/rtems/blkdev.h
@@ -36,9 +36,8 @@ extern "C" {
  * control. This call puts IO @ref rtems_blkdev_request "requests" to the block
  * device for asynchronous processing. When a driver executes a request, it
  * invokes the request done callback function to finish the request.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Block device request type.
@@ -175,9 +174,8 @@ static inline void rtems_blkdev_request_done(
 
 /**
  * @name IO Control Request Codes
- *
- * @{
  */
+/**@{**/
 
 #define RTEMS_BLKIO_REQUEST         _IOWR('B', 1, rtems_blkdev_request)
 #define RTEMS_BLKIO_GETMEDIABLKSIZE _IOR('B', 2, uint32_t)
@@ -253,9 +251,8 @@ static inline int rtems_disk_fd_reset_device_stats(int fd)
 
 /**
  * @name Block Device Driver Capabilities
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Only consecutive multi-sector buffer requests are supported.
@@ -369,9 +366,8 @@ void rtems_blkstats(
  * @ingroup rtems_blkdev
  *
  * Generic disk device operations for standard RTEMS IO drivers.
- *
- * @{
  */
+/**@{**/
 
 /**
  * The device driver interface conventions suppose that a driver may contain an
diff --git a/cpukit/libblock/include/rtems/diskdevs.h b/cpukit/libblock/include/rtems/diskdevs.h
index ece629a..3940c57 100644
--- a/cpukit/libblock/include/rtems/diskdevs.h
+++ b/cpukit/libblock/include/rtems/diskdevs.h
@@ -37,9 +37,8 @@ typedef struct rtems_disk_device rtems_disk_device;
  * contain a subset of consecutive disk blocks.  The logical disks are used to
  * represent the partitions of a disk.  The disk devices are accessed via the
  * @ref rtems_bdbuf "block device buffer module".
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Block device block index type.
@@ -276,9 +275,8 @@ struct rtems_disk_device {
 
 /**
  * @name Disk Device Data
- *
- * @{
  */
+/**@{**/
 
 static inline dev_t rtems_disk_get_device_identifier(
   const rtems_disk_device *dd
@@ -340,9 +338,8 @@ static inline rtems_blkdev_bnum rtems_disk_get_block_count(
 
 /**
  * @name Disk Device Maintainance
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Creates a physical disk with device identifier @a dev.
@@ -443,9 +440,8 @@ rtems_status_code rtems_disk_release(rtems_disk_device *dd);
 
 /**
  * @name Disk Management
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Initializes the disk device management.
diff --git a/cpukit/libblock/include/rtems/flashdisk.h b/cpukit/libblock/include/rtems/flashdisk.h
index 4dcdabe..5e4f6a8 100644
--- a/cpukit/libblock/include/rtems/flashdisk.h
+++ b/cpukit/libblock/include/rtems/flashdisk.h
@@ -118,9 +118,8 @@
  *  }
  *  close (fd);
  * @endcode
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief The base name of the flash disks.
diff --git a/cpukit/libblock/include/rtems/media.h b/cpukit/libblock/include/rtems/media.h
index 038357c..d113222 100644
--- a/cpukit/libblock/include/rtems/media.h
+++ b/cpukit/libblock/include/rtems/media.h
@@ -40,8 +40,8 @@ extern "C" {
  * actions.  For example a disk attach will lead to inspection of the partition
  * table and mounted file systems.  Clients can register listeners to react to
  * events.
- * @{
  */
+/**@{**/
 
 #define RTEMS_MEDIA_MOUNT_BASE "/media"
 
@@ -312,9 +312,8 @@ typedef rtems_status_code (*rtems_media_worker)(
 
 /**
  * @name Base
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Initializes the media manager.
@@ -377,9 +376,8 @@ rtems_status_code rtems_media_post_event(
 
 /**
  * @name Server
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Initializes the media manager and media server.
@@ -452,9 +450,8 @@ static inline rtems_status_code rtems_media_server_disk_detach(
 
 /**
  * @name Path Construction
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Creates a new path as "prefix/name-major".
@@ -490,9 +487,8 @@ char *rtems_media_append_minor(
 
 /**
  * @name Support
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Returns the device identifier for the device located at
diff --git a/cpukit/libblock/include/rtems/ramdisk.h b/cpukit/libblock/include/rtems/ramdisk.h
index aaa940b..727efdd 100644
--- a/cpukit/libblock/include/rtems/ramdisk.h
+++ b/cpukit/libblock/include/rtems/ramdisk.h
@@ -25,14 +25,13 @@ extern "C" {
  *
  * @ingroup rtems_blkdev
  *
- * @{
  */
+/**@{**/
 
 /**
  * @name Static Configuration
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief RAM disk configuration table entry.
@@ -95,9 +94,8 @@ rtems_device_driver ramdisk_initialize(
 
 /**
  * @name Runtime Configuration
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief RAM disk descriptor.
diff --git a/cpukit/libblock/include/rtems/sparse-disk.h b/cpukit/libblock/include/rtems/sparse-disk.h
index 3dc806b..3f2e41c 100644
--- a/cpukit/libblock/include/rtems/sparse-disk.h
+++ b/cpukit/libblock/include/rtems/sparse-disk.h
@@ -37,8 +37,8 @@ extern "C" {
  *
  * @ingroup rtems_blkdev
  *
- * @{
  */
+/**@{**/
 
 typedef struct {
   rtems_blkdev_bnum  block;
diff --git a/cpukit/libcsupport/include/rtc.h b/cpukit/libcsupport/include/rtc.h
index 29ef4cd..36965ce 100644
--- a/cpukit/libcsupport/include/rtc.h
+++ b/cpukit/libcsupport/include/rtc.h
@@ -29,9 +29,8 @@ extern "C" {
  *
  * This driver interface provides support to read and set the real-time clock
  * and to initialize the time of day for the system.
- *
- * @{
  */
+/**@{**/
 
 /**
  * Device file name path.
diff --git a/cpukit/libcsupport/include/rtems/libcsupport.h b/cpukit/libcsupport/include/rtems/libcsupport.h
index 46a1ec4..582e16b 100644
--- a/cpukit/libcsupport/include/rtems/libcsupport.h
+++ b/cpukit/libcsupport/include/rtems/libcsupport.h
@@ -34,8 +34,8 @@ extern "C" {
  *
  * @brief RTEMS Specific Support for the Standard C Library
  *
- * @{
  */
+/**@{**/
 
 extern void malloc_dump(void);
 
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h
index e7d34b6..51e25c9 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/cpukit/libcsupport/include/rtems/libio.h
@@ -47,9 +47,8 @@ extern "C" {
  * @ingroup LibIO
  *
  * @brief File system operations.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief File system node types.
@@ -749,9 +748,8 @@ int rtems_filesystem_default_statvfs(
  * @ingroup LibIO
  *
  * @brief File system node handler.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Opens a node.
@@ -1143,9 +1141,8 @@ int rtems_filesystem_default_fcntl(
  * system call behavior under RTEMS.  Initially this supported only
  * IO to devices but has since been enhanced to support networking
  * and support for mounted file systems.
- *
- * @{
  */
+/**@{**/
 
 typedef off_t rtems_off64_t __attribute__((deprecated));
 
@@ -1240,9 +1237,8 @@ typedef struct {
 
 /**
  * @name Flag Values
- *
- * @{
  */
+/**@{**/
 
 #define LIBIO_FLAGS_NO_DELAY      0x0001U  /* return immediately if no data */
 #define LIBIO_FLAGS_READ          0x0002U  /* reading */
@@ -1264,9 +1260,8 @@ void rtems_libio_init(void);
 
 /**
  * @name External I/O Handlers
- *
- * @{
  */
+/**@{**/
 
 typedef int (*rtems_libio_open_t)(
   const char  *pathname,
@@ -1306,9 +1301,8 @@ typedef off_t (*rtems_libio_lseek_t)(
 
 /**
  * @name Permission Macros
- *
- * @{
  */
+/**@{**/
 
 /*
  *  The following macros are used to build up the permissions sets
@@ -1422,15 +1416,13 @@ extern int rtems_mkdir(const char *path, mode_t mode);
  * @ingroup LibIO
  *
  * @brief File system types and mount.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @name File System Types
- *
- * @{
  */
+/**@{**/
 
 #define RTEMS_FILESYSTEM_TYPE_IMFS "imfs"
 #define RTEMS_FILESYSTEM_TYPE_MINIIMFS "mimfs"
@@ -1701,9 +1693,8 @@ extern const rtems_filesystem_mount_configuration
  * @ingroup LibIO
  *
  * @brief Termios
- *
- * @{
  */
+/**@{**/
 
 typedef struct rtems_termios_callbacks {
   int    (*firstOpen)(int major, int minor, void *arg);
diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/cpukit/libcsupport/include/rtems/libio_.h
index 4a2d0f4..1f7f654 100644
--- a/cpukit/libcsupport/include/rtems/libio_.h
+++ b/cpukit/libcsupport/include/rtems/libio_.h
@@ -36,8 +36,8 @@ extern "C" {
  *
  * @brief Internal IO library API and implementation.
  *
- * @{
  */
+/**@{**/
 
 #define RTEMS_FILESYSTEM_SYMLOOP_MAX 32
 
diff --git a/cpukit/libcsupport/include/sys/termios.h b/cpukit/libcsupport/include/sys/termios.h
index 5b96814..93c3a25 100644
--- a/cpukit/libcsupport/include/sys/termios.h
+++ b/cpukit/libcsupport/include/sys/termios.h
@@ -31,8 +31,8 @@ extern "C" {
  *
  * @brief POSIX Termios Implementation
  * 
- * @{
  */
+/**@{**/
 
 typedef unsigned char	cc_t;
 typedef unsigned int	speed_t;
diff --git a/cpukit/libcsupport/src/lstat.c b/cpukit/libcsupport/src/lstat.c
index abdc046..66a333d 100644
--- a/cpukit/libcsupport/src/lstat.c
+++ b/cpukit/libcsupport/src/lstat.c
@@ -26,4 +26,4 @@
 
 /**
  *  BSD 4.3 and SVR4 - Get File Status
- */
\ No newline at end of file
+ */
diff --git a/cpukit/libfs/src/dosfs/dosfs.h b/cpukit/libfs/src/dosfs/dosfs.h
index 79560bb..211fc2d 100644
--- a/cpukit/libfs/src/dosfs/dosfs.h
+++ b/cpukit/libfs/src/dosfs/dosfs.h
@@ -33,8 +33,8 @@ int rtems_dosfs_initialize(rtems_filesystem_mount_table_entry_t *mt_entry,
  *
  * @ingroup FileSystemTypesAndMount
  *
- * @{
  */
+/**@{**/
 
 #define MSDOS_FMT_INFO_LEVEL_NONE   (0)
 #define MSDOS_FMT_INFO_LEVEL_INFO   (1)
diff --git a/cpukit/libi2c/libi2c.h b/cpukit/libi2c/libi2c.h
index 8c2f072..1432746 100644
--- a/cpukit/libi2c/libi2c.h
+++ b/cpukit/libi2c/libi2c.h
@@ -67,8 +67,8 @@ extern "C" {
  *
  * @brief I2C library.
  *
- * @{
  */
+/**@{**/
 
 /* Simple I2C driver API */
 
diff --git a/cpukit/libmisc/fsmount/fsmount.h b/cpukit/libmisc/fsmount/fsmount.h
index b824774..70c0594 100644
--- a/cpukit/libmisc/fsmount/fsmount.h
+++ b/cpukit/libmisc/fsmount/fsmount.h
@@ -64,8 +64,8 @@ extern "C" {
  *
  * @ingroup FileSystemTypesAndMount
  *
- * @{
  */
+/**@{**/
 
 /**
  * File system mount report and abort condition flags.
diff --git a/cpukit/libnetworking/rtems/ftpfs.h b/cpukit/libnetworking/rtems/ftpfs.h
index 8b1de3c..28ce55c 100644
--- a/cpukit/libnetworking/rtems/ftpfs.h
+++ b/cpukit/libnetworking/rtems/ftpfs.h
@@ -70,9 +70,8 @@ extern "C" {
  *
  * For the data transfer passive (= default) and active (= fallback) mode are
  * supported.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Well-known port number for FTP control connection.
diff --git a/cpukit/posix/include/aio.h b/cpukit/posix/include/aio.h
index f43e088..8896fa1 100644
--- a/cpukit/posix/include/aio.h
+++ b/cpukit/posix/include/aio.h
@@ -32,8 +32,8 @@ extern "C" {
  *
  * @brief POSIX Asynchronous Input and Output
  * 
- * @{
  */
+/**@{**/
 
 #if defined(_POSIX_ASYNCHRONOUS_IO)
 
diff --git a/cpukit/posix/include/mqueue.h b/cpukit/posix/include/mqueue.h
index 2c22854..34a6065 100644
--- a/cpukit/posix/include/mqueue.h
+++ b/cpukit/posix/include/mqueue.h
@@ -45,8 +45,8 @@
  *
  * @ingroup POSIXAPI
  * 
- * @{
  */
+/**@{**/
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/posix/include/rtems/posix/barrier.h b/cpukit/posix/include/rtems/posix/barrier.h
index 41a297e..73c63f7 100644
--- a/cpukit/posix/include/rtems/posix/barrier.h
+++ b/cpukit/posix/include/rtems/posix/barrier.h
@@ -33,8 +33,8 @@
  * This encapsulates functionality which implements the RTEMS API
  * Barrier Manager.
  * 
- * @{
  */
+/**@{**/
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/posix/include/rtems/posix/cond.h b/cpukit/posix/include/rtems/posix/cond.h
index 2bd0260..8ff34e0 100644
--- a/cpukit/posix/include/rtems/posix/cond.h
+++ b/cpukit/posix/include/rtems/posix/cond.h
@@ -24,8 +24,8 @@
  *
  * @ingroup POSIXAPI
  * 
- * @{
  */
+/**@{**/
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/cpukit/posix/include/rtems/posix/key.h b/cpukit/posix/include/rtems/posix/key.h
index bd92a01..0bb1dbe 100644
--- a/cpukit/posix/include/rtems/posix/key.h
+++ b/cpukit/posix/include/rtems/posix/key.h
@@ -26,8 +26,8 @@
  *
  * @ingroup POSIXAPI
  * 
- * @{
  */
+/**@{**/
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/posix/include/rtems/posix/mqueue.h b/cpukit/posix/include/rtems/posix/mqueue.h
index 1b24098..d6f370c 100644
--- a/cpukit/posix/include/rtems/posix/mqueue.h
+++ b/cpukit/posix/include/rtems/posix/mqueue.h
@@ -42,8 +42,8 @@
  *
  *  @ingroup POSIXAPI
  * 
- * @{
  */
+/**@{**/
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/cpukit/posix/include/rtems/posix/mutex.h b/cpukit/posix/include/rtems/posix/mutex.h
index a84ed7e..f228644 100644
--- a/cpukit/posix/include/rtems/posix/mutex.h
+++ b/cpukit/posix/include/rtems/posix/mutex.h
@@ -30,8 +30,8 @@ extern "C" {
  *
  * @brief Private Support Information for POSIX Mutex
  * 
- * @{
  */
+/**@{**/
 
 #include <rtems/score/coremutex.h>
 #include <pthread.h>
diff --git a/cpukit/posix/include/rtems/posix/posixapi.h b/cpukit/posix/include/rtems/posix/posixapi.h
index 7092d1e..6ae5dfa 100644
--- a/cpukit/posix/include/rtems/posix/posixapi.h
+++ b/cpukit/posix/include/rtems/posix/posixapi.h
@@ -27,8 +27,8 @@
  *
  * RTEMS POSIX API definitions and modules.
  *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Initialize POSIX API.
diff --git a/cpukit/posix/include/rtems/posix/priority.h b/cpukit/posix/include/rtems/posix/priority.h
index cf47ed0..e9ee2f9 100644
--- a/cpukit/posix/include/rtems/posix/priority.h
+++ b/cpukit/posix/include/rtems/posix/priority.h
@@ -26,8 +26,8 @@
  *
  * @brief Interface to the POSIX Priority Implementation
  * 
- * @{
  */
+/**@{**/
 
 #include <rtems/score/priority.h>
 
diff --git a/cpukit/posix/include/rtems/posix/psignalimpl.h b/cpukit/posix/include/rtems/posix/psignalimpl.h
index 6db7948..481a7ea 100644
--- a/cpukit/posix/include/rtems/posix/psignalimpl.h
+++ b/cpukit/posix/include/rtems/posix/psignalimpl.h
@@ -25,8 +25,8 @@
  *
  * @brief Internal Information about POSIX Signals
  * 
- * @{
  */
+/**@{**/
 
 #include <rtems/posix/psignal.h>
 #include <rtems/posix/pthread.h>
diff --git a/cpukit/posix/include/rtems/posix/pthread.h b/cpukit/posix/include/rtems/posix/pthread.h
index 7037adc..5250b70 100644
--- a/cpukit/posix/include/rtems/posix/pthread.h
+++ b/cpukit/posix/include/rtems/posix/pthread.h
@@ -34,8 +34,8 @@ extern "C" {
  *
  * @brief Private Support Information for POSIX Threads
  * 
- * @{
  */
+/**@{**/
 
 /**
  * The following sets the minimum stack size for POSIX threads.
diff --git a/cpukit/posix/include/rtems/posix/ptimer.h b/cpukit/posix/include/rtems/posix/ptimer.h
index 9f6122a..e06b1e9 100644
--- a/cpukit/posix/include/rtems/posix/ptimer.h
+++ b/cpukit/posix/include/rtems/posix/ptimer.h
@@ -27,8 +27,8 @@
  *
  * @ingroup POSIXAPI
  * 
- * @{
  */
+/**@{**/
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/cpukit/posix/include/rtems/posix/rwlock.h b/cpukit/posix/include/rtems/posix/rwlock.h
index 0dbd268..0cfd20d 100644
--- a/cpukit/posix/include/rtems/posix/rwlock.h
+++ b/cpukit/posix/include/rtems/posix/rwlock.h
@@ -36,8 +36,8 @@ extern "C" {
  *
  * @brief Constants and Structures Associated with the POSIX RWLock Manager
  * 
- * @{
  */
+/**@{**/
 
 #include <rtems/score/object.h>
 #include <rtems/score/corerwlock.h>
diff --git a/cpukit/posix/include/rtems/posix/spinlock.h b/cpukit/posix/include/rtems/posix/spinlock.h
index c8af7fa..34b04eb 100644
--- a/cpukit/posix/include/rtems/posix/spinlock.h
+++ b/cpukit/posix/include/rtems/posix/spinlock.h
@@ -36,8 +36,8 @@ extern "C" {
  *
  * @brief Constants and Structures Associated with the POSIX Spinlock Manager
  * 
- * @{
  */
+/**@{**/
 
 #include <rtems/score/object.h>
 #include <rtems/score/corespinlock.h>
diff --git a/cpukit/posix/include/rtems/posix/threadsup.h b/cpukit/posix/include/rtems/posix/threadsup.h
index 72fa1d3..80f64dc 100644
--- a/cpukit/posix/include/rtems/posix/threadsup.h
+++ b/cpukit/posix/include/rtems/posix/threadsup.h
@@ -27,8 +27,8 @@
  *
  *  @ingroup POSIXAPI
  * 
- * @{
  */
+/**@{**/
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/cpukit/posix/include/rtems/posix/time.h b/cpukit/posix/include/rtems/posix/time.h
index f5e55a5..735082e 100644
--- a/cpukit/posix/include/rtems/posix/time.h
+++ b/cpukit/posix/include/rtems/posix/time.h
@@ -26,8 +26,8 @@
  *
  * @ingroup POSIXAPI
  * 
- * @{
  */
+/**@{**/
 
 /**
  * @brief Absolute timeout conversion results.
diff --git a/cpukit/rtems/include/rtems/rtems/event.h b/cpukit/rtems/include/rtems/rtems/event.h
index b1599a8..6a27c91 100644
--- a/cpukit/rtems/include/rtems/rtems/event.h
+++ b/cpukit/rtems/include/rtems/rtems/event.h
@@ -223,9 +223,8 @@ rtems_status_code rtems_event_receive (
  * The event @ref RTEMS_EVENT_SYSTEM_TRANSIENT is used for transient usage.
  * See also @ref ClassicEventTransient.  This event may be used by every entity
  * that fulfils its usage pattern.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Reserved system event for network SBWAIT usage.
@@ -367,9 +366,8 @@ rtems_status_code rtems_event_system_receive(
  *   assert(req.work_done);
  * }
  * @endcode
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief See rtems_event_system_send().
diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/cpukit/rtems/include/rtems/rtems/support.h
index 75f5069..c9fbbdc 100644
--- a/cpukit/rtems/include/rtems/rtems/support.h
+++ b/cpukit/rtems/include/rtems/rtems/support.h
@@ -26,9 +26,8 @@ extern "C" {
 
 /**
  * @addtogroup ClassicRTEMS
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Returns the number of micro seconds for the milli seconds value @a _ms.
@@ -57,9 +56,8 @@ extern "C" {
  * @ingroup ClassicRTEMS
  *
  * Workspace definitions.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Gets Workspace Information
diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h
index e70441a..f9861aa 100644
--- a/cpukit/rtems/include/rtems/rtems/types.h
+++ b/cpukit/rtems/include/rtems/rtems/types.h
@@ -40,9 +40,8 @@ extern "C" {
 
 /**
  * @addtogroup ClassicRTEMS
- *
- * @{
  */
+/**@{**/
 
 #ifdef RTEMS_DEPRECATED_TYPES
 /**
diff --git a/cpukit/rtems/inline/rtems/rtems/region.inl b/cpukit/rtems/inline/rtems/rtems/region.inl
index d63ad1c..30e482c 100644
--- a/cpukit/rtems/inline/rtems/rtems/region.inl
+++ b/cpukit/rtems/inline/rtems/rtems/region.inl
@@ -1,7 +1,7 @@
 /**
  * @file rtems/rtems/region.inl
  *
- * @defgroup ClassicRegion 
+ * @addtogroup ClassicRegion 
  *
  * @ingroup ClassicRTEMS
  * @brief Macro Implementation from Region Manager
diff --git a/cpukit/rtems/inline/rtems/rtems/support.inl b/cpukit/rtems/inline/rtems/rtems/support.inl
index 117f9a9..a302c45 100644
--- a/cpukit/rtems/inline/rtems/rtems/support.inl
+++ b/cpukit/rtems/inline/rtems/rtems/support.inl
@@ -23,9 +23,8 @@
 
 /**
  * @addtogroup ClassicRTEMS
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Returns @c true if the name is valid, and @c false otherwise.
diff --git a/cpukit/sapi/include/rtems/chain.h b/cpukit/sapi/include/rtems/chain.h
index e1644ac..41b3154 100644
--- a/cpukit/sapi/include/rtems/chain.h
+++ b/cpukit/sapi/include/rtems/chain.h
@@ -32,9 +32,8 @@ extern "C" {
  * @ingroup ClassicRTEMS
  *
  * @brief Chain API
- *
- * @{
  */
+/**@{**/
 
 typedef Chain_Node rtems_chain_node;
 
@@ -58,9 +57,8 @@ typedef Chain_Control rtems_chain_control;
 
 /**
  * @addtogroup ClassicChains
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Appends the @a node to the @a chain and sends the @a events to the
diff --git a/cpukit/sapi/include/rtems/extension.h b/cpukit/sapi/include/rtems/extension.h
index d57646c..d4f7fde 100644
--- a/cpukit/sapi/include/rtems/extension.h
+++ b/cpukit/sapi/include/rtems/extension.h
@@ -170,9 +170,8 @@ typedef User_extensions_routine
  * will operate correctly even if they utilize the C Library because the C
  * Library's task delete extension is invoked after that of the other
  * extensions.
- *
- * @{
  */
+/**@{**/
 
 typedef User_extensions_thread_create_extension   rtems_task_create_extension;
 typedef User_extensions_thread_delete_extension   rtems_task_delete_extension;
diff --git a/cpukit/sapi/include/rtems/fatal.h b/cpukit/sapi/include/rtems/fatal.h
index 7ef9f71..6623646 100644
--- a/cpukit/sapi/include/rtems/fatal.h
+++ b/cpukit/sapi/include/rtems/fatal.h
@@ -30,9 +30,8 @@ extern "C" {
  *
  * @brief The Fatal Manager provides functions for fatal system states and or
  * irrecoverable errors.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Exception frame.
diff --git a/cpukit/sapi/include/rtems/io.h b/cpukit/sapi/include/rtems/io.h
index 6901d84..e598ca3 100644
--- a/cpukit/sapi/include/rtems/io.h
+++ b/cpukit/sapi/include/rtems/io.h
@@ -34,8 +34,8 @@ extern "C" {
  *
  * @ingroup ClassicRTEMS
  *
- * @{
  */
+/**@{**/
 
 typedef uint32_t rtems_device_major_number;
 
@@ -60,9 +60,8 @@ typedef struct {
 
 /**
  * @name Device Driver Maintainance
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Returns @c RTEMS_IO_ERROR.
diff --git a/cpukit/sapi/inline/rtems/chain.inl b/cpukit/sapi/inline/rtems/chain.inl
index bf98f98..3fa0376 100644
--- a/cpukit/sapi/inline/rtems/chain.inl
+++ b/cpukit/sapi/inline/rtems/chain.inl
@@ -26,9 +26,8 @@
 
 /**
  * @addtogroup ClassicChains
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Initialize a chain Header.
diff --git a/cpukit/sapi/inline/rtems/timespec.inl b/cpukit/sapi/inline/rtems/timespec.inl
index 659c39f..d8fc5f6 100644
--- a/cpukit/sapi/inline/rtems/timespec.inl
+++ b/cpukit/sapi/inline/rtems/timespec.inl
@@ -24,9 +24,8 @@
 
 /**
  * @addtogroup TimespecAPI Timespec
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Is timespec valid
diff --git a/cpukit/score/cpu/arm/rtems/asm.h b/cpukit/score/cpu/arm/rtems/asm.h
index affb2e8..e000928 100644
--- a/cpukit/score/cpu/arm/rtems/asm.h
+++ b/cpukit/score/cpu/arm/rtems/asm.h
@@ -50,9 +50,8 @@
  * @ingroup ScoreCPU
  *
  * @brief ARM Assembler Support
- *
- * @{
  */
+/**@{**/
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/rtems/score/arm.h
index 96652fa..8f8c837 100644
--- a/cpukit/score/cpu/arm/rtems/score/arm.h
+++ b/cpukit/score/cpu/arm/rtems/score/arm.h
@@ -26,9 +26,8 @@ extern "C" {
 
 /**
  * @addtogroup ScoreCPU
- *
- * @{
  */
+/**@{**/
 
 /*
  *  This file contains the information required to build
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h
index 1893844..bbcded6 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu.h
@@ -40,9 +40,8 @@
  * @ingroup ScoreCPU
  *
  * @brief ARM specific support.
- *
- * @{
  */
+/**@{**/
 
 #ifdef __thumb__
   #define ARM_SWITCH_REGISTERS uint32_t arm_switch_reg
@@ -60,9 +59,8 @@
 
 /**
  * @name Program Status Register
- *
- * @{
  */
+/**@{**/
 
 #define ARM_PSR_N (1 << 31)
 #define ARM_PSR_Z (1 << 30)
@@ -95,9 +93,8 @@
 
 /**
  * @addtogroup ScoreCPU
- *
- * @{
  */
+/**@{**/
 
 /* If someone uses THUMB we assume she wants minimal code size */
 #ifdef __thumb__
@@ -225,9 +222,8 @@ extern "C" {
 
 /**
  * @addtogroup ScoreCPU
- *
- * @{
  */
+/**@{**/
 
 typedef struct {
 #if defined(ARM_MULTILIB_ARCH_V4)
@@ -480,9 +476,8 @@ static inline uint16_t CPU_swap_u16( uint16_t value )
 
 /**
  * @addtogroup ScoreCPUARM
- *
- * @{
  */
+/**@{**/
 
 #if defined(ARM_MULTILIB_ARCH_V4)
 
diff --git a/cpukit/score/cpu/arm/rtems/score/types.h b/cpukit/score/cpu/arm/rtems/score/types.h
index 8b4b7f9..8e71953 100644
--- a/cpukit/score/cpu/arm/rtems/score/types.h
+++ b/cpukit/score/cpu/arm/rtems/score/types.h
@@ -30,9 +30,8 @@ extern "C" {
 
 /**
  * @addtogroup ScoreCPU
- *
- * @{
  */
+/**@{**/
 
 /*
  *  This section defines the basic types for this processor.
diff --git a/cpukit/score/cpu/avr/avr/delay.h b/cpukit/score/cpu/avr/avr/delay.h
index d3a05a9..ad9db10 100644
--- a/cpukit/score/cpu/avr/avr/delay.h
+++ b/cpukit/score/cpu/avr/avr/delay.h
@@ -45,8 +45,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #warning "This file has been moved to <util/delay.h>."
 #include <util/delay.h>
diff --git a/cpukit/score/cpu/avr/avr/io.h b/cpukit/score/cpu/avr/avr/io.h
index 494b40f..22ac57d 100644
--- a/cpukit/score/cpu/avr/avr/io.h
+++ b/cpukit/score/cpu/avr/avr/io.h
@@ -101,8 +101,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #include <avr/sfr_defs.h>
 
diff --git a/cpukit/score/cpu/avr/avr/io2333.h b/cpukit/score/cpu/avr/avr/io2333.h
index 5c25ccc..63c7fab 100644
--- a/cpukit/score/cpu/avr/avr/io2333.h
+++ b/cpukit/score/cpu/avr/avr/io2333.h
@@ -49,8 +49,8 @@
 /**
  * @name I/O Registers
  * 
- * @{
  */
+/**@{**/
 /* UART Baud Rate Register high */
 #define UBRRH	_SFR_IO8(0x03)
 
@@ -179,8 +179,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 /* External Interrupt 0 */
 #define INT0_vect			_VECTOR(1)
 #define SIG_INTERRUPT0			_VECTOR(1)
@@ -445,8 +445,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define    RAMEND   0xDF    /*Last On-Chip SRAM location*/
 #define    XRAMEND  RAMEND
 #define    E2END    0x7F
diff --git a/cpukit/score/cpu/avr/avr/io43u35x.h b/cpukit/score/cpu/avr/avr/io43u35x.h
index 21b0d9f..66a06d8 100644
--- a/cpukit/score/cpu/avr/avr/io43u35x.h
+++ b/cpukit/score/cpu/avr/avr/io43u35x.h
@@ -49,8 +49,8 @@
 /**
  * @name I/O Registers
  * 
- * @{
  */
+/**@{**/
 /* ADC Data Register */
 #ifndef __ASSEMBLER__
 #define ADC 	_SFR_IO16(0x02)
@@ -187,8 +187,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 #define SIG_INTERRUPT0		_VECTOR(1)  /* suspend/resume */
 #define SIG_INTERRUPT1		_VECTOR(2)
 #define SIG_TIMER1_CAPT1	_VECTOR(3)
@@ -429,8 +429,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define    RAMEND   0x045F     /*Last On-Chip SRAM Location*/
 #define    XRAMEND  RAMEND
 #define    E2END    0x0000
diff --git a/cpukit/score/cpu/avr/avr/io4414.h b/cpukit/score/cpu/avr/avr/io4414.h
index 94460a4..96c4000 100644
--- a/cpukit/score/cpu/avr/avr/io4414.h
+++ b/cpukit/score/cpu/avr/avr/io4414.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/io76c711.h b/cpukit/score/cpu/avr/avr/io76c711.h
index f469076..e0c68e2 100644
--- a/cpukit/score/cpu/avr/avr/io76c711.h
+++ b/cpukit/score/cpu/avr/avr/io76c711.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/io8534.h b/cpukit/score/cpu/avr/avr/io8534.h
index 10e20b3..c873a71 100644
--- a/cpukit/score/cpu/avr/avr/io8534.h
+++ b/cpukit/score/cpu/avr/avr/io8534.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/io8535.h b/cpukit/score/cpu/avr/avr/io8535.h
index 6883a36..cf31f00 100644
--- a/cpukit/score/cpu/avr/avr/io8535.h
+++ b/cpukit/score/cpu/avr/avr/io8535.h
@@ -56,8 +56,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/io90pwm1.h b/cpukit/score/cpu/avr/avr/io90pwm1.h
index d893fd9..6c3aad0 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm1.h
+++ b/cpukit/score/cpu/avr/avr/io90pwm1.h
@@ -60,8 +60,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/io90pwm216.h b/cpukit/score/cpu/avr/avr/io90pwm216.h
index 7a53cf0..c6befa4 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm216.h
+++ b/cpukit/score/cpu/avr/avr/io90pwm216.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/io90pwm2b.h b/cpukit/score/cpu/avr/avr/io90pwm2b.h
index 538028b..22d0c1c 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm2b.h
+++ b/cpukit/score/cpu/avr/avr/io90pwm2b.h
@@ -57,8 +57,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/io90pwm3b.h b/cpukit/score/cpu/avr/avr/io90pwm3b.h
index 7885ec9..5b1a753 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm3b.h
+++ b/cpukit/score/cpu/avr/avr/io90pwm3b.h
@@ -61,8 +61,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/io90pwm81.h b/cpukit/score/cpu/avr/avr/io90pwm81.h
index 753c94e..b2faea8 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm81.h
+++ b/cpukit/score/cpu/avr/avr/io90pwm81.h
@@ -56,8 +56,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #ifndef _AVR_AT90PWM81_H_
 #define _AVR_AT90PWM81_H_ 1
diff --git a/cpukit/score/cpu/avr/avr/io90pwmx.h b/cpukit/score/cpu/avr/avr/io90pwmx.h
index 1367424..b66b65c 100644
--- a/cpukit/score/cpu/avr/avr/io90pwmx.h
+++ b/cpukit/score/cpu/avr/avr/io90pwmx.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/ioa6289.h b/cpukit/score/cpu/avr/avr/ioa6289.h
index f6a829b..d51e3a9 100644
--- a/cpukit/score/cpu/avr/avr/ioa6289.h
+++ b/cpukit/score/cpu/avr/avr/ioa6289.h
@@ -57,8 +57,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers. */
 
diff --git a/cpukit/score/cpu/avr/avr/iocan32.h b/cpukit/score/cpu/avr/avr/iocan32.h
index d2c4f83..512b45d 100644
--- a/cpukit/score/cpu/avr/avr/iocan32.h
+++ b/cpukit/score/cpu/avr/avr/iocan32.h
@@ -46,8 +46,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #include <avr/iocanxx.h>
 
diff --git a/cpukit/score/cpu/avr/avr/iom103.h b/cpukit/score/cpu/avr/avr/iom103.h
index fb92877..6ca791b 100644
--- a/cpukit/score/cpu/avr/avr/iom103.h
+++ b/cpukit/score/cpu/avr/avr/iom103.h
@@ -56,8 +56,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/iom1280.h b/cpukit/score/cpu/avr/avr/iom1280.h
index 933e709..a6aff36 100644
--- a/cpukit/score/cpu/avr/avr/iom1280.h
+++ b/cpukit/score/cpu/avr/avr/iom1280.h
@@ -47,8 +47,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Constants */
 #define SPM_PAGESIZE    256
diff --git a/cpukit/score/cpu/avr/avr/iom164.h b/cpukit/score/cpu/avr/avr/iom164.h
index f9607d8..160663d 100644
--- a/cpukit/score/cpu/avr/avr/iom164.h
+++ b/cpukit/score/cpu/avr/avr/iom164.h
@@ -47,8 +47,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Constants */
 #define SPM_PAGESIZE    128
diff --git a/cpukit/score/cpu/avr/avr/iom165.h b/cpukit/score/cpu/avr/avr/iom165.h
index f165d6b..72cbc39 100644
--- a/cpukit/score/cpu/avr/avr/iom165.h
+++ b/cpukit/score/cpu/avr/avr/iom165.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/iom169.h b/cpukit/score/cpu/avr/avr/iom169.h
index d99eaa8..64910dd 100644
--- a/cpukit/score/cpu/avr/avr/iom169.h
+++ b/cpukit/score/cpu/avr/avr/iom169.h
@@ -63,8 +63,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/iom169p.h b/cpukit/score/cpu/avr/avr/iom169p.h
index 66427ce..3d7995a 100644
--- a/cpukit/score/cpu/avr/avr/iom169p.h
+++ b/cpukit/score/cpu/avr/avr/iom169p.h
@@ -62,8 +62,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/iom169pa.h b/cpukit/score/cpu/avr/avr/iom169pa.h
index f9a165b..4f457db 100644
--- a/cpukit/score/cpu/avr/avr/iom169pa.h
+++ b/cpukit/score/cpu/avr/avr/iom169pa.h
@@ -53,8 +53,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #ifndef _AVR_ATmega169PA_H_
 #define _AVR_ATmega169PA_H_ 1
diff --git a/cpukit/score/cpu/avr/avr/iom16a.h b/cpukit/score/cpu/avr/avr/iom16a.h
index 155b1e8..ddfb220 100644
--- a/cpukit/score/cpu/avr/avr/iom16a.h
+++ b/cpukit/score/cpu/avr/avr/iom16a.h
@@ -50,8 +50,8 @@
 /**
  * @name Registers and Associated Bit Numbers
  * 
- * @{
  */
+/**@{**/
 #define TWBR _SFR_IO8(0x00)
 #define TWBR0 0
 #define TWBR1 1
@@ -661,8 +661,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 /* Vector 0 is the reset vector */
 #define INT0_vect_num  1
 #define INT0_vect      _VECTOR(1)  /* External Interrupt Request 0 */
@@ -714,8 +714,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define SPM_PAGESIZE (128)
 #define RAMSTART     (0x60)
 #define RAMSIZE      (1024)
@@ -731,8 +731,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 2
 
 /* Low Fuse Byte */
@@ -765,8 +765,8 @@
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 #define __BOOT_LOCK_BITS_0_EXIST
 #define __BOOT_LOCK_BITS_1_EXIST
@@ -775,8 +775,8 @@
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x94
 #define SIGNATURE_2 0x03
@@ -785,8 +785,8 @@
 /**
  * @name Device Pin Definitions
  * 
- * @{
  */
+/**@{**/
 #define MOSI_DDR   DDRB
 #define MOSI_PORT  PORTB
 #define MOSI_PIN   PINB
diff --git a/cpukit/score/cpu/avr/avr/iom16hva.h b/cpukit/score/cpu/avr/avr/iom16hva.h
index 3c5c2f5..7dcad90 100644
--- a/cpukit/score/cpu/avr/avr/iom16hva.h
+++ b/cpukit/score/cpu/avr/avr/iom16hva.h
@@ -47,8 +47,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Constants */
 #define SPM_PAGESIZE 128
diff --git a/cpukit/score/cpu/avr/avr/iom2560.h b/cpukit/score/cpu/avr/avr/iom2560.h
index 9105167..461f936 100644
--- a/cpukit/score/cpu/avr/avr/iom2560.h
+++ b/cpukit/score/cpu/avr/avr/iom2560.h
@@ -39,8 +39,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define SPM_PAGESIZE    256
 #define RAMEND          0x21FF
 #define XRAMEND         0xFFFF
@@ -52,8 +52,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 3
 
 /* Low Fuse Byte */
@@ -89,8 +89,8 @@
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 #define __BOOT_LOCK_BITS_0_EXIST
 #define __BOOT_LOCK_BITS_1_EXIST 
@@ -99,8 +99,8 @@
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x98
 #define SIGNATURE_2 0x01
diff --git a/cpukit/score/cpu/avr/avr/iom325.h b/cpukit/score/cpu/avr/avr/iom325.h
index 2427c95..7d4f582 100644
--- a/cpukit/score/cpu/avr/avr/iom325.h
+++ b/cpukit/score/cpu/avr/avr/iom325.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/iom3250.h b/cpukit/score/cpu/avr/avr/iom3250.h
index 83721e5..6c3cb35 100644
--- a/cpukit/score/cpu/avr/avr/iom3250.h
+++ b/cpukit/score/cpu/avr/avr/iom3250.h
@@ -49,8 +49,8 @@
 /**
  * @name Registers and Associated Bit Numbers
  * 
- * @{
  */
+/**@{**/
 #define PINA    _SFR_IO8(0x00)
 #define PINA7   7
 #define PINA6   6
@@ -762,8 +762,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 /* Vector 0 is the reset vector */
 /* External Interrupt Request 0 */
 #define INT0_vect			_VECTOR(1)
@@ -866,8 +866,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define SPM_PAGESIZE    128
 #define RAMEND          0x8FF
 #define XRAMEND         RAMEND
@@ -879,8 +879,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 3
 
 /* Low Fuse Byte */
@@ -916,8 +916,8 @@
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 #define __BOOT_LOCK_BITS_0_EXIST
 #define __BOOT_LOCK_BITS_1_EXIST 
@@ -926,8 +926,8 @@
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x95
 #define SIGNATURE_2 0x06
diff --git a/cpukit/score/cpu/avr/avr/iom328p.h b/cpukit/score/cpu/avr/avr/iom328p.h
index 9436f4a..b2bb6b5 100644
--- a/cpukit/score/cpu/avr/avr/iom328p.h
+++ b/cpukit/score/cpu/avr/avr/iom328p.h
@@ -61,8 +61,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/iom329.h b/cpukit/score/cpu/avr/avr/iom329.h
index 6ce3417..a7b5efd 100644
--- a/cpukit/score/cpu/avr/avr/iom329.h
+++ b/cpukit/score/cpu/avr/avr/iom329.h
@@ -49,8 +49,8 @@
 /**
  * @name Registers and Associated Bit Numbers
  * 
- * @{
  */
+/**@{**/
 #define PINA    _SFR_IO8(0x00)
 #define PINA7   7
 #define PINA6   6
@@ -863,8 +863,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 /* Vector 0 is the reset vector */
 /* External Interrupt Request 0 */
 #define INT0_vect			_VECTOR(1)
@@ -960,8 +960,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define SPM_PAGESIZE    128
 #define RAMEND          0x8FF
 #define XRAMEND         RAMEND
@@ -973,8 +973,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 3
 
 /* Low Fuse Byte */
@@ -1011,8 +1011,8 @@
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 #define __BOOT_LOCK_BITS_0_EXIST
 #define __BOOT_LOCK_BITS_1_EXIST 
@@ -1021,8 +1021,8 @@
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x95
 #define SIGNATURE_2 0x03
diff --git a/cpukit/score/cpu/avr/avr/iom3290.h b/cpukit/score/cpu/avr/avr/iom3290.h
index 9dea540..f349821 100644
--- a/cpukit/score/cpu/avr/avr/iom3290.h
+++ b/cpukit/score/cpu/avr/avr/iom3290.h
@@ -57,8 +57,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/iom32c1.h b/cpukit/score/cpu/avr/avr/iom32c1.h
index fa771e4..a0d4017 100644
--- a/cpukit/score/cpu/avr/avr/iom32c1.h
+++ b/cpukit/score/cpu/avr/avr/iom32c1.h
@@ -57,8 +57,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers. */
 
diff --git a/cpukit/score/cpu/avr/avr/iom32m1.h b/cpukit/score/cpu/avr/avr/iom32m1.h
index 2b28882..f8bf883 100644
--- a/cpukit/score/cpu/avr/avr/iom32m1.h
+++ b/cpukit/score/cpu/avr/avr/iom32m1.h
@@ -57,8 +57,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers. */
 
diff --git a/cpukit/score/cpu/avr/avr/iom32u2.h b/cpukit/score/cpu/avr/avr/iom32u2.h
index ed960b3..10e835e 100644
--- a/cpukit/score/cpu/avr/avr/iom32u2.h
+++ b/cpukit/score/cpu/avr/avr/iom32u2.h
@@ -50,8 +50,8 @@
 /**
  * @name Registers and Associated Bit Numbers
  * 
- * @{
  */
+/**@{**/
 #define PINB _SFR_IO8(0x03)
 #define PINB0 0
 #define PINB1 1
@@ -858,8 +858,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 /* Vector 0 is the reset vector */
 #define INT0_vect_num  1
 #define INT0_vect      _VECTOR(1)  /* External Interrupt Request 0 */
@@ -944,8 +944,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 3
 
 /* Low Fuse Byte */
@@ -987,8 +987,8 @@
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 #define __BOOT_LOCK_BITS_0_EXIST
 #define __BOOT_LOCK_BITS_1_EXIST
@@ -997,8 +997,8 @@
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x95
 #define SIGNATURE_2 0x8A
diff --git a/cpukit/score/cpu/avr/avr/iom32u4.h b/cpukit/score/cpu/avr/avr/iom32u4.h
index 53d4d05..263d40f 100644
--- a/cpukit/score/cpu/avr/avr/iom32u4.h
+++ b/cpukit/score/cpu/avr/avr/iom32u4.h
@@ -61,8 +61,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/iom640.h b/cpukit/score/cpu/avr/avr/iom640.h
index 33559fc..d542d2e 100644
--- a/cpukit/score/cpu/avr/avr/iom640.h
+++ b/cpukit/score/cpu/avr/avr/iom640.h
@@ -44,8 +44,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #include <avr/iomxx0_1.h>
 
diff --git a/cpukit/score/cpu/avr/avr/iom644.h b/cpukit/score/cpu/avr/avr/iom644.h
index 5c9f113..dcfab29 100644
--- a/cpukit/score/cpu/avr/avr/iom644.h
+++ b/cpukit/score/cpu/avr/avr/iom644.h
@@ -47,8 +47,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Constants */
 #define SPM_PAGESIZE 256
diff --git a/cpukit/score/cpu/avr/avr/iom644p.h b/cpukit/score/cpu/avr/avr/iom644p.h
index b1182bb..5c42b09 100644
--- a/cpukit/score/cpu/avr/avr/iom644p.h
+++ b/cpukit/score/cpu/avr/avr/iom644p.h
@@ -39,8 +39,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define SPM_PAGESIZE 256
 #define RAMEND       0x10FF
 #define XRAMEND      RAMEND
@@ -52,8 +52,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 3
 
 /* Low Fuse Byte */
@@ -89,8 +89,8 @@
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 #define __BOOT_LOCK_BITS_0_EXIST
 #define __BOOT_LOCK_BITS_1_EXIST 
@@ -99,8 +99,8 @@
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x96
 #define SIGNATURE_2 0x0A
diff --git a/cpukit/score/cpu/avr/avr/iom6450.h b/cpukit/score/cpu/avr/avr/iom6450.h
index 0a11429..fa2203e 100644
--- a/cpukit/score/cpu/avr/avr/iom6450.h
+++ b/cpukit/score/cpu/avr/avr/iom6450.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/iom64c1.h b/cpukit/score/cpu/avr/avr/iom64c1.h
index 5d2ef5d..5895fe9 100644
--- a/cpukit/score/cpu/avr/avr/iom64c1.h
+++ b/cpukit/score/cpu/avr/avr/iom64c1.h
@@ -60,8 +60,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers. */
 
diff --git a/cpukit/score/cpu/avr/avr/iom64m1.h b/cpukit/score/cpu/avr/avr/iom64m1.h
index f6cf122..492e524 100644
--- a/cpukit/score/cpu/avr/avr/iom64m1.h
+++ b/cpukit/score/cpu/avr/avr/iom64m1.h
@@ -51,8 +51,8 @@
 /**
  * @name Registers and Associated Bit Numbers
  * 
- * @{
  */
+/**@{**/
 #define PINB _SFR_IO8(0x03)
 #define PINB0 0
 #define PINB1 1
@@ -1423,8 +1423,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 /* Vector 0 is the reset vector */
 #define ANACOMP0_vect_num  1
 #define ANACOMP0_vect      _VECTOR(1)  /* Analog Comparator 0 */
@@ -1498,8 +1498,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define SPM_PAGESIZE (256)
 #define RAMSTART     (0x0100)
 #define RAMSIZE      (4096)
@@ -1515,8 +1515,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 3
 
 /* Low Fuse Byte */
@@ -1560,8 +1560,8 @@
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 #define __BOOT_LOCK_BITS_0_EXIST
 #define __BOOT_LOCK_BITS_1_EXIST
@@ -1570,8 +1570,8 @@
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x96
 #define SIGNATURE_2 0x84
diff --git a/cpukit/score/cpu/avr/avr/iom8.h b/cpukit/score/cpu/avr/avr/iom8.h
index c43ac86..c918b43 100644
--- a/cpukit/score/cpu/avr/avr/iom8.h
+++ b/cpukit/score/cpu/avr/avr/iom8.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/iom8535.h b/cpukit/score/cpu/avr/avr/iom8535.h
index 03c9a00..061a0fc 100644
--- a/cpukit/score/cpu/avr/avr/iom8535.h
+++ b/cpukit/score/cpu/avr/avr/iom8535.h
@@ -49,8 +49,8 @@
 /**
  * @name I/O Registers
  * 
- * @{
  */
+/**@{**/
 /* TWI stands for "Two Wire Interface" or "TWI Was I2C(tm)" */
 #define TWBR    _SFR_IO8(0x00)
 #define TWSR    _SFR_IO8(0x01)
@@ -235,8 +235,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 /* External Interrupt 0 */
 #define INT0_vect			_VECTOR(1)
 #define SIG_INTERRUPT0			_VECTOR(1)
@@ -673,8 +673,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define SPM_PAGESIZE 64
 #define RAMEND       0x25F    /* Last On-Chip SRAM Location */
 #define XRAMEND      RAMEND
@@ -686,8 +686,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 2
 
 /* Low Fuse Byte */
@@ -717,8 +717,8 @@
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 #define __BOOT_LOCK_BITS_0_EXIST
 #define __BOOT_LOCK_BITS_1_EXIST 
@@ -727,8 +727,8 @@
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x93
 #define SIGNATURE_2 0x08
diff --git a/cpukit/score/cpu/avr/avr/iom88.h b/cpukit/score/cpu/avr/avr/iom88.h
index 60ef3d2..f3e5e64 100644
--- a/cpukit/score/cpu/avr/avr/iom88.h
+++ b/cpukit/score/cpu/avr/avr/iom88.h
@@ -43,8 +43,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #include <avr/iomx8.h>
 
diff --git a/cpukit/score/cpu/avr/avr/iom8hva.h b/cpukit/score/cpu/avr/avr/iom8hva.h
index a0649b6..fc36eab 100644
--- a/cpukit/score/cpu/avr/avr/iom8hva.h
+++ b/cpukit/score/cpu/avr/avr/iom8hva.h
@@ -47,8 +47,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Constants */
 #define SPM_PAGESIZE 128
diff --git a/cpukit/score/cpu/avr/avr/iom8u2.h b/cpukit/score/cpu/avr/avr/iom8u2.h
index 1c48023..c3ee0ba 100644
--- a/cpukit/score/cpu/avr/avr/iom8u2.h
+++ b/cpukit/score/cpu/avr/avr/iom8u2.h
@@ -60,8 +60,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers. */
 
diff --git a/cpukit/score/cpu/avr/avr/iomx8.h b/cpukit/score/cpu/avr/avr/iomx8.h
index 477ea0a..f145d9d 100644
--- a/cpukit/score/cpu/avr/avr/iomx8.h
+++ b/cpukit/score/cpu/avr/avr/iomx8.h
@@ -49,8 +49,8 @@
 /**
  * @name I/O Registers
  * 
- * @{
  */
+/**@{**/
 /* Port B */
 
 #define PINB    _SFR_IO8 (0x03)
@@ -628,8 +628,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 /* External Interrupt Request 0 */
 #define INT0_vect			_VECTOR(1)
 #define SIG_INTERRUPT0			_VECTOR(1)
diff --git a/cpukit/score/cpu/avr/avr/iomxx4.h b/cpukit/score/cpu/avr/avr/iomxx4.h
index ff5c85c..9dd64d8 100644
--- a/cpukit/score/cpu/avr/avr/iomxx4.h
+++ b/cpukit/score/cpu/avr/avr/iomxx4.h
@@ -46,8 +46,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #ifndef _AVR_IO_H_
 #  error "Include <avr/io.h> instead of this file."
diff --git a/cpukit/score/cpu/avr/avr/iotn13a.h b/cpukit/score/cpu/avr/avr/iotn13a.h
index b973481..689f403 100644
--- a/cpukit/score/cpu/avr/avr/iotn13a.h
+++ b/cpukit/score/cpu/avr/avr/iotn13a.h
@@ -50,8 +50,8 @@
 /**
  * @name Registers and Associated Bit Numbers
  * 
- * @{
  */
+/**@{**/
 #define ADCSRB _SFR_IO8(0x03)
 #define ADTS0 0
 #define ADTS1 1
@@ -313,8 +313,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 /* Vector 0 is the reset vector */
 #define INT0_vect_num  1
 #define INT0_vect      _VECTOR(1)  /* External Interrupt 0 */
@@ -342,8 +342,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define SPM_PAGESIZE (32)
 #define RAMSTART     (0x60)
 #define RAMSIZE      (64)
@@ -359,8 +359,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 2
 
 /* Low Fuse Byte */
@@ -390,16 +390,16 @@
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 /** @} */
 
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x90
 #define SIGNATURE_2 0x07
diff --git a/cpukit/score/cpu/avr/avr/iotn15.h b/cpukit/score/cpu/avr/avr/iotn15.h
index dae88c0..3e7ac81 100644
--- a/cpukit/score/cpu/avr/avr/iotn15.h
+++ b/cpukit/score/cpu/avr/avr/iotn15.h
@@ -46,8 +46,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #ifndef _AVR_IO_H_
 #  error "Include <avr/io.h> instead of this file."
diff --git a/cpukit/score/cpu/avr/avr/iotn167.h b/cpukit/score/cpu/avr/avr/iotn167.h
index a98e17d..53202b3 100644
--- a/cpukit/score/cpu/avr/avr/iotn167.h
+++ b/cpukit/score/cpu/avr/avr/iotn167.h
@@ -61,8 +61,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/iotn2313.h b/cpukit/score/cpu/avr/avr/iotn2313.h
index 7a2885f..21a0052 100644
--- a/cpukit/score/cpu/avr/avr/iotn2313.h
+++ b/cpukit/score/cpu/avr/avr/iotn2313.h
@@ -84,8 +84,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/iotn26.h b/cpukit/score/cpu/avr/avr/iotn26.h
index 8722055..7fcf2a3 100644
--- a/cpukit/score/cpu/avr/avr/iotn26.h
+++ b/cpukit/score/cpu/avr/avr/iotn26.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/iotn261.h b/cpukit/score/cpu/avr/avr/iotn261.h
index 9b91b7b..129e595 100644
--- a/cpukit/score/cpu/avr/avr/iotn261.h
+++ b/cpukit/score/cpu/avr/avr/iotn261.h
@@ -45,8 +45,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #include <avr/iotnx61.h>
 
diff --git a/cpukit/score/cpu/avr/avr/iotn28.h b/cpukit/score/cpu/avr/avr/iotn28.h
index e20985e..28a68e5 100644
--- a/cpukit/score/cpu/avr/avr/iotn28.h
+++ b/cpukit/score/cpu/avr/avr/iotn28.h
@@ -63,8 +63,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* I/O registers */
 
diff --git a/cpukit/score/cpu/avr/avr/iotn461.h b/cpukit/score/cpu/avr/avr/iotn461.h
index 2fd1457..0b14646 100644
--- a/cpukit/score/cpu/avr/avr/iotn461.h
+++ b/cpukit/score/cpu/avr/avr/iotn461.h
@@ -47,8 +47,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Constants */
 #define SPM_PAGESIZE 64
diff --git a/cpukit/score/cpu/avr/avr/iotn85.h b/cpukit/score/cpu/avr/avr/iotn85.h
index 37b3705..2fa4d3f 100644
--- a/cpukit/score/cpu/avr/avr/iotn85.h
+++ b/cpukit/score/cpu/avr/avr/iotn85.h
@@ -44,8 +44,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #include <avr/iotnx5.h>
 
diff --git a/cpukit/score/cpu/avr/avr/iotn861.h b/cpukit/score/cpu/avr/avr/iotn861.h
index 115110d..54c8657 100644
--- a/cpukit/score/cpu/avr/avr/iotn861.h
+++ b/cpukit/score/cpu/avr/avr/iotn861.h
@@ -39,8 +39,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define SPM_PAGESIZE 64
 #define RAMEND       0x25F
 #define XRAMEND      RAMEND
@@ -52,8 +52,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 3
 
 /* Low Fuse Byte */
@@ -87,16 +87,16 @@
 /**
  * @name Lock Bits 
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 /** @} */
 
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x93
 #define SIGNATURE_2 0x0D
diff --git a/cpukit/score/cpu/avr/avr/iotn88.h b/cpukit/score/cpu/avr/avr/iotn88.h
index afae9ef..829d13f 100644
--- a/cpukit/score/cpu/avr/avr/iotn88.h
+++ b/cpukit/score/cpu/avr/avr/iotn88.h
@@ -57,8 +57,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #ifndef _AVR_IOTN88_H_
 #define _AVR_IOTN88_H_ 1
diff --git a/cpukit/score/cpu/avr/avr/iotnx4.h b/cpukit/score/cpu/avr/avr/iotnx4.h
index 9d40770..8bb310b 100644
--- a/cpukit/score/cpu/avr/avr/iotnx4.h
+++ b/cpukit/score/cpu/avr/avr/iotnx4.h
@@ -49,8 +49,8 @@
 /**
  * @name I/O Registers
  * 
- * @{
  */
+/**@{**/
 #define PRR     _SFR_IO8 (0x00)
 #define PRTIM1  3
 #define PRTIM0  2
@@ -386,8 +386,8 @@
 /**
  * @name Interrupt Vectors
  * 
- * @{
  */
+/**@{**/
 /* Interrupt vector 0 is the reset vector. */
 /* External Interrupt Request 0 */
 #define INT0_vect			_VECTOR(1)
diff --git a/cpukit/score/cpu/avr/avr/iotnx61.h b/cpukit/score/cpu/avr/avr/iotnx61.h
index e909369..58cba5c 100644
--- a/cpukit/score/cpu/avr/avr/iotnx61.h
+++ b/cpukit/score/cpu/avr/avr/iotnx61.h
@@ -56,8 +56,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Registers and associated bit numbers */
 
diff --git a/cpukit/score/cpu/avr/avr/iousb162.h b/cpukit/score/cpu/avr/avr/iousb162.h
index 1350e42..89709a7 100644
--- a/cpukit/score/cpu/avr/avr/iousb162.h
+++ b/cpukit/score/cpu/avr/avr/iousb162.h
@@ -39,8 +39,8 @@
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define SPM_PAGESIZE 128
 #define RAMEND       0x2FF
 #define XRAMEND      RAMEND
@@ -52,8 +52,8 @@
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 3
 
 /* Low Fuse Byte */
@@ -89,8 +89,8 @@
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 #define __BOOT_LOCK_BITS_0_EXIST
 #define __BOOT_LOCK_BITS_1_EXIST 
@@ -99,8 +99,8 @@
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x94
 #define SIGNATURE_2 0x82
diff --git a/cpukit/score/cpu/avr/avr/iousb647.h b/cpukit/score/cpu/avr/avr/iousb647.h
index b4e05a9..2e1288a 100644
--- a/cpukit/score/cpu/avr/avr/iousb647.h
+++ b/cpukit/score/cpu/avr/avr/iousb647.h
@@ -47,8 +47,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Constants */
 #define SPM_PAGESIZE 256
diff --git a/cpukit/score/cpu/avr/avr/iousb82.h b/cpukit/score/cpu/avr/avr/iousb82.h
index 94232af..2d66bd5 100644
--- a/cpukit/score/cpu/avr/avr/iousb82.h
+++ b/cpukit/score/cpu/avr/avr/iousb82.h
@@ -47,8 +47,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Constants */
 #define SPM_PAGESIZE 128
diff --git a/cpukit/score/cpu/avr/avr/iousbxx2.h b/cpukit/score/cpu/avr/avr/iousbxx2.h
index 5b39243..3dcbc76 100644
--- a/cpukit/score/cpu/avr/avr/iousbxx2.h
+++ b/cpukit/score/cpu/avr/avr/iousbxx2.h
@@ -46,8 +46,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #ifndef _AVR_IO_H_
 #  error "Include <avr/io.h> instead of this file."
diff --git a/cpukit/score/cpu/avr/avr/iox128a1.h b/cpukit/score/cpu/avr/avr/iox128a1.h
index 2d01781..4ce4c47 100644
--- a/cpukit/score/cpu/avr/avr/iox128a1.h
+++ b/cpukit/score/cpu/avr/avr/iox128a1.h
@@ -120,8 +120,8 @@ typedef volatile uint32_t register32_t;
 /**
  * @name IO Module Structures
  * 
- * @{
  */
+/**@{**/
 
 /*
 --------------------------------------------------------------------------
@@ -2646,8 +2646,8 @@ typedef enum AES_INTLVL_enum
 /**
  * @name IO Module Instances. Mapped to Memory
  * 
- * @{
  */
+/**@{**/
 #define GPIO    (*(GPIO_t *) 0x0000)  /* General Purpose IO Registers */
 #define VPORT0    (*(VPORT_t *) 0x0010)  /* Virtual Port 0 */
 #define VPORT1    (*(VPORT_t *) 0x0014)  /* Virtual Port 1 */
@@ -2736,8 +2736,8 @@ typedef enum AES_INTLVL_enum
 /**
  * @name Flattened Fully Qualified IO Register Names
  * 
- * @{
  */
+/**@{**/
 
 /* GPIO - General Purpose IO Registers */
 #define GPIO_GPIO0  _SFR_MEM8(0x0000)
@@ -3760,8 +3760,8 @@ typedef enum AES_INTLVL_enum
 /**
  * @name Bitfield Definitions
  * 
- * @{
  */
+/**@{**/
 /* XOCD - On-Chip Debug System */
 /* OCD.OCDR1  bit masks and bit positions */
 #define OCD_OCDRD_bm  0x01  /* OCDR Dirty bit mask. */
@@ -7043,8 +7043,8 @@ typedef enum AES_INTLVL_enum
 /**
  * @name Interrupt Vector Definitions
  * 
- * @{
  */
+/**@{**/
 /* Vector 0 is the reset vector */
 
 /* OSC interrupt vectors */
@@ -7398,8 +7398,8 @@ typedef enum AES_INTLVL_enum
 /**
  * @name Constants
  * 
- * @{
  */
+/**@{**/
 #define PROGMEM_START     (0x0000)
 #define PROGMEM_SIZE      (139264)
 #define PROGMEM_PAGE_SIZE (512)
@@ -7493,8 +7493,8 @@ typedef enum AES_INTLVL_enum
 /**
  * @name Fuses
  * 
- * @{
  */
+/**@{**/
 #define FUSE_MEMORY_SIZE 6
 
 /* Fuse Byte 0 */
@@ -7561,8 +7561,8 @@ typedef enum AES_INTLVL_enum
 /**
  * @name Lock Bits
  * 
- * @{
  */
+/**@{**/
 #define __LOCK_BITS_EXIST
 #define __BOOT_LOCK_APPLICATION_TABLE_BITS_EXIST
 #define __BOOT_LOCK_APPLICATION_BITS_EXIST
@@ -7572,8 +7572,8 @@ typedef enum AES_INTLVL_enum
 /**
  * @name Signature
  * 
- * @{
  */
+/**@{**/
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x97
 #define SIGNATURE_2 0x4C
diff --git a/cpukit/score/cpu/avr/avr/iox256d3.h b/cpukit/score/cpu/avr/avr/iox256d3.h
index e1a2815..a498798 100644
--- a/cpukit/score/cpu/avr/avr/iox256d3.h
+++ b/cpukit/score/cpu/avr/avr/iox256d3.h
@@ -57,8 +57,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 /* Ungrouped common registers */
 #define GPIOR0  _SFR_MEM8(0x0000)  /* General Purpose IO Register 0 */
diff --git a/cpukit/score/cpu/avr/avr/iox32d4.h b/cpukit/score/cpu/avr/avr/iox32d4.h
index 0e01175..248e32c 100644
--- a/cpukit/score/cpu/avr/avr/iox32d4.h
+++ b/cpukit/score/cpu/avr/avr/iox32d4.h
@@ -59,8 +59,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 
 /* Ungrouped common registers */
diff --git a/cpukit/score/cpu/avr/avr/parity.h b/cpukit/score/cpu/avr/avr/parity.h
index 97ba065..e01148e 100644
--- a/cpukit/score/cpu/avr/avr/parity.h
+++ b/cpukit/score/cpu/avr/avr/parity.h
@@ -45,8 +45,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #warning "This file has been moved to <util/parity.h>."
 #include <util/parity.h>
diff --git a/cpukit/score/cpu/avr/avr/pgmspace.h b/cpukit/score/cpu/avr/avr/pgmspace.h
index 1077bb5..4201016 100644
--- a/cpukit/score/cpu/avr/avr/pgmspace.h
+++ b/cpukit/score/cpu/avr/avr/pgmspace.h
@@ -77,8 +77,8 @@
  *
  * @ingroup avr
  *
- * @{
  */
+/**@{**/
 
 #define __need_size_t
 #include <inttypes.h>
diff --git a/cpukit/score/cpu/avr/avr/sfr_defs.h b/cpukit/score/cpu/avr/avr/sfr_defs.h
index c2ebe69..2b83926 100644
--- a/cpukit/score/cpu/avr/avr/sfr_defs.h
+++ b/cpukit/score/cpu/avr/avr/sfr_defs.h
@@ -121,9 +121,8 @@
  * <tt>__SFR_OFFSET</tt> are supported - the @c _SFR_ADDR(SPMCR) macro can be
  * used to get the address of the @c SPMCR register (0x57 or 0x68 depending on
  * device).
- *
- * @{
  */
+/**@{**/
 
 #ifdef __ASSEMBLER__
 #define _SFR_ASM_COMPAT 1
@@ -203,9 +202,8 @@
 
 /**
  * @name Bit Manipulation
- *
- * @{
  */
+/**@{**/
 
 /**
  * @code #include <avr/io.h> @endcode
@@ -229,9 +227,8 @@
 
 /**
  * @name IO Register Bit Manipulation
- *
- * @{
  */
+/**@{**/
 
 /**
  * @code #include <avr/io.h> @endcode
diff --git a/cpukit/score/cpu/avr/avr/sleep.h b/cpukit/score/cpu/avr/avr/sleep.h
index 655c1e3..9a2556c 100644
--- a/cpukit/score/cpu/avr/avr/sleep.h
+++ b/cpukit/score/cpu/avr/avr/sleep.h
@@ -134,8 +134,8 @@
  *   sei();
  * @endcode
  * 
- * @{
  */
+/**@{**/
 
 
 /* 
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu.h b/cpukit/score/cpu/bfin/rtems/score/cpu.h
index 425fc68..1b26527 100644
--- a/cpukit/score/cpu/bfin/rtems/score/cpu.h
+++ b/cpukit/score/cpu/bfin/rtems/score/cpu.h
@@ -363,8 +363,8 @@ extern "C" {
  *
  * This group assists in issues related to processor endianness.
  *
- * @{
  */
+/**@{**/
 
 /**
  * Define what is required to specify how the network to host conversion
@@ -460,9 +460,8 @@ extern "C" {
  * Port Specific Information:
  *
  * XXX document implementation including references if appropriate
- *
- * @{
  */
+/**@{**/
 
 #ifndef ASM
 
@@ -547,9 +546,8 @@ SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
  * Port Specific Information:
  *
  * XXX document implementation including references if appropriate
- *
- * @{
  */
+/**@{**/
 
 /*
  *  Nothing prevents the porter from declaring more CPU specific variables.
@@ -700,9 +698,8 @@ SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
 
 /**
  * @addtogroup CPUInterrupt
- *
- * @{
  */
+/**@{**/
 
 /**
  * Support routine to initialize the RTEMS vector table after it is allocated.
@@ -939,9 +936,8 @@ void _CPU_Context_Initialize(
  *
  * This set of routines are used to implement fast searches for
  * the most important ready task.
- *
- * @{
  */
+/**@{**/
 
 /**
  * This definition is set to TRUE if the port uses the generic bitfield
@@ -1149,9 +1145,8 @@ void *_CPU_Thread_Idle_body( uintptr_t ignored );
 
 /**
  * @addtogroup CPUContext
- *
- * @{
  */
+/**@{**/
 
 /**
  * This routine switches from the run context to the heir context.
diff --git a/cpukit/score/cpu/i386/rtems/score/interrupts.h b/cpukit/score/cpu/i386/rtems/score/interrupts.h
index 4787bcb..bed6330 100644
--- a/cpukit/score/cpu/i386/rtems/score/interrupts.h
+++ b/cpukit/score/cpu/i386/rtems/score/interrupts.h
@@ -31,8 +31,8 @@ typedef int  (*rtems_raw_irq_is_enabled)	(const struct __rtems_raw_irq_connect_d
 /**
  * @name Interrupt Level Macros
  * 
- * @{
  */
+/**@{**/
 
 #define i386_disable_interrupts( _level ) \
   { \
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu.h b/cpukit/score/cpu/lm32/rtems/score/cpu.h
index 865b19f..1f8a370 100644
--- a/cpukit/score/cpu/lm32/rtems/score/cpu.h
+++ b/cpukit/score/cpu/lm32/rtems/score/cpu.h
@@ -344,8 +344,8 @@ extern "C" {
  *
  * This group assists in issues related to processor endianness.
  *
- * @{
  */
+/**@{**/
 
 /**
  * Define what is required to specify how the network to host conversion
@@ -441,9 +441,8 @@ extern "C" {
  * Port Specific Information:
  *
  * XXX document implementation including references if appropriate
- *
- * @{
  */
+/**@{**/
 
 /**
  * This defines the minimal set of integer and processor state registers
@@ -546,9 +545,8 @@ SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
  * Port Specific Information:
  *
  * XXX document implementation including references if appropriate
- *
- * @{
  */
+/**@{**/
 
 /*
  * Nothing prevents the porter from declaring more CPU specific variables.
@@ -693,9 +691,8 @@ SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
 
 /**
  * @addtogroup CPUInterrupt
- *
- * @{
  */
+/**@{**/
 
 /**
  * Support routine to initialize the RTEMS vector table after it is allocated.
@@ -925,9 +922,8 @@ extern char _gp[];
  *
  * This set of routines are used to implement fast searches for
  * the most important ready task.
- *
- * @{
  */
+/**@{**/
 
 /**
  * This definition is set to TRUE if the port uses the generic bitfield
@@ -1071,9 +1067,8 @@ void _CPU_Initialize(void);
 
 /**
  * @addtogroup CPUInterrupt
- *
- * @{
  */
+/**@{**/
 
 /**
  * This routine installs a "raw" interrupt handler directly into the
@@ -1154,9 +1149,8 @@ void _CPU_Context_switch(
 
 /**
  * @addtogroup CPUContext
- *
- * @{
  */
+/**@{**/
 
 /**
  * This routine is generally used only to restart self in an
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu.h b/cpukit/score/cpu/m32c/rtems/score/cpu.h
index d09d0af..8d9acc3 100644
--- a/cpukit/score/cpu/m32c/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m32c/rtems/score/cpu.h
@@ -366,8 +366,8 @@ extern "C" {
  *
  * This group assists in issues related to processor endianness.
  * 
- * @{
  */
+/**@{**/
 
 /**
  * Define what is required to specify how the network to host conversion
@@ -464,8 +464,8 @@ extern "C" {
  * Port Specific Information:
  *
  * XXX document implementation including references if appropriate
- * @{
  */
+/**@{**/
 
 /**
  * @ingroup Management
@@ -529,8 +529,8 @@ typedef struct {
  *
  * XXX document implementation including references if appropriate
  * 
- * @{
  */
+/**@{**/
 
 /*
  *  Nothing prevents the porter from declaring more CPU specific variables.
@@ -911,8 +911,8 @@ void _CPU_Context_Restart_self(
  *
  * This set of routines are used to implement fast searches for
  * the most important ready task.
- * @{
  */
+/**@{**/
 
 /**
  * This definition is set to TRUE if the port uses the generic bitfield
diff --git a/cpukit/score/cpu/m32r/rtems/score/cpu.h b/cpukit/score/cpu/m32r/rtems/score/cpu.h
index cb4ebe7..8c8a9c1 100644
--- a/cpukit/score/cpu/m32r/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m32r/rtems/score/cpu.h
@@ -360,8 +360,8 @@ extern "C" {
  *
  * This group assists in issues related to processor endianness.
  *
- * @{
  */
+/**@{**/
 
 /**
  * Define what is required to specify how the network to host conversion
@@ -457,9 +457,8 @@ extern "C" {
  * Port Specific Information:
  *
  * XXX document implementation including references if appropriate
- *
- * @{
  */
+/**@{**/
 
 /**
  * This defines the minimal set of integer and processor state registers
@@ -552,9 +551,8 @@ SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
  * Port Specific Information:
  *
  * XXX document implementation including references if appropriate
- *
- * @{
  */
+/**@{**/
 
 /*
  *  Nothing prevents the porter from declaring more CPU specific variables.
@@ -700,9 +698,8 @@ SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
 
 /**
  * @addtogroup CPUInterrupt
- *
- * @{
  */
+/**@{**/
 
 /**
  * Support routine to initialize the RTEMS vector table after it is allocated.
@@ -932,9 +929,8 @@ void _CPU_Context_Restart_self(
  *
  * This set of routines are used to implement fast searches for
  * the most important ready task.
- *
- * @{
  */
+/**@{**/
 
 /**
  * This definition is set to TRUE if the port uses the generic bitfield
@@ -1145,9 +1141,8 @@ void _CPU_Context_switch(
 
 /**
  * @addtogroup CPUContext
- *
- * @{
  */
+/**@{**/
 
 /**
  * This routine is generally used only to restart self in an
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
index 87dd232..8c4a61b 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
@@ -389,8 +389,8 @@ extern "C" {
  *   be an improvement on the PowerPC and SPARC. The struct timespec
  *   and the executables with int64 not inlined are about the same size.
  * 
- * @{
  */
+/**@{**/
 
 /**
  * Selects the timestamp implementation using struct timespec.
@@ -426,8 +426,8 @@ extern "C" {
  *
  * This group assists in issues related to processor endianness.
  * 
- * @{
  */
+/**@{**/
 
 /**
  * Define what is required to specify how the network to host conversion
@@ -525,8 +525,8 @@ extern "C" {
  *
  * XXX document implementation including references if appropriate
  * 
- * @{
  */
+/**@{**/
 
 /**
  * @ingroup Management
@@ -1013,8 +1013,8 @@ uint32_t   _CPU_ISR_Get_level( void );
  * This set of routines are used to implement fast searches for
  * the most important ready task.
  * 
- * @{
  */
+/**@{**/
 
 /**
  * This definition is set to TRUE if the port uses the generic bitfield
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h
index 327b062..6102355 100644
--- a/cpukit/score/cpu/sparc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h
@@ -371,9 +371,8 @@ typedef struct {
  * of the CPU state in the context area.  The ET (enable trap) bit and
  * the CWP (current window pointer) fields of the PSR are considered
  * system wide resources and are not maintained on a per-thread basis.
- *
- * @{
  */
+/**@{**/
 
 #ifndef ASM
 /**
diff --git a/cpukit/score/cpu/v850/rtems/score/cpu.h b/cpukit/score/cpu/v850/rtems/score/cpu.h
index 0e3f8ee..c0b6f9e 100644
--- a/cpukit/score/cpu/v850/rtems/score/cpu.h
+++ b/cpukit/score/cpu/v850/rtems/score/cpu.h
@@ -348,8 +348,8 @@ extern "C" {
  *
  * This group assists in issues related to processor endianness.
  *
- * @{
  */
+/**@{**/
 
 /**
  * Define what is required to specify how the network to host conversion
@@ -436,9 +436,8 @@ extern "C" {
  *
  * On the v850, this port saves special registers and those that are
  * callee saved.
- *
- * @{
  */
+/**@{**/
 
 /**
  * This defines the minimal set of integer and processor state registers
@@ -514,9 +513,8 @@ typedef struct {
  * Port Specific Information:
  *
  * XXX document implementation including references if appropriate
- *
- * @{
  */
+/**@{**/
 
 /**
  * @ingroup CPUContext
@@ -660,9 +658,8 @@ typedef struct {
 
 /**
  * @addtogroup CPUInterrupt
- *
- * @{
  */
+/**@{**/
 
 /**
  * Disable all interrupts for an RTEMS critical section.  The previous
@@ -901,9 +898,8 @@ void _CPU_Context_Initialize(
  *
  * This set of routines are used to implement fast searches for
  * the most important ready task.
- *
- * @{
  */
+/**@{**/
 
 /**
  * This definition is set to TRUE if the port uses the generic bitfield
@@ -1058,9 +1054,8 @@ void _CPU_Initialize(void);
 
 /**
  * @addtogroup CPUContext
- *
- * @{
  */
+/**@{**/
 
 /**
  * This routine switches from the run context to the heir context.
diff --git a/cpukit/score/include/rtems/score/apimutex.h b/cpukit/score/include/rtems/score/apimutex.h
index 4d44f5e..a935100 100644
--- a/cpukit/score/include/rtems/score/apimutex.h
+++ b/cpukit/score/include/rtems/score/apimutex.h
@@ -28,9 +28,8 @@ extern "C" {
  * @ingroup Score
  *
  * @brief Provides routines to ensure mutual exclusion on API level.
- *
- * @{
  */
+/**@{**/
 
 #include <rtems/score/coremutex.h>
 #include <rtems/score/isr.h>
@@ -100,9 +99,8 @@ void _API_Mutex_Unlock( API_Mutex_Control *mutex );
  * When the APIs all use this for allocation and deallocation protection, then
  * this possibly should be renamed and moved to a higher level in the
  * hierarchy.
- *
- * @{
  */
+/**@{**/
 
 /**
  *  @brief Memory allocation mutex.
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h
index 0af9798..80b3fd2 100644
--- a/cpukit/score/include/rtems/score/heap.h
+++ b/cpukit/score/include/rtems/score/heap.h
@@ -126,9 +126,8 @@ extern "C" {
  * block indicates that the previous block is used, this ensures that the
  * last block appears as used for the _Heap_Is_used() and _Heap_Is_free()
  * functions.
- *
- * @{
  */
+/**@{**/
 
 typedef struct Heap_Control Heap_Control;
 
diff --git a/cpukit/score/include/rtems/score/protectedheap.h b/cpukit/score/include/rtems/score/protectedheap.h
index 3fe6143..29ee62d 100644
--- a/cpukit/score/include/rtems/score/protectedheap.h
+++ b/cpukit/score/include/rtems/score/protectedheap.h
@@ -34,8 +34,8 @@ extern "C" {
  *
  * The @ref ScoreAllocatorMutex is used to protect the heap accesses.
  *
- * @{
  */
+/**@{**/
 
 /**
  * @brief See _Heap_Initialize().
diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/score/include/rtems/score/sysstate.h
index 9223820..7d3d6ae 100644
--- a/cpukit/score/include/rtems/score/sysstate.h
+++ b/cpukit/score/include/rtems/score/sysstate.h
@@ -30,9 +30,8 @@ extern "C" {
  * @ingroup Score
  *
  * @brief Management of the internal system state of RTEMS.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief System states.
diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/score/include/rtems/score/userext.h
index 078c3de..bf76c35 100644
--- a/cpukit/score/include/rtems/score/userext.h
+++ b/cpukit/score/include/rtems/score/userext.h
@@ -36,9 +36,8 @@ typedef void User_extensions_routine RTEMS_COMPILER_DEPRECATED_ATTRIBUTE;
  * @brief The User Extension Handler provides invocation of application
  * dependent routines at critical points in the life of each thread and the
  * system as a whole.
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Task create extension.
diff --git a/cpukit/score/include/rtems/score/userextimpl.h b/cpukit/score/include/rtems/score/userextimpl.h
index c3b02c7..6ecdcc5 100644
--- a/cpukit/score/include/rtems/score/userextimpl.h
+++ b/cpukit/score/include/rtems/score/userextimpl.h
@@ -30,9 +30,8 @@ extern "C" {
  * @ingroup Score
  *
  * @addtogroup ScoreUserExt
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief List of active extensions.
@@ -46,9 +45,8 @@ extern Chain_Control _User_extensions_Switches_list;
 
 /**
  * @name Extension Maintainance
- *
- * @{
  */
+/**@{**/
 
 void _User_extensions_Handler_initialization( void );
 
@@ -158,9 +156,8 @@ void _User_extensions_Iterate(
 
 /**
  * @name Extension Callout Dispatcher
- *
- * @{
  */
+/**@{**/
 
 static inline bool _User_extensions_Thread_create( Thread_Control *created )
 {
diff --git a/cpukit/score/inline/rtems/score/address.inl b/cpukit/score/inline/rtems/score/address.inl
index ba42fec..17bcd0a 100644
--- a/cpukit/score/inline/rtems/score/address.inl
+++ b/cpukit/score/inline/rtems/score/address.inl
@@ -27,9 +27,8 @@
 
 /**
  * @addtogroup ScoreAddress
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Add offset to an address.
diff --git a/cpukit/score/inline/rtems/score/chain.inl b/cpukit/score/inline/rtems/score/chain.inl
index d122415..7290d6e 100644
--- a/cpukit/score/inline/rtems/score/chain.inl
+++ b/cpukit/score/inline/rtems/score/chain.inl
@@ -24,9 +24,8 @@
 
 /**
  * @addtogroup ScoreChain
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Set off chain.
diff --git a/cpukit/score/inline/rtems/score/corebarrier.inl b/cpukit/score/inline/rtems/score/corebarrier.inl
index 5c41179..72ad670 100644
--- a/cpukit/score/inline/rtems/score/corebarrier.inl
+++ b/cpukit/score/inline/rtems/score/corebarrier.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreBarrier
- *
- * @{
  */
+/**@{**/
 
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
diff --git a/cpukit/score/inline/rtems/score/coremsg.inl b/cpukit/score/inline/rtems/score/coremsg.inl
index 2db8c97..986fc3f 100644
--- a/cpukit/score/inline/rtems/score/coremsg.inl
+++ b/cpukit/score/inline/rtems/score/coremsg.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreMessageQueue
- *
- * @{
  */
+/**@{**/
 
 #include <string.h>   /* needed for memcpy */
 
diff --git a/cpukit/score/inline/rtems/score/coremutex.inl b/cpukit/score/inline/rtems/score/coremutex.inl
index d0266a0..f41a4de 100644
--- a/cpukit/score/inline/rtems/score/coremutex.inl
+++ b/cpukit/score/inline/rtems/score/coremutex.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreMutex
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Is mutex locked.
diff --git a/cpukit/score/inline/rtems/score/corerwlock.inl b/cpukit/score/inline/rtems/score/corerwlock.inl
index c9d499b..d1be4b2 100644
--- a/cpukit/score/inline/rtems/score/corerwlock.inl
+++ b/cpukit/score/inline/rtems/score/corerwlock.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreRWLock
- *
- * @{
  */
+/**@{**/
 
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
diff --git a/cpukit/score/inline/rtems/score/coresem.inl b/cpukit/score/inline/rtems/score/coresem.inl
index 91f4aa1..69a7b26 100644
--- a/cpukit/score/inline/rtems/score/coresem.inl
+++ b/cpukit/score/inline/rtems/score/coresem.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreSemaphore
- *
- * @{
  */
+/**@{**/
 
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
diff --git a/cpukit/score/inline/rtems/score/corespinlock.inl b/cpukit/score/inline/rtems/score/corespinlock.inl
index 28f4fc7..76f5c44 100644
--- a/cpukit/score/inline/rtems/score/corespinlock.inl
+++ b/cpukit/score/inline/rtems/score/corespinlock.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreSpinlock
- *
- * @{
  */
+/**@{**/
 
 /**
  * This method is used to initialize core spinlock attributes.
diff --git a/cpukit/score/inline/rtems/score/heap.inl b/cpukit/score/inline/rtems/score/heap.inl
index 7850f7a..4a346bd 100644
--- a/cpukit/score/inline/rtems/score/heap.inl
+++ b/cpukit/score/inline/rtems/score/heap.inl
@@ -24,9 +24,8 @@
 
 /**
  * @addtogroup ScoreHeap
- *
- * @{
  */
+/**@{**/
 
 RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Free_list_head( Heap_Control *heap )
 {
diff --git a/cpukit/score/inline/rtems/score/isr.inl b/cpukit/score/inline/rtems/score/isr.inl
index fb450e4..c46c585 100644
--- a/cpukit/score/inline/rtems/score/isr.inl
+++ b/cpukit/score/inline/rtems/score/isr.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreISR
- *
- * @{
  */
+/**@{**/
 
 #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
 /**
diff --git a/cpukit/score/inline/rtems/score/mppkt.inl b/cpukit/score/inline/rtems/score/mppkt.inl
index 2e681cd..0f9c6b2 100644
--- a/cpukit/score/inline/rtems/score/mppkt.inl
+++ b/cpukit/score/inline/rtems/score/mppkt.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreMPPacket
- *
- * @{
  */
+/**@{**/
 
 /**
  * This function returns true if the the_packet_class is valid,
diff --git a/cpukit/score/inline/rtems/score/objectmp.inl b/cpukit/score/inline/rtems/score/objectmp.inl
index 48e59d0..e6734cf 100644
--- a/cpukit/score/inline/rtems/score/objectmp.inl
+++ b/cpukit/score/inline/rtems/score/objectmp.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreObjectMP
- *
- * @{
  */
+/**@{**/
 
 /**
  * This function allocates a Global Object control block.
diff --git a/cpukit/score/inline/rtems/score/priority.inl b/cpukit/score/inline/rtems/score/priority.inl
index 7059682..5c7c6b3 100644
--- a/cpukit/score/inline/rtems/score/priority.inl
+++ b/cpukit/score/inline/rtems/score/priority.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScorePriority
- *
- * @{
  */
+/**@{**/
 
 /**
  * This function returns true if the_priority if valid for a
diff --git a/cpukit/score/inline/rtems/score/prioritybitmap.inl b/cpukit/score/inline/rtems/score/prioritybitmap.inl
index 01fa326..70844fa 100644
--- a/cpukit/score/inline/rtems/score/prioritybitmap.inl
+++ b/cpukit/score/inline/rtems/score/prioritybitmap.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScorePriority
- *
- * @{
  */
+/**@{**/
 
 #include <rtems/score/bitfield.h>
 
diff --git a/cpukit/score/inline/rtems/score/rbtree.inl b/cpukit/score/inline/rtems/score/rbtree.inl
index dfa8c26..7bbb9c6 100644
--- a/cpukit/score/inline/rtems/score/rbtree.inl
+++ b/cpukit/score/inline/rtems/score/rbtree.inl
@@ -28,9 +28,8 @@
 
 /**
  * @addtogroup ScoreRBTree
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Get the direction opposite to @a the_dir.
diff --git a/cpukit/score/inline/rtems/score/scheduler.inl b/cpukit/score/inline/rtems/score/scheduler.inl
index fcb9f19..20460d1 100644
--- a/cpukit/score/inline/rtems/score/scheduler.inl
+++ b/cpukit/score/inline/rtems/score/scheduler.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreScheduler
- *
- * @{
  */
+/**@{**/
 
 /**
  * The preferred method to add a new scheduler is to define the jump table
diff --git a/cpukit/score/inline/rtems/score/schedulerpriority.inl b/cpukit/score/inline/rtems/score/schedulerpriority.inl
index 1209340..4655f95 100644
--- a/cpukit/score/inline/rtems/score/schedulerpriority.inl
+++ b/cpukit/score/inline/rtems/score/schedulerpriority.inl
@@ -28,9 +28,8 @@
 
 /**
  * @addtogroup ScoreScheduler
- *
- * @{
  */
+/**@{**/
 
 /**
  * @brief Ready queue initialization.
diff --git a/cpukit/score/inline/rtems/score/schedulersimple.inl b/cpukit/score/inline/rtems/score/schedulersimple.inl
index 4c6e27d..e67fc3c 100644
--- a/cpukit/score/inline/rtems/score/schedulersimple.inl
+++ b/cpukit/score/inline/rtems/score/schedulersimple.inl
@@ -27,9 +27,8 @@
 
 /**
  * @addtogroup ScoreScheduler
- *
- * @{
  */
+/**@{**/
 
 /**
  * This routine puts @a the_thread on to the ready queue.
diff --git a/cpukit/score/inline/rtems/score/stack.inl b/cpukit/score/inline/rtems/score/stack.inl
index 697263b..7cb73ee 100644
--- a/cpukit/score/inline/rtems/score/stack.inl
+++ b/cpukit/score/inline/rtems/score/stack.inl
@@ -27,9 +27,8 @@
 
 /**
  * @addtogroup ScoreStack
- *
- * @{
  */
+/**@{**/
 
 /**
  * This routine initializes the_stack record to indicate that
diff --git a/cpukit/score/inline/rtems/score/states.inl b/cpukit/score/inline/rtems/score/states.inl
index 7add9a3..8d335c9 100644
--- a/cpukit/score/inline/rtems/score/states.inl
+++ b/cpukit/score/inline/rtems/score/states.inl
@@ -8,7 +8,7 @@
  */
 
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2012.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -27,9 +27,8 @@
 
 /**
  * @addtogroup ScoreStates
- *
- * @{
  */
+/**@{**/
 
 /**
  * This function sets the given states_to_set into the current_state
diff --git a/cpukit/score/inline/rtems/score/sysstate.inl b/cpukit/score/inline/rtems/score/sysstate.inl
index 69d3724..3fa534c 100644
--- a/cpukit/score/inline/rtems/score/sysstate.inl
+++ b/cpukit/score/inline/rtems/score/sysstate.inl
@@ -22,9 +22,8 @@
 
 /**
  * @addtogroup ScoreSysState
- *
- * @{
  */
+/**@{**/
 
 RTEMS_INLINE_ROUTINE void _System_state_Set (
   System_state_Codes state
diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl
index 8309f42..681cfcc 100644
--- a/cpukit/score/inline/rtems/score/thread.inl
+++ b/cpukit/score/inline/rtems/score/thread.inl
@@ -28,9 +28,8 @@
 
 /**
  * @addtogroup ScoreThread
- *
- * @{
  */
+/**@{**/
 
 #if defined(RTEMS_SMP)
 
diff --git a/cpukit/score/inline/rtems/score/threadmp.inl b/cpukit/score/inline/rtems/score/threadmp.inl
index 31af372..85088d1 100644
--- a/cpukit/score/inline/rtems/score/threadmp.inl
+++ b/cpukit/score/inline/rtems/score/threadmp.inl
@@ -27,9 +27,8 @@
 
 /**
  * @addtogroup ScoreThreadMP
- *
- * @{
  */
+/**@{**/
 
 /**
  * This function returns true if the thread in question is the
diff --git a/cpukit/score/inline/rtems/score/threadq.inl b/cpukit/score/inline/rtems/score/threadq.inl
index e7c6aa5..d646389 100644
--- a/cpukit/score/inline/rtems/score/threadq.inl
+++ b/cpukit/score/inline/rtems/score/threadq.inl
@@ -27,9 +27,8 @@
 
 /**
  * @addtogroup ScoreThreadQ
- *
- * @{
  */
+/**@{**/
 
 /** @} */
 
diff --git a/cpukit/score/inline/rtems/score/tod.inl b/cpukit/score/inline/rtems/score/tod.inl
index 39849cb..89b2634 100644
--- a/cpukit/score/inline/rtems/score/tod.inl
+++ b/cpukit/score/inline/rtems/score/tod.inl
@@ -29,9 +29,8 @@
 
 /**
  * @addtogroup ScoreTOD
- *
- * @{
  */
+/**@{**/
 
 /**
  * This routine deactivates updating of the current time of day.
diff --git a/cpukit/score/inline/rtems/score/tqdata.inl b/cpukit/score/inline/rtems/score/tqdata.inl
index b676eb0..c5b85d2 100644
--- a/cpukit/score/inline/rtems/score/tqdata.inl
+++ b/cpukit/score/inline/rtems/score/tqdata.inl
@@ -25,9 +25,8 @@
 
 /**
  * @addtogroup ScoreThreadQ
- *
- * @{
  */
+/**@{**/
 
 /**
  * This function returns the index of the priority chain on which




More information about the vc mailing list