Index: /trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp	(revision 58340)
@@ -1046,6 +1046,4 @@
 /**
  * Module initialization code.
- *
- * @param   hMod            Opque module handle.
  */
 const SUPDRVTRACERREG * VBOXCALL supdrvDTraceInit(void)
Index: /trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp	(revision 58340)
@@ -2398,4 +2398,5 @@
  * @param   pSession    Session data.
  * @param   pReqHdr     The request header.
+ * @param   cbReq       The size of the request buffer.
  */
 int VBOXCALL supdrvIOCtl(uintptr_t uIOCtl, PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPREQHDR pReqHdr, size_t cbReq)
@@ -2620,4 +2621,6 @@
  *          All future reference must use this identifier.
  * @returns NULL on failure.
+ * @param   pSession        The caller's session.
+ * @param   enmType         The object type.
  * @param   pfnDestructor   The destructore function which will be called when the reference count reaches 0.
  * @param   pvUser1         The first user argument.
@@ -3381,5 +3384,5 @@
  * @param   ppvR3       Where to store the address of the Ring-3 mapping.
  *                      NULL if no ring-3 mapping.
- * @param   ppvR3       Where to store the address of the Ring-0 mapping.
+ * @param   ppvR0       Where to store the address of the Ring-0 mapping.
  *                      NULL if no ring-0 mapping.
  * @param   paPages     Where to store the addresses of the pages. Optional.
@@ -3646,5 +3649,5 @@
  * Reports a bad context, currenctly that means EFLAGS.AC is 0 instead of 1.
  *
- * @param   pSession        The session of the caller.
+ * @param   pDevExt         The device extension.
  * @param   pszFile         The source file where the caller detected the bad
  *                          context.
@@ -3869,5 +3872,5 @@
  *
  * @returns VBox status code.
- * @param   fIsSmxModeAmbiguous   Where to write whether the SMX mode causes
+ * @param   pfIsSmxModeAmbiguous  Where to return whether the SMX mode causes
  *                                ambiguity that makes us unsure whether we
  *                                really can use VT-x or not.
@@ -3876,5 +3879,5 @@
  *          The caller is also expected to check that the CPU is an Intel (or
  *          VIA) CPU -and- that it supports VT-x.  Otherwise, this function
- *          might throw a #GP fault as it tries to read/write MSRs that may not
+ *          might throw a \#GP fault as it tries to read/write MSRs that may not
  *          be present!
  */
@@ -5232,6 +5235,5 @@
  * @returns IPRT status code.
  * @param   pDevExt             Device globals.
- * @param   pSession            Session data.
- * @param   pVMMR0              VMMR0 image handle.
+ * @param   pvVMMR0             VMMR0 image handle.
  * @param   pvVMMR0EntryFast    VMMR0EntryFast address.
  * @param   pvVMMR0EntryEx      VMMR0EntryEx address.
Index: /trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp	(revision 58340)
@@ -4242,5 +4242,5 @@
  *          other error code on internal error.
  *
- * @param   pThis           Pointer to the grant service instance data.
+ * @param   pDevExt         The device instance data.
  * @param   enmCurState     The current state.
  * @param   enmNewState     The new state we're waiting for it to enter.
Index: /trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h	(revision 58340)
@@ -1442,5 +1442,5 @@
                 } Modify;
 
-                /** Reserve space for the future.. */
+                /** Reserve space for the future. */
                 uint64_t        auPadding[3];
             } uArgs;
Index: /trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h	(revision 58340)
@@ -231,9 +231,16 @@
 #endif
 
+#ifdef DOXYGEN_RUNNING
+# define SUPDRV_WITH_MSR_PROBER
+# define SUPDRV_WITHOUT_MSR_PROBER
+#endif
+
 #if 1
-/**  Use a dedicated kernel thread to service TSC-delta measurement requests.
- *   @todo Test on servers with many CPUs and sockets. */
-#define SUPDRV_USE_TSC_DELTA_THREAD
-#endif
+/** @def SUPDRV_USE_TSC_DELTA_THREAD
+ * Use a dedicated kernel thread to service TSC-delta measurement requests.
+ * @todo Test on servers with many CPUs and sockets. */
+# define SUPDRV_USE_TSC_DELTA_THREAD
+#endif
+
 
 /*******************************************************************************
Index: /trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp	(revision 58340)
@@ -249,5 +249,4 @@
  * @param   uVtgHdrAddr         The address where the header is actually
  *                              loaded.
- * @param   cbVtgObj            The alleged size of the header.
  * @param   pbImage             The image base, if available.
  * @param   cbImage             The image size, if available.
@@ -868,5 +867,5 @@
  *
  * @returns VBox status code.
- * @param   pszName             The driver name.
+ * @param   pDevExt             The device instance data.
  * @param   pVtgHdr             The VTG object header.
  * @param   pImage              The image if applicable.
@@ -1103,5 +1102,4 @@
  *
  * @param   pSession            The support driver session handle.
- * @param   pVtgHdr             The VTG header.
  */
 SUPR0DECL(void) SUPR0TracerDeregisterDrv(PSUPDRVSESSION pSession)
Index: /trunk/src/VBox/HostDrivers/Support/SUPLib.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPLib.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPLib.cpp	(revision 58340)
@@ -1791,6 +1791,9 @@
  *
  * @param   pThis               The string table structure.
- * @param   paProbLocs          The probe location array.
- * @param   cProbLocs           The number of probe locations.
+ * @param   paProbeLocs32       The probe location array, 32-bit type variant.
+ * @param   paProbeLocs64       The probe location array, 64-bit type variant.
+ * @param   cProbeLocs          The number of elements in the array.
+ * @param   f32Bit              Set if @a paProbeLocs32 should be used, when
+ *                              clear use @a paProbeLocs64.
  */
 static void supr3TracerDestroyStrTab(PSUPDRVTRACERSTRTAB pThis, PVTGPROBELOC32 paProbeLocs32, PVTGPROBELOC64 paProbeLocs64,
@@ -1819,7 +1822,10 @@
  *
  * @returns Pointer to a string table structure.  NULL on failure.
- * @param   paProbLocs          The probe location array.
- * @param   cProbLocs           The number of elements in the array.
- * @param   cBits
+ * @param   paProbeLocs32       The probe location array, 32-bit type variant.
+ * @param   paProbeLocs64       The probe location array, 64-bit type variant.
+ * @param   cProbeLocs          The number of elements in the array.
+ * @param   offDelta            Relocation offset for the string pointers.
+ * @param   f32Bit              Set if @a paProbeLocs32 should be used, when
+ *                              clear use @a paProbeLocs64.
  */
 static PSUPDRVTRACERSTRTAB supr3TracerCreateStrTab(PVTGPROBELOC32 paProbeLocs32,
Index: /trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp	(revision 58340)
@@ -350,5 +350,10 @@
  *
  * @returns VBox status code.
- * @param   pszFilename     Name of the VMMR0 image file
+ * @param   pszFilename         Name of the VMMR0 image file
+ * @param   pszModule           The modulen name.
+ * @param   pszSrvReqHandler    The service request handler symbol name,
+ *                              optional.
+ * @param   pErrInfo            Where to store detailed error info. Optional.
+ * @param   ppvImageBase        Where to return the load address.
  */
 static int supLoadModule(const char *pszFilename, const char *pszModule, const char *pszSrvReqHandler,
Index: /trunk/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c	(revision 58340)
@@ -40,4 +40,5 @@
  *
  * @param   pHandle     The IDC handle.
+ * @param   ppfn        Where to return the address of the symbol.
  * @param   pszName     The name of the symbol.
  */
@@ -66,5 +67,6 @@
  * @returns Pointer to the symbol on success, NULL on failure.
  *
- * @param   pHandle     The IDC handle.
+ * @param   pSession    The IDC session.
+ * @param   ppfn        Where to return the address of the symbol.
  * @param   pszName     The name of the symbol.
  */
Index: /trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp	(revision 58340)
@@ -845,9 +845,7 @@
 
 /**
- * Returns the full path to the executable.
+ * Returns the full path to the executable in g_szSupLibHardenedExePath.
  *
  * @returns IPRT status code.
- * @param   pszPath     Where to store it.
- * @param   cchPath     How big that buffer is.
  */
 static void supR3HardenedGetFullExePath(void)
Index: /trunk/src/VBox/HostDrivers/Support/SUPSvc.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPSvc.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPSvc.cpp	(revision 58340)
@@ -305,5 +305,5 @@
  *
  * @param   pszFormat   The log string. No trailing newline.
- * @param   ...         Format arguments.
+ * @param   va          Format arguments.
  *
  * @todo    This should later be replaced by the release logger and callback destination(s).
Index: /trunk/src/VBox/HostDrivers/Support/SUPSvcInternal.h
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPSvcInternal.h	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/SUPSvcInternal.h	(revision 58340)
@@ -54,5 +54,5 @@
  * Logs the message to the appropriate system log.
  *
- * @param   psMsg       The log string.
+ * @param   pszMsg      The log string.
  */
 void supSvcOsLogErrorStr(const char *pszMsg);
Index: /trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp	(revision 58340)
@@ -849,5 +849,5 @@
  *
  * @returns VBox status code, see supdrvIDC.
- * @param   iReq        The request code.
+ * @param   uReq        The request code.
  * @param   pReq        The request.
  */
Index: /trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c	(revision 58340)
@@ -75,5 +75,5 @@
 static d_open_t     VBoxDrvFreeBSDOpenUsr;
 static d_open_t     VBoxDrvFreeBSDOpenSys;
-static void         VBoxDrvFreeBSDDtr(void *pData);
+static void         VBoxDrvFreeBSDDtr(void *pvData);
 static d_ioctl_t    VBoxDrvFreeBSDIOCtl;
 static int          VBoxDrvFreeBSDIOCtlSlow(PSUPDRVSESSION pSession, u_long ulCmd, caddr_t pvData, struct thread *pTd);
@@ -225,10 +225,11 @@
  * @returns 0 on success, errno on failure.
  *          EBUSY if the device is used by someone else.
- * @param   pDev        The device node.
- * @param   fOpen       The open flags.
- * @param   pTd         The thread.
- * @param   iDevType    ???
- */
-static int vboxdrvFreeBSDOpenCommon(struct cdev *pDev, int fOpen, int iDevtype, struct thread *pTd, bool fUnrestricted)
+ * @param   pDev            The device node.
+ * @param   fOpen           The open flags.
+ * @param   iDevType        Some device type thing we don't use.
+ * @param   pTd             The thread.
+ * @param   fUnrestricted   Set if opening /dev/vboxdrv, clear if /dev/vboxdrvu.
+ */
+static int vboxdrvFreeBSDOpenCommon(struct cdev *pDev, int fOpen, int iDevType, struct thread *pTd, bool fUnrestricted)
 {
     PSUPDRVSESSION pSession;
@@ -253,5 +254,5 @@
         pSession->Uid = stuff;
         pSession->Gid = stuff; */
-        devfs_set_cdevpriv(pSession, VBoxDrvFreeBSDDtr);
+        rc = devfs_set_cdevpriv(pSession, vboxdrvFreeBSDDtr); Assert(rc == 0);
         Log(("VBoxDrvFreeBSDOpen: pSession=%p\n", pSession));
         ASMAtomicIncU32(&g_cUsers);
@@ -264,30 +265,27 @@
 
 /** For vboxdrv. */
-static int VBoxDrvFreeBSDOpenSys(struct cdev *pDev, int fOpen, int iDevtype, struct thread *pTd)
-{
-    return vboxdrvFreeBSDOpenCommon(pDev, fOpen, iDevtype, pTd, true);
+static int VBoxDrvFreeBSDOpenSys(struct cdev *pDev, int fOpen, int iDevType, struct thread *pTd)
+{
+    return vboxdrvFreeBSDOpenCommon(pDev, fOpen, iDevType, pTd, true);
 }
 
 
 /** For vboxdrvu. */
-static int VBoxDrvFreeBSDOpenUsr(struct cdev *pDev, int fOpen, int iDevtype, struct thread *pTd)
-{
-    return vboxdrvFreeBSDOpenCommon(pDev, fOpen, iDevtype, pTd, false);
-}
-
-
-/**
- * Close a file device previously opened by VBoxDrvFreeBSDOpen
+static int VBoxDrvFreeBSDOpenUsr(struct cdev *pDev, int fOpen, int iDevType, struct thread *pTd)
+{
+    return vboxdrvFreeBSDOpenCommon(pDev, fOpen, iDevType, pTd, false);
+}
+
+
+/**
+ * Close a file device previously opened by VBoxDrvFreeBSDOpen.
  *
  * @returns 0 on success.
- * @param   pDev        The device.
- * @param   fFile       The file descriptor flags.
- * @param   DevType     The device type (CHR.
- * @param   pTd         The calling thread.
- */
-static void VBoxDrvFreeBSDDtr(void *pData)
-{
-    PSUPDRVSESSION pSession = pData;
-    Log(("VBoxDrvFreeBSDDtr: pSession=%p\n", pSession));
+ * @param   pvData      The session being closed.
+ */
+static void vboxdrvFreeBSDDtr(void *pvData)
+{
+    PSUPDRVSESSION pSession = pvData;
+    Log(("vboxdrvFreeBSDDtr: pSession=%p\n", pSession));
 
     /*
@@ -469,5 +467,5 @@
  *
  * @returns VBox status code, see supdrvIDC.
- * @param   iReq        The request code.
+ * @param   uReq        The request code.
  * @param   pReq        The request.
  */
Index: /trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c	(revision 58340)
@@ -604,7 +604,8 @@
  * Suspend callback.
  * @param   pDev        Pointer to the platform device.
- * @param   State       message type, see Documentation/power/devices.txt.
- */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+ * @param   State       Message type, see Documentation/power/devices.txt.
+ *                      Ignored.
+ */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && !defined(DOXYGEN_RUNNING)
 static int VBoxDrvSuspend(struct device *pDev)
 # else
@@ -640,5 +641,5 @@
  * @param   ulArg       The argument specified to ioctl().
  */
-#ifdef HAVE_UNLOCKED_IOCTL
+#if defined(HAVE_UNLOCKED_IOCTL) || defined(DOXYGEN_RUNNING)
 static long VBoxDrvLinuxIOCtl(struct file *pFilp, unsigned int uCmd, unsigned long ulArg)
 #else
@@ -811,5 +812,5 @@
  *
  * @returns VBox status code, see supdrvIDC.
- * @param   iReq        The request code.
+ * @param   uReq        The request code.
  * @param   pReq        The request.
  */
Index: /trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c	(revision 58340)
@@ -665,5 +665,5 @@
  * @param   Dev             Device number
  * @param   Cmd             Operation identifier
- * @param   pArg            Arguments from user to driver
+ * @param   pArgs           Arguments from user to driver
  * @param   Mode            Information bitfield (read/write, address space etc.)
  * @param   pCred           User credentials
@@ -745,5 +745,5 @@
  *
  * @param   pSession    The session.
- * @param   Cmd         The IOCtl command.
+ * @param   iCmd        The IOCtl command.
  * @param   Mode        Information bitfield (for specifying ownership of data)
  * @param   iArg        User space address of the request buffer.
@@ -849,5 +849,5 @@
  *
  * @returns VBox status code, see supdrvIDC.
- * @param   iReq        The request code.
+ * @param   uReq        The request code.
  * @param   pReq        The request.
  */
Index: /trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp	(revision 58340)
@@ -1005,5 +1005,5 @@
  * @param   pvOutput            The output buffer as specfied by the user.
  * @param   cbOutput            The size of the output buffer.
- * @param   uFunction           The function.
+ * @param   uCmd                The I/O command/function being invoked.
  * @param   pIoStatus           Where to return the status of the operation.
  * @param   pDevObj             The device object..
@@ -1259,5 +1259,5 @@
  * @returns NT status code.
  *
- * @param   pDevObj     Device object.
+ * @param   pDevExt     Device extension.
  * @param   pSession    The session.
  * @param   pIrp        Request packet.
Index: /trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c	(revision 58340)
@@ -1202,5 +1202,4 @@
  *
  * @returns Pointer to the instance by the given name. NULL if not found.
- * @param   pGlobals        The globals.
  * @param   pszName         The name of the instance.
  */
Index: /trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp	(revision 58340)
@@ -337,6 +337,8 @@
  * Device open. Called on open /dev/vboxnetctl
  *
- * @param   pInode      Pointer to inode info structure.
- * @param   pFilp       Associated file pointer.
+ * @param   Dev         The device number.
+ * @param   fFlags      ???.
+ * @param   fDevType    ???.
+ * @param   pProcess    The process issuing this request.
  */
 static int VBoxNetAdpDarwinOpen(dev_t Dev, int fFlags, int fDevType, struct proc *pProcess)
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h	(revision 58340)
@@ -382,4 +382,5 @@
  *
  * @param   pThis           The instance.
+ * @param   fActive         Whether to active (@c true) or deactive.
  *
  * @remarks Owns the lock for the out-bound trunk port.
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	(revision 58340)
@@ -771,9 +771,8 @@
  * @param   pBuf                The sk_buff.
  * @param   pSG                 The SG.
- * @param   pvFrame             The frame pointer, optional.
  * @param   cSegs               The number of segments allocated for the SG.
  *                              This should match the number in the mbuf exactly!
  * @param   fSrc                The source of the frame.
- * @param   pGso                Pointer to the GSO context if it's a GSO
+ * @param   pGsoCtx             Pointer to the GSO context if it's a GSO
  *                              internal network frame.  NULL if regular frame.
  */
@@ -846,12 +845,7 @@
 
 /**
- * Packet handler,
- *
- * @returns 0 or EJUSTRETURN.
- * @param   pThis           The instance.
- * @param   pMBuf           The mbuf.
- * @param   pvFrame         The start of the frame, optional.
- * @param   fSrc            Where the packet (allegedly) comes from, one INTNETTRUNKDIR_* value.
- * @param   eProtocol       The protocol.
+ * Packet handler; not really documented - figure it out yourself.
+ *
+ * @returns 0 or EJUSTRETURN - this is probably copy & pastry and thus wrong.
  */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
@@ -1372,5 +1366,7 @@
 
 /**
- *
+ * I won't disclose what I do, figure it out yourself, including pThis referencing.
+ *
+ * @param   pThis       The net filter instance.
  * @param   pBuf        The socket buffer.  This is consumed by this function.
  */
@@ -1609,6 +1605,5 @@
  * @returns VBox status code.
  * @param   pThis           The instance.
- * @param   fRediscovery    If set we're doing a rediscovery attempt, so, don't
- *                          flood the release log.
+ * @param   pDev            The device to attach to.
  */
 static int vboxNetFltLinuxAttachToInterface(PVBOXNETFLTINS pThis, struct net_device *pDev)
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c	(revision 58340)
@@ -124,5 +124,5 @@
  * Stream Driver hooks.
  */
-static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppResult);
+static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppvResult);
 static int VBoxNetFltSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd);
 static int VBoxNetFltSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd);
@@ -718,5 +718,5 @@
  * @returns  corresponding solaris error code.
  */
-static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppResult)
+static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppvResult)
 {
     LogFunc((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd,
@@ -727,5 +727,5 @@
         case DDI_INFO_DEVT2DEVINFO:
         {
-            *ppResult = g_pVBoxNetFltSolarisDip;
+            *ppvResult = g_pVBoxNetFltSolarisDip;
             return DDI_SUCCESS;
         }
@@ -734,5 +734,5 @@
         {
             int instance = getminor((dev_t)pvArg);
-            *ppResult = (void *)(uintptr_t)instance;
+            *ppvResult = (void *)(uintptr_t)instance;
             return DDI_SUCCESS;
         }
@@ -1318,5 +1318,5 @@
  *
  * @returns VBox status code.
- * @param   pQueue      Pointer to the read queue.
+ * @param   pPromiscStream  Pointer to the read queue.
  */
 static int vboxNetFltSolarisSetRawMode(vboxnetflt_promisc_stream_t *pPromiscStream)
@@ -1822,4 +1822,5 @@
  *
  * @returns VBox status code.
+ * @param   pVNode  Pointer to the device vnode.
  * @param   MuxId   The multiplexor ID.
  * @param   pFd     Where to store the lower stream file descriptor.
@@ -1909,4 +1910,5 @@
  *
  * @returns VBox status code.
+ * @param   fAttach     Is this an attach or detach.
  * @param   pVNode      Pointer to the lower stream vnode.
  * @param   pModPos     Where to store the module position.
@@ -2645,5 +2647,5 @@
  * Ipv6 dynamic attachment timer callback to attach to the Ipv6 stream if needed.
  *
- * @param   pThis           Pointer to the timer.
+ * @param   pTimer          Pointer to the timer.
  * @param   pvData          Opaque pointer to the instance.
  * @param   iTick           Timer tick (unused).
@@ -2851,4 +2853,5 @@
  * @param   pThis           The instance.
  * @param   pSG             Pointer to the scatter-gather list.
+ * @param   fDst            The destination mask, INTNETTRUNKDIR_XXX. Ignored.
  */
 static mblk_t *vboxNetFltSolarisMBlkFromSG(PVBOXNETFLTINS pThis, PINTNETSG pSG, uint32_t fDst)
@@ -2967,5 +2970,5 @@
  * @returns VBox status code.
  * @param   pMsg        Pointer to the raw message.
- * @param   pDlpiMsg    Where to store the M_PROTO message.
+ * @param   ppDlpiMsg   Where to store the M_PROTO message.
  *
  * @remarks The original raw message would be no longer valid and will be
@@ -3370,5 +3373,5 @@
  * @param   pStream     Pointer to the stream.
  * @param   pQueue      Pointer to the read queue.
- * @param   pOrigMsg    Pointer to the message.
+ * @param   pMsg        Pointer to the message.
  */
 static int vboxNetFltSolarisRecv(PVBOXNETFLTINS pThis, vboxnetflt_stream_t *pStream, queue_t *pQueue, mblk_t *pMsg)
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c	(revision 58340)
@@ -121,5 +121,5 @@
 LOCAL int VBoxNetFltSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd);
 LOCAL int VBoxNetFltSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd);
-LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppResult);
+LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppvResult);
 
 
@@ -425,5 +425,5 @@
  * @returns corresponding solaris error code.
  */
-LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppResult)
+LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppvResult)
 {
     Log((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd, getminor((dev_t)pvArg)));
@@ -433,5 +433,5 @@
         case DDI_INFO_DEVT2DEVINFO:
         {
-            *ppResult = g_pVBoxNetFltSolarisDip;
+            *ppvResult = g_pVBoxNetFltSolarisDip;
             return DDI_SUCCESS;
         }
@@ -440,5 +440,5 @@
         {
             int instance = getminor((dev_t)pvArg);
-            *ppResult = (void *)(uintptr_t)instance;
+            *ppvResult = (void *)(uintptr_t)instance;
             return DDI_SUCCESS;
         }
@@ -812,6 +812,4 @@
  * @param   pThis           The instance.
  * @param   pVNIC           Pointer to the VNIC.
- * @param   pVNICTemplate   Pointer to the VNIC template initialize from, can be
- *                          NULL.
  *
  * @returns VBox status code.
Index: /trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c	(revision 58340)
@@ -293,5 +293,5 @@
 
 /**
- * @interface_method_impl{RAWPCIDEVPORT,pfnUnapRegion}
+ * @interface_method_impl{RAWPCIDEVPORT,pfnUnmapRegion}
  */
 static DECLCALLBACK(int) vboxPciDevUnmapRegion(PRAWPCIDEVPORT pPort,
Index: /trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c	(revision 58340)
@@ -883,7 +883,7 @@
  * @param   iIrq            The IRQ number.
  * @param   pvDevId         The device ID, a pointer to PVBOXRAWPCIINS.
- * @param   pvRegs          Register set. Removed in 2.6.19.
+ * @param   pRegs           Register set. Removed in 2.6.19.
  */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) && !defined(DOXYGEN_RUNNING)
 static irqreturn_t vboxPciOsIrqHandler(int iIrq, void *pvDevId)
 #else
Index: /trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp	(revision 58340)
@@ -402,10 +402,16 @@
  *
  * @returns Owner on if matched, VBOXUSBFILTER_CONTEXT_NIL it not matched.
- * @param   pDevice     The device data as a filter structure.
- *                      See USBFilterMatch for how to construct this.
- * @param   puId        Where to store the filter id (optional).
- * @param   pfFilter    Where to store whether the device must be filtered or not
- */
-VBOXUSBFILTER_CONTEXT VBoxUSBFilterMatchEx(PCUSBFILTER pDevice, uintptr_t *puId, bool fRemoveFltIfOneShot, bool *pfFilter, bool *pfIsOneShot)
+ * @param   pDevice             The device data as a filter structure.
+ *                              See USBFilterMatch for how to construct this.
+ * @param   puId                Where to store the filter id (optional).
+ * @param   fRemoveFltIfOneShot Whether or not to remove one-shot filters on
+ *                              match.
+ * @param   pfFilter            Where to store whether the device must be filtered or not
+ * @param   pfIsOneShot         Where to return whetehr the match was a one-shot
+ *                              filter or not.  Optional.
+ *
+ */
+VBOXUSBFILTER_CONTEXT VBoxUSBFilterMatchEx(PCUSBFILTER pDevice, uintptr_t *puId,
+                                           bool fRemoveFltIfOneShot, bool *pfFilter, bool *pfIsOneShot)
 {
     /*
Index: /trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h	(revision 58340)
@@ -23,4 +23,6 @@
 RT_C_DECLS_BEGIN
 
+/** @todo r=bird: VBOXUSBFILTER_CONTEXT isn't following the coding
+ *        guildlines. Don't know which clueless dude did this...  */
 #if defined(RT_OS_WINDOWS)
 typedef struct VBOXUSBFLTCTX *VBOXUSBFILTER_CONTEXT;
Index: /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c	(revision 58340)
@@ -330,5 +330,6 @@
 LOCAL bool vboxUSBSolarisIsUSBDevice(dev_info_t *pDip);
 
-/** Device Operation Hooks */
+/** @name Device Operation Hooks
+ * @{ */
 LOCAL int vboxUSBSolarisSendURB(vboxusb_state_t *pState, PVBOXUSBREQ_URB pUrbReq, int Mode);
 LOCAL int vboxUSBSolarisReapURB(vboxusb_state_t *pState, PVBOXUSBREQ_URB pUrbReq, int Mode);
@@ -340,6 +341,8 @@
 LOCAL int vboxUSBSolarisAbortPipe(vboxusb_state_t *pState, uint8_t bEndpoint);
 LOCAL int vboxUSBSolarisGetConfigIndex(vboxusb_state_t *pState, uint_t uCfgValue);
-
-/** Hotplug & Power Management Hooks */
+/** @} */
+
+/** @name Hotplug & Power Management Hooks
+ * @{ */
 LOCAL inline void vboxUSBSolarisNotifyHotplug(vboxusb_state_t *pState);
 LOCAL int vboxUSBSolarisDeviceDisconnected(dev_info_t *pDip);
@@ -353,11 +356,16 @@
 LOCAL void vboxUSBSolarisPowerBusy(vboxusb_state_t *pState);
 LOCAL void vboxUSBSolarisPowerIdle(vboxusb_state_t *pState);
-
-/** Monitor Hooks */
+/** @} */
+
+/** @name Monitor Hooks
+ * @{ */
 int VBoxUSBMonSolarisRegisterClient(dev_info_t *pClientDip, PVBOXUSB_CLIENT_INFO pClientInfo);
 int VBoxUSBMonSolarisUnregisterClient(dev_info_t *pClientDip);
-
-/** Callbacks from Monitor */
+/** @} */
+
+/** @name Callbacks from Monitor
+ * @{ */
 LOCAL int vboxUSBSolarisSetConsumerCredentials(RTPROCESS Process, int Instance, void *pvReserved);
+/** @} */
 
 
@@ -1551,5 +1559,5 @@
  * Convert Solaris' USBA device state to VBox's error code.
  *
- * @param   UsbRc           Solaris USBA error code.
+ * @param   uDeviceState        The USB device state to convert.
  *
  * @returns VBox error code.
@@ -2060,5 +2068,5 @@
  *
  * @param   pState          The USB device instance.
- * @param   uCfgValue       The Configuration value.
+ * @param   bCfgValue       The Configuration value.
  *
  * @returns VBox error code.
@@ -2216,5 +2224,5 @@
  *
  * @param   pState          The USB device instance.
- * @param   ResetLevel      The reset level.
+ * @param   enmReset        The reset level.
  *
  * @returns VBox error code.
@@ -2350,5 +2358,4 @@
  * @param   pEpData         The Endpoint data.
  * @param   uCfgValue       The Configuration value.
- * @param   uCfgIndex       The Configuration index.
  * @param   uInterface      The Interface.
  * @param   uAlt            The Alternate setting.
@@ -2357,5 +2364,5 @@
  */
 LOCAL int vboxUSBSolarisInitEndPoint(vboxusb_state_t *pState, usb_ep_data_t *pEpData, uchar_t uCfgValue,
-                                uchar_t uInterface, uchar_t uAlt)
+                                     uchar_t uInterface, uchar_t uAlt)
 {
     LogFunc((DEVICE_NAME ":vboxUSBSolarisInitEndPoint pState=%p pEpData=%p CfgVal=%d Iface=%d Alt=%d", pState,
@@ -2815,7 +2822,5 @@
  *
  * @param   pState          The USB device instance.
- * @param   pUrb            The URB to initialize.
  * @param   pUrbReq         Opaque pointer to the complete request.
- * @param   pMsg            Pointer to the allocated request data.
  *
  * @returns The allocated Isoc. In URB to be used.
Index: /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c	(revision 58339)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c	(revision 58340)
@@ -669,8 +669,11 @@
  *
  * @param   iFunction           The requested function.
- * @param   pvState             Opaque pointer to driver state used for getting ring-3 process (Id).
- * @param   pvData              The input/output data buffer. Can be NULL depending on the function.
+ * @param   pvState             Opaque pointer to driver state used for getting
+ *                              ring-3 process (Id).
+ * @param   pvData              The input/output data buffer. Can be NULL
+ *                              depending on the function.
  * @param   cbData              The max size of the data buffer.
- * @param   pcbDataReturned     Where to store the amount of returned data. Can be NULL.
+ * @param   pcbReturnedData     Where to store the amount of returned data.  Can
+ *                              be NULL.
  */
 static int vboxUSBMonSolarisProcessIOCtl(int iFunction, void *pvState, void *pvData, size_t cbData, size_t *pcbReturnedData)
@@ -904,6 +907,4 @@
  *
  * @returns VBox status code.
- * @param   pszDevicePath       The device path of the client driver.
- * @param   Instance            The client driver instance.
  */
 int VBoxUSBMonSolarisRegisterClient(dev_info_t *pClientDip, PVBOXUSB_CLIENT_INFO pClientInfo)
@@ -933,9 +934,7 @@
             return VINF_SUCCESS;
         }
-        else
-            return VERR_NO_MEMORY;
-    }
-    else
-        return VERR_INVALID_STATE;
+        return VERR_NO_MEMORY;
+    }
+    return VERR_INVALID_STATE;
 }
 
@@ -945,6 +944,4 @@
  *
  * @returns VBox status code.
- * @param   pszDevicePath       The device path of the client driver.
- * @param   Instance            The client driver instance.
  */
 int VBoxUSBMonSolarisUnregisterClient(dev_info_t *pClientDip)
@@ -985,6 +982,5 @@
         return VERR_NOT_FOUND;
     }
-    else
-        return VERR_INVALID_STATE;
+    return VERR_INVALID_STATE;
 }