Index: uspace/drv/platform/amdm37x/amdm37x.c
===================================================================
--- uspace/drv/platform/amdm37x/amdm37x.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/amdm37x.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -28,6 +28,5 @@
 
 /**
- * @defgroup amdm37x TI AM/DM37x platform driver.
- * @brief HelenOS TI AM/DM37x platform driver.
+ * @addtogroup amdm37x
  * @{
  */
@@ -424,2 +423,6 @@
 	return EOK;
 }
+
+/**
+ * @}
+ */
Index: uspace/drv/platform/amdm37x/amdm37x.h
===================================================================
--- uspace/drv/platform/amdm37x/amdm37x.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/amdm37x.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrv
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/cm/clock_control.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/clock_control.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/cm/clock_control.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrvclockcontrolcm
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/cm/core.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/core.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/cm/core.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrvcorecm
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/cm/iva2.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/iva2.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/cm/iva2.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrvcm
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/cm/mpu.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/mpu.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/cm/mpu.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrvcm
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/cm/usbhost.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/usbhost.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/cm/usbhost.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrvusbhostcm
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/doc/doxygroups.h
===================================================================
--- uspace/drv/platform/amdm37x/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
+++ uspace/drv/platform/amdm37x/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -0,0 +1,4 @@
+/** @addtogroup amdm37x amdm37x
+ * @brief TI AM/DM37x platform driver
+ * @ingroup drvs
+ */
Index: uspace/drv/platform/amdm37x/main.c
===================================================================
--- uspace/drv/platform/amdm37x/main.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/main.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -28,6 +28,5 @@
 
 /**
- * @defgroup amdm37x TI AM/DM37x platform driver.
- * @brief HelenOS TI AM/DM37x platform driver.
+ * @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/prm/clock_control.h
===================================================================
--- uspace/drv/platform/amdm37x/prm/clock_control.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/prm/clock_control.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrvprm
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/prm/global_reg.h
===================================================================
--- uspace/drv/platform/amdm37x/prm/global_reg.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/prm/global_reg.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrvprm
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/prm/usbhost.h
===================================================================
--- uspace/drv/platform/amdm37x/prm/usbhost.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/prm/usbhost.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrvprm
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/uhh.h
===================================================================
--- uspace/drv/platform/amdm37x/uhh.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/uhh.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrvuhh
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/amdm37x/usbtll.h
===================================================================
--- uspace/drv/platform/amdm37x/usbtll.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/amdm37x/usbtll.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amdm37xdrvusbtll
+/** @addtogroup amdm37x
  * @{
  */
Index: uspace/drv/platform/icp/doc/doxygroups.h
===================================================================
--- uspace/drv/platform/icp/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
+++ uspace/drv/platform/icp/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -0,0 +1,4 @@
+/** @addtogroup icp icp
+ * @brief ARM Inegrator/CP platform driver
+ * @ingroup drvs
+ */
Index: uspace/drv/platform/icp/icp.c
===================================================================
--- uspace/drv/platform/icp/icp.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/icp/icp.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -28,6 +28,5 @@
 
 /**
- * @defgroup icp IntegratorCP platform driver.
- * @brief HelenOS IntegratorCP platform driver.
+ * @addtogroup icp
  * @{
  */
Index: uspace/drv/platform/mac/doc/doxygroups.h
===================================================================
--- uspace/drv/platform/mac/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
+++ uspace/drv/platform/mac/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -0,0 +1,4 @@
+/** @addtogroup mac mac
+ * @brief Platform driver for PowerPC-based Macs
+ * @ingroup drvs
+ */
Index: uspace/drv/platform/mac/mac.c
===================================================================
--- uspace/drv/platform/mac/mac.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/mac/mac.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -29,6 +29,5 @@
 
 /**
- * @defgroup mac Mac platform driver.
- * @brief HelenOS Mac platform driver.
+ * @addtogroup mac mac
  * @{
  */
Index: uspace/drv/platform/malta/doc/doxygroups.h
===================================================================
--- uspace/drv/platform/malta/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
+++ uspace/drv/platform/malta/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -0,0 +1,4 @@
+/** @addtogroup malta malta
+ * @brief MIPS Malta platform driver
+ * @ingroup drvs
+ */
Index: uspace/drv/platform/malta/malta.c
===================================================================
--- uspace/drv/platform/malta/malta.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/malta/malta.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -29,6 +29,5 @@
 
 /**
- * @defgroup malta Malta board platform driver.
- * @brief HelenOS Malta board platform driver.
+ * @addtogroup malta
  * @{
  */
Index: uspace/drv/platform/msim/doc/doxygroups.h
===================================================================
--- uspace/drv/platform/msim/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
+++ uspace/drv/platform/msim/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -0,0 +1,4 @@
+/** @addtogroup msim msim
+ * @brief Platform driver for the MSIM simulator machine
+ * @ingroup drvs
+ */
Index: uspace/drv/platform/msim/msim.c
===================================================================
--- uspace/drv/platform/msim/msim.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/msim/msim.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -29,6 +29,5 @@
 
 /**
- * @defgroup msim MSIM platform driver.
- * @brief HelenOS MSIM platform driver.
+ * @addtogroup msim
  * @{
  */
Index: uspace/drv/platform/pc/doc/doxygroups.h
===================================================================
--- uspace/drv/platform/pc/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
+++ uspace/drv/platform/pc/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -0,0 +1,4 @@
+/** @addtogroup pc pc
+ * @brief PC platform driver
+ * @ingroup drvs
+ */
Index: uspace/drv/platform/pc/pc.c
===================================================================
--- uspace/drv/platform/pc/pc.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/pc/pc.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -28,6 +28,5 @@
 
 /**
- * @defgroup pc PC platform driver.
- * @brief HelenOS PC platform driver.
+ * @addtogroup pc pc
  * @{
  */
Index: uspace/drv/platform/ski/doc/doxygroups.h
===================================================================
--- uspace/drv/platform/ski/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
+++ uspace/drv/platform/ski/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -0,0 +1,4 @@
+/** @addtogroup ski ski
+ * @brief Platform driver for the Ski IA-64 simulator machine
+ * @ingroup drvs
+ */
Index: uspace/drv/platform/ski/ski.c
===================================================================
--- uspace/drv/platform/ski/ski.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/ski/ski.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -28,6 +28,5 @@
 
 /**
- * @defgroup ski platform driver.
- * @brief Ski platform driver.
+ * @addtogroup ski ski
  * @{
  */
Index: uspace/drv/platform/sun4u/doc/doxygroups.h
===================================================================
--- uspace/drv/platform/sun4u/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
+++ uspace/drv/platform/sun4u/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -0,0 +1,4 @@
+/** @addtogroup sun4u sun4u
+ * @brief Sun sun4u platform driver
+ * @ingroup drvs
+ */
Index: uspace/drv/platform/sun4u/sun4u.c
===================================================================
--- uspace/drv/platform/sun4u/sun4u.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/sun4u/sun4u.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -28,6 +28,5 @@
 
 /**
- * @defgroup sun4u sun4u platform driver.
- * @brief HelenOS sun4u platform driver.
+ * @addtogroup sun4u sun4u
  * @{
  */
Index: uspace/drv/platform/sun4v/doc/doxygroups.h
===================================================================
--- uspace/drv/platform/sun4v/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
+++ uspace/drv/platform/sun4v/doc/doxygroups.h	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -0,0 +1,4 @@
+/** @addtogroup sun4v sun4v
+ * @brief Sun sun4v platform driver
+ * @ingroup drvs
+ */
Index: uspace/drv/platform/sun4v/sun4v.c
===================================================================
--- uspace/drv/platform/sun4v/sun4v.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/platform/sun4v/sun4v.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
@@ -28,6 +28,5 @@
 
 /**
- * @defgroup sun4v platform driver.
- * @brief Sun4v platform driver.
+ * @addtogroup sun4v sun4v
  * @{
  */