Index: /trunk/src/VBox/Main/include/USBGetDevices.h
===================================================================
--- /trunk/src/VBox/Main/include/USBGetDevices.h	(revision 37623)
+++ /trunk/src/VBox/Main/include/USBGetDevices.h	(revision 37624)
@@ -75,10 +75,4 @@
 RT_C_DECLS_BEGIN
 
-/**
- * Check whether a USB device tree root is usable
- * @param pcszRoot        the path to the root of the device tree
- * @param fIsDeviceNodes  whether this is a device node (or usbfs) tree
- * @note  returns a pointer into a static array so it will stay valid
- */
 extern bool USBProxyLinuxCheckDeviceRoot(const char *pcszRoot,
                                          bool fIsDeviceNodes);
@@ -91,40 +85,11 @@
 #endif
 
-/**
- * Selects the access method that will be used to access USB devices based on
- * what is available on the host and what if anything the user has specified
- * in the environment.
- * @returns iprt status value
- * @param  pfUsingUsbfsDevices  on success this will be set to true if 
- *                              the prefered access method is USBFS-like and to
- *                              false if it is sysfs/device node-like
- * @param  ppcszDevicesRoot     on success the root of the tree of USBFS-like
- *                              device nodes will be stored here
- */
 extern int USBProxyLinuxChooseMethod(bool *pfUsingUsbfsDevices,
                                      const char **ppcszDevicesRoot);
 #ifdef UNIT_TEST
-/**
- * Specify the list of devices that will appear to be available through
- * usbfs during unit testing (of USBProxyLinuxGetDevices)
- * @param  pacszDeviceAddresses  NULL terminated array of usbfs device addresses
- */
 extern void TestUSBSetAvailableUsbfsDevices(const char **pacszDeviceAddresses);
-/**
- * Specify the list of files that access will report as accessible (at present
- * we only do accessible or not accessible) during unit testing (of
- * USBProxyLinuxGetDevices)
- * @param  pacszAccessibleFiles  NULL terminated array of file paths to be
- *                               reported accessible
- */
 extern void TestUSBSetAccessibleFiles(const char **pacszAccessibleFiles);
 #endif
 
-/**
- * Get the list of USB devices supported by the system.  Should be freed using
- * @a deviceFree or something equivalent.
- * @param pcszDevicesRoot  the path to the root of the device tree
- * @param fUseSysfs        whether to use sysfs (or usbfs) for enumeration
- */
 extern PUSBDEVICE USBProxyLinuxGetDevices(const char *pcszDevicesRoot,
                                           bool fUseSysfs);
Index: /trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp	(revision 37623)
+++ /trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp	(revision 37624)
@@ -1481,4 +1481,9 @@
 # define getDevicesFromUsbfs testGetUsbfsDevices
 
+/**
+ * Specify the list of devices that will appear to be available through
+ * usbfs during unit testing (of USBProxyLinuxGetDevices)
+ * @param  pacszDeviceAddresses  NULL terminated array of usbfs device addresses
+ */
 void TestUSBSetAvailableUsbfsDevices(const char **pacszDeviceAddresses)
 {
@@ -1500,4 +1505,11 @@
 # define access testAccess
 
+/**
+ * Specify the list of files that access will report as accessible (at present
+ * we only do accessible or not accessible) during unit testing (of
+ * USBProxyLinuxGetDevices)
+ * @param  pacszAccessibleFiles  NULL terminated array of file paths to be
+ *                               reported accessible
+ */
 void TestUSBSetAccessibleFiles(const char **pacszAccessibleFiles)
 {
@@ -1656,4 +1668,10 @@
 #endif
 
+/**
+ * Check whether a USB device tree root is usable
+ * @param pcszRoot        the path to the root of the device tree
+ * @param fIsDeviceNodes  whether this is a device node (or usbfs) tree
+ * @note  returns a pointer into a static array so it will stay valid
+ */
 bool USBProxyLinuxCheckDeviceRoot(const char *pcszRoot, bool fIsDeviceNodes)
 {
@@ -1689,4 +1707,10 @@
 #endif
 
+/**
+ * Get the list of USB devices supported by the system.  Should be freed using
+ * @a deviceFree or something equivalent.
+ * @param pcszDevicesRoot  the path to the root of the device tree
+ * @param fUseSysfs        whether to use sysfs (or usbfs) for enumeration
+ */
 PUSBDEVICE USBProxyLinuxGetDevices(const char *pcszDevicesRoot,
                                    bool fUseSysfs)