Index: /trunk/include/VBox/vusb.h
===================================================================
--- /trunk/include/VBox/vusb.h	(revision 474)
+++ /trunk/include/VBox/vusb.h	(revision 475)
@@ -75,5 +75,5 @@
      * @param   pAvailable      Bitmap indicating the available ports. Set bit == available port.
      */
-    DECLCALLBACKMEMBER(unsigned, pfnGetAvailablePorts)(PVUSBIROOTHUBPORT pInterface, PVUSBPORTBITMAP pAvailable);
+    DECLR3CALLBACKMEMBER(unsigned, pfnGetAvailablePorts,(PVUSBIROOTHUBPORT pInterface, PVUSBPORTBITMAP pAvailable));
 
     /**
@@ -84,5 +84,5 @@
      * @param   uPort           The port number assigned to the device.
      */
-    DECLCALLBACKMEMBER(int, pfnAttach)(PVUSBIROOTHUBPORT pInterface, PVUSBIDEVICE pDev, unsigned uPort);
+    DECLR3CALLBACKMEMBER(int, pfnAttach,(PVUSBIROOTHUBPORT pInterface, PVUSBIDEVICE pDev, unsigned uPort));
 
     /**
@@ -93,5 +93,5 @@
      * @param   uPort           The port number assigned to the device.
      */
-    DECLCALLBACKMEMBER(void, pfnDetach)(PVUSBIROOTHUBPORT pInterface, PVUSBIDEVICE pDev, unsigned uPort);
+    DECLR3CALLBACKMEMBER(void, pfnDetach,(PVUSBIROOTHUBPORT pInterface, PVUSBIDEVICE pDev, unsigned uPort));
 
     /**
@@ -102,5 +102,5 @@
      * @param   pResetOnLinux   Whether or not to do real reset on linux.
      */
-    DECLCALLBACKMEMBER(int, pfnReset)(PVUSBIROOTHUBPORT pInterface, bool fResetOnLinux);
+    DECLR3CALLBACKMEMBER(int, pfnReset,(PVUSBIROOTHUBPORT pInterface, bool fResetOnLinux));
 
     /**
@@ -112,5 +112,5 @@
      * @param   pUrb            Pointer to the URB in question.
      */
-    DECLCALLBACKMEMBER(void, pfnXferPrepare)(PVUSBIROOTHUBPORT pInterface, PVUSBURB pUrb);
+    DECLR3CALLBACKMEMBER(void, pfnXferPrepare,(PVUSBIROOTHUBPORT pInterface, PVUSBURB pUrb));
 
     /**
@@ -123,5 +123,5 @@
      * @param   pUrb            Pointer to the URB in question.
      */
-    DECLCALLBACKMEMBER(void, pfnXferCompletion)(PVUSBIROOTHUBPORT pInterface, PVUSBURB urb);
+    DECLR3CALLBACKMEMBER(void, pfnXferCompletion,(PVUSBIROOTHUBPORT pInterface, PVUSBURB urb));
 
     /**
@@ -135,5 +135,5 @@
      * @param   pUrb            Pointer to the URB in question.
      */
-    DECLCALLBACKMEMBER(bool, pfnXferError)(PVUSBIROOTHUBPORT pInterface, PVUSBURB pUrb);
+    DECLR3CALLBACKMEMBER(bool, pfnXferError,(PVUSBIROOTHUBPORT pInterface, PVUSBURB pUrb));
 
 } VUSBIROOTHUBPORT;
@@ -162,5 +162,5 @@
      * @param   cTds        The amount of TD space.
      */
-    DECLCALLBACKMEMBER(PVUSBURB, pfnNewUrb)(PVUSBIROOTHUBCONNECTOR pInterface, uint8_t DstAddress, uint32_t cbData, uint32_t cTds);
+    DECLR3CALLBACKMEMBER(PVUSBURB, pfnNewUrb,(PVUSBIROOTHUBCONNECTOR pInterface, uint8_t DstAddress, uint32_t cbData, uint32_t cTds));
 
     /**
@@ -173,5 +173,5 @@
      *                      The URB will be freed in case of failure.
      */
-    DECLCALLBACKMEMBER(int, pfnSubmitUrb)(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBURB pUrb);
+    DECLR3CALLBACKMEMBER(int, pfnSubmitUrb,(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBURB pUrb));
 
     /**
@@ -189,5 +189,5 @@
      * @param   cMillies    Number of milliseconds to poll for completion.
      */
-    DECLCALLBACKMEMBER(void, pfnReapAsyncUrbs)(PVUSBIROOTHUBCONNECTOR pInterface, unsigned cMillies);
+    DECLR3CALLBACKMEMBER(void, pfnReapAsyncUrbs,(PVUSBIROOTHUBCONNECTOR pInterface, unsigned cMillies));
 
     /**
@@ -197,5 +197,5 @@
      * @param   pInterface  Pointer to this struct.
      */
-    DECLCALLBACKMEMBER(void, pfnCancelAllUrbs)(PVUSBIROOTHUBCONNECTOR pInterface);
+    DECLR3CALLBACKMEMBER(void, pfnCancelAllUrbs,(PVUSBIROOTHUBCONNECTOR pInterface));
 
     /**
@@ -207,5 +207,5 @@
      * @param   pDevice     Pointer to the device (interface) attach.
      */
-    DECLCALLBACKMEMBER(int, pfnAttachDevice)(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBIDEVICE pDevice);
+    DECLR3CALLBACKMEMBER(int, pfnAttachDevice,(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBIDEVICE pDevice));
 
     /**
@@ -217,9 +217,10 @@
      * @param   pDevice     Pointer to the device (interface) to detach.
      */
-    DECLCALLBACKMEMBER(int, pfnDetachDevice)(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBIDEVICE pDevice);
+    DECLR3CALLBACKMEMBER(int, pfnDetachDevice,(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBIDEVICE pDevice));
 
 } VUSBIROOTHUBCONNECTOR;
 
 
+#ifdef IN_RING3
 /** @copydoc VUSBIROOTHUBCONNECTOR::pfnNewUrb */
 DECLINLINE(PVUSBURB) VUSBIRhNewUrb(PVUSBIROOTHUBCONNECTOR pInterface, uint32_t DstAddress, uint32_t cbData, uint32_t cTds)
@@ -257,4 +258,5 @@
     return pInterface->pfnDetachDevice(pInterface, pDevice);
 }
+#endif /* IN_RING3 */
 
 
@@ -279,5 +281,5 @@
      *                          the VRDP backend so far.
      */
-    DECLCALLBACKMEMBER(int, pfnCreateProxyDevice)(PVUSBIRHCONFIG pInterface, PCRTUUID pUuid, bool fRemote, const char *pszAddress, void *pvBackend);
+    DECLR3CALLBACKMEMBER(int, pfnCreateProxyDevice,(PVUSBIRHCONFIG pInterface, PCRTUUID pUuid, bool fRemote, const char *pszAddress, void *pvBackend));
 
     /**
@@ -288,8 +290,9 @@
      * @param   pUuid           Pointer to the UUID for the device.
      */
-    DECLCALLBACKMEMBER(int, pfnDestroyProxyDevice)(PVUSBIRHCONFIG pInterface, PCRTUUID pUuid);
+    DECLR3CALLBACKMEMBER(int, pfnDestroyProxyDevice,(PVUSBIRHCONFIG pInterface, PCRTUUID pUuid));
 
 } VUSBIRHCONFIG;
 
+#ifdef IN_RING3
 /** @copydoc  VUSBIRHCONFIG::pfnCreateProxyDevice */
 DECLINLINE(int) VUSBIRhCreateProxyDevice(PVUSBIRHCONFIG pInterface, PCRTUUID pUuid, bool fRemote, const char *pszAddress, void *pvBackend)
@@ -303,4 +306,5 @@
     return pInterface->pfnDestroyProxyDevice(pInterface, pUuid);
 }
+#endif /* IN_RING3 */
 
 
@@ -386,6 +390,6 @@
      * @param   pVM             Pointer to the VM handle if callback in EMT is required. (optional)
      */
-    DECLCALLBACKMEMBER(int, pfnReset)(PVUSBIDEVICE pInterface, bool fResetOnLinux,
-                                      PFNVUSBRESETDONE pfnDone, void *pvUser, PVM pVM);
+    DECLR3CALLBACKMEMBER(int, pfnReset,(PVUSBIDEVICE pInterface, bool fResetOnLinux,
+                                        PFNVUSBRESETDONE pfnDone, void *pvUser, PVM pVM));
 
     /**
@@ -395,5 +399,5 @@
      * @param   pInterface      Pointer to the device interface structure.
      */
-    DECLCALLBACKMEMBER(int, pfnPowerOn)(PVUSBIDEVICE pInterface);
+    DECLR3CALLBACKMEMBER(int, pfnPowerOn,(PVUSBIDEVICE pInterface));
 
     /**
@@ -403,5 +407,5 @@
      * @param   pInterface      Pointer to the device interface structure.
      */
-    DECLCALLBACKMEMBER(int, pfnPowerOff)(PVUSBIDEVICE pInterface);
+    DECLR3CALLBACKMEMBER(int, pfnPowerOff,(PVUSBIDEVICE pInterface));
 
     /**
@@ -411,9 +415,10 @@
      * @param   pInterface      Pointer to the device interface structure.
      */
-    DECLCALLBACKMEMBER(VUSBDEVICESTATE, pfnGetState)(PVUSBIDEVICE pInterface);
+    DECLR3CALLBACKMEMBER(VUSBDEVICESTATE, pfnGetState,(PVUSBIDEVICE pInterface));
 
 } VUSBIDEVICE;
 
 
+#ifdef IN_RING3
 /**
  * Resets the device.
@@ -478,4 +483,5 @@
     return pInterface->pfnGetState(pInterface);
 }
+#endif /* IN_RING3 */