Changeset 50228 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 24, 2014 9:16:37 PM (11 years ago)

Author:

vboxsync

Message:

USB/Proxy: Start a source code cleanup, remove unused struct members and make the generic proxy code do the backend specific memory allocation (fixes a small memory leak in the VRDP backend when closing a proxy device)

Location:

trunk/src/VBox/Devices/USB

Files:

• USBProxyDevice-stub.cpp (modified) (1 diff)
• USBProxyDevice.cpp (modified) (4 diffs)
• USBProxyDevice.h (modified) (9 diffs)
• darwin/USBProxyDevice-darwin.cpp (modified) (17 diffs)
• freebsd/USBProxyDevice-freebsd.cpp (modified) (21 diffs)
• linux/USBProxyDevice-linux.cpp (modified) (27 diffs)
• solaris/USBProxyDevice-solaris.cpp (modified) (19 diffs)
• vrdp/USBProxyDevice-vrdp.cpp (modified) (14 diffs)
• win/USBProxyDevice-win.cpp (modified) (20 diffs)

trunk/src/VBox/Devices/USB/USBProxyDevice-stub.cpp

@@ -33 +33 @@
 {
     "host",
+    0,          /* cbBackend */
     NULL,       /* Open */
     NULL,       /* Init */

trunk/src/VBox/Devices/USB/USBProxyDevice.cpp

@@ -741 +741 @@
         RTStrFree(pUsbIns->pszName);
     pUsbIns->pszName = NULL;
+
+    if (pThis->pvInstanceDataR3)
+        RTMemFree(pThis->pvInstanceDataR3);
 }
 
@@ -820 +823 @@
     pThis->fMaskedIfs = 0;
     pThis->fOpened = false;
-    pThis->fInited = false;
 
     /*
@@ -844 +846 @@
     else
         pThis->pOps = &g_USBProxyDeviceVRDP;
+
+    pThis->pvInstanceDataR3 = RTMemAllocZ(pThis->pOps->cbBackend);
+    if (!pThis->pvInstanceDataR3)
+        return PDMUSB_SET_ERROR(pUsbIns, VERR_NO_MEMORY, N_("USBProxy: can't allocate memory for host backend"));
+
     rc = pThis->pOps->pfnOpen(pThis, szAddress, pvBackend);
     if (RT_FAILURE(rc))
@@ -1065 +1072 @@
             return rc;
     }
-    pThis->fInited = true;
 
     /*

trunk/src/VBox/Devices/USB/USBProxyDevice.h

@@ -51 +51 @@
     /** Name of the backend. */
     const char *pszName;
+    /** Size of the backend specific data. */
+    size_t      cbBackend;
 
     /**
@@ -64 +66 @@
      * @param   pvBackend   Pointer to backend specific data.
      */
-    int  (* pfnOpen)(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend);
+    DECLR3CALLBACKMEMBER(int, pfnOpen, (PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend));
 
     /**
@@ -73 +75 @@
      * @param   pProxyDev   The USB Proxy Device instance.
      */
-    int  (* pfnInit)(PUSBPROXYDEV pProxyDev);
-
-    /**         Closes handle to the host USB device.
+    DECLR3CALLBACKMEMBER(int, pfnInit, (PUSBPROXYDEV pProxyDev));
+
+    /**
+     * Closes handle to the host USB device.
      *
      * @param   pDev        The USB Proxy Device instance.
      */
-    void (* pfnClose)(PUSBPROXYDEV pProxyDev);
+    DECLR3CALLBACKMEMBER(void, pfnClose, (PUSBPROXYDEV pProxyDev));
 
     /**
@@ -91 +94 @@
      *                          being logically reconnected.
      */
-    int  (* pfnReset)(PUSBPROXYDEV pProxyDev, bool fResetOnLinux);
-
-    /** @todo make it return a VBox status code! */
-    int  (* pfnSetConfig)(PUSBPROXYDEV pProxyDev, int iCfg);
-
-    /** @todo make it return a VBox status code! */
-    int  (* pfnClaimInterface)(PUSBPROXYDEV pProxyDev, int iIf);
-
-    /** @todo make it return a VBox status code! */
-    int  (* pfnReleaseInterface)(PUSBPROXYDEV pProxyDev, int iIf);
-
-    /** @todo make it return a VBox status code! */
-    int  (* pfnSetInterface)(PUSBPROXYDEV pProxyDev, int iIf, int setting);
-
-    /** @todo make it return a VBox status code! */
-    bool (* pfnClearHaltedEndpoint)(PUSBPROXYDEV  pDev, unsigned int iEp);
+    DECLR3CALLBACKMEMBER(int, pfnReset, (PUSBPROXYDEV pProxyDev, bool fResetOnLinux));
+
+    /** @todo make it return a VBox status code! */
+    DECLR3CALLBACKMEMBER(int, pfnSetConfig, (PUSBPROXYDEV pProxyDev, int iCfg));
+
+    /** @todo make it return a VBox status code! */
+    DECLR3CALLBACKMEMBER(int, pfnClaimInterface, (PUSBPROXYDEV pProxyDev, int iIf));
+
+    /** @todo make it return a VBox status code! */
+    DECLR3CALLBACKMEMBER(int, pfnReleaseInterface, (PUSBPROXYDEV pProxyDev, int iIf));
+
+    /** @todo make it return a VBox status code! */
+    DECLR3CALLBACKMEMBER(int, pfnSetInterface, (PUSBPROXYDEV pProxyDev, int iIf, int setting));
+
+    /** @todo make it return a VBox status code! */
+    DECLR3CALLBACKMEMBER(bool, pfnClearHaltedEndpoint, (PUSBPROXYDEV  pDev, unsigned int iEp));
 
     /** @todo make it return a VBox status code! Add pDev. */
-    int  (* pfnUrbQueue)(PVUSBURB pUrb);
+    DECLR3CALLBACKMEMBER(int, pfnUrbQueue, (PVUSBURB pUrb));
 
     /**
@@ -117 +120 @@
      * @todo make it return a VBox status code! Add pDev.
      */
-    void (* pfnUrbCancel)(PVUSBURB pUrb);
+    DECLR3CALLBACKMEMBER(void, pfnUrbCancel, (PVUSBURB pUrb));
 
     /**
@@ -128 +131 @@
      *                      wait at all.
      */
-    PVUSBURB (* pfnUrbReap)(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies);
+    DECLR3CALLBACKMEMBER(PVUSBURB, pfnUrbReap, (PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies));
 
     /**
@@ -136 +139 @@
      * @param   pProxyDev   The device.
      */
-    int (* pfnWakeup)(PUSBPROXYDEV pProxyDev);
+    DECLR3CALLBACKMEMBER(int, pfnWakeup, (PUSBPROXYDEV pProxyDev));
 
     /** Dummy entry for making sure we've got all members initialized. */
@@ -171 +174 @@
     PUSBPROXYDEV        pPrev;
     /** The vrdp device ID */
-    uint32_t devid;
+    uint32_t            devid;
     /** Linked list of in-flight URBs */
     PVUSBURB            pUrbs;
@@ -203 +206 @@
      * For dealing with failed construction (the destruct method is always called). */
     bool                fOpened;
-    /** Whether we've called pfnInit or not.
-     * For dealing with failed construction (the destruct method is always called). */
-    bool                fInited;
     /** Whether the device has been detached.
      * This is hack for making PDMUSBREG::pfnUsbQueue return the right status code. */
     bool                fDetached;
-    /** Backend specific data */
-    union USBPROXYBACKENDDATA
-    {
-        /** Pointer to some backend data.
-         * The Linux and Darwin backends are making use of this. */
-        void *pv;
-        RTFILE hFile;
-        int fd;
-        struct vrdp_priv
-        {
-            void *pCallback;
-            void *pDevice;
-        } vrdp;
-    } Backend;
+    /** Backend specific data, the size is stored in pOps::cbBackend. */
+    void                *pvInstanceDataR3;
 } USBPROXYDEV;
+
+/** @def USBPROXYDEV_2_DATA
+ * Converts a USB proxy Device, pointer to a pointer to the backend specific instance data.
+ */
+#define USBPROXYDEV_2_DATA(a_pProxyDev, a_Type)   ( (a_Type)(a_pProxyDev)->pvInstanceDataR3 )
 
 static inline char *usbProxyGetName(PUSBPROXYDEV pProxyDev)

trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1088 +1088 @@
  * @param   pvBackend       Backend specific pointer, unused for the Darwin backend.
  */
-static int usbProxyDarwinOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
+static DECLCALLBACK(int) usbProxyDarwinOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
 {
     int vrc;
@@ -1098 +1098 @@
     vrc = RTOnce(&g_usbProxyDarwinOnce, usbProxyDarwinInitOnce, NULL);
     AssertRCReturn(vrc, vrc);
+
+    PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
 
     /*
@@ -1232 +1234 @@
             {
                 /*
-                 * Create a proxy device instance.
+                 * Init a proxy device instance.
                  */
-                vrc = VERR_NO_MEMORY;
-                PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)RTMemAllocZ(sizeof(*pDevOsX));
-                if (pDevOsX)
+                RTListInit((PRTLISTNODE)&pDevOsX->HeadOfRunLoopLst);
+                vrc = RTCritSectInit(&pDevOsX->CritSect);
+                if (RT_SUCCESS(vrc))
                 {
-                    RTListInit((PRTLISTNODE)&pDevOsX->HeadOfRunLoopLst);
-                    vrc = RTCritSectInit(&pDevOsX->CritSect);
+                    pDevOsX->USBDevice = USBDevice;
+                    pDevOsX->ppDevI = ppDevI;
+                    pDevOsX->pProxyDev = pProxyDev;
+
+                    /*
+                     * Try seize all the interface.
+                     */
+                    char *pszDummyName = pProxyDev->pUsbIns->pszName;
+                    pProxyDev->pUsbIns->pszName = (char *)pszAddress;
+                    vrc = usbProxyDarwinSeizeAllInterfaces(pDevOsX, false /* give up on failure */);
+                    pProxyDev->pUsbIns->pszName = pszDummyName;
                     if (RT_SUCCESS(vrc))
                     {
-                        pDevOsX->USBDevice = USBDevice;
-                        pDevOsX->ppDevI = ppDevI;
-                        pDevOsX->pProxyDev = pProxyDev;
-
                         /*
-                         * Try seize all the interface.
+                         * Create the async event source and add it to the run loop.
                          */
-                        char *pszDummyName = pProxyDev->pUsbIns->pszName;
-                        pProxyDev->pUsbIns->pszName = (char *)pszAddress;
-                        vrc = usbProxyDarwinSeizeAllInterfaces(pDevOsX, false /* give up on failure */);
-                        pProxyDev->pUsbIns->pszName = pszDummyName;
-                        if (RT_SUCCESS(vrc))
+                        irc = (*ppDevI)->CreateDeviceAsyncEventSource(ppDevI, &pDevOsX->RunLoopSrcRef);
+                        if (irc == kIOReturnSuccess)
                         {
                             /*
-                             * Create the async event source and add it to the run loop.
+                             * Determine the active configuration.
+                             * Can cause hangs, so drop it for now.
                              */
-                            irc = (*ppDevI)->CreateDeviceAsyncEventSource(ppDevI, &pDevOsX->RunLoopSrcRef);
-                            if (irc == kIOReturnSuccess)
+                            /** @todo test Palm. */
+                            //uint8_t u8Cfg;
+                            //irc = (*ppDevI)->GetConfiguration(ppDevI, &u8Cfg);
+                            if (irc != kIOReturnNoDevice)
                             {
-                                /*
-                                 * Determine the active configuration.
-                                 * Can cause hangs, so drop it for now.
-                                 */
-                                /** @todo test Palm. */
-                                //uint8_t u8Cfg;
-                                //irc = (*ppDevI)->GetConfiguration(ppDevI, &u8Cfg);
-                                if (irc != kIOReturnNoDevice)
+                                CFRunLoopSourceContext CtxRunLoopSource;
+                                CtxRunLoopSource.version = 0;
+                                CtxRunLoopSource.info = NULL;
+                                CtxRunLoopSource.retain = NULL;
+                                CtxRunLoopSource.release = NULL;
+                                CtxRunLoopSource.copyDescription = NULL;
+                                CtxRunLoopSource.equal = NULL;
+                                CtxRunLoopSource.hash = NULL;
+                                CtxRunLoopSource.schedule = NULL;
+                                CtxRunLoopSource.cancel = NULL;
+                                CtxRunLoopSource.perform = usbProxyDarwinPerformWakeup;
+                                pDevOsX->hRunLoopSrcWakeRef = CFRunLoopSourceCreate(NULL, 0, &CtxRunLoopSource);
+                                if (CFRunLoopSourceIsValid(pDevOsX->hRunLoopSrcWakeRef))
                                 {
-                                    CFRunLoopSourceContext CtxRunLoopSource;
-                                    CtxRunLoopSource.version = 0;
-                                    CtxRunLoopSource.info = NULL;
-                                    CtxRunLoopSource.retain = NULL;
-                                    CtxRunLoopSource.release = NULL;
-                                    CtxRunLoopSource.copyDescription = NULL;
-                                    CtxRunLoopSource.equal = NULL;
-                                    CtxRunLoopSource.hash = NULL;
-                                    CtxRunLoopSource.schedule = NULL;
-                                    CtxRunLoopSource.cancel = NULL;
-                                    CtxRunLoopSource.perform = usbProxyDarwinPerformWakeup;
-                                    pDevOsX->hRunLoopSrcWakeRef = CFRunLoopSourceCreate(NULL, 0, &CtxRunLoopSource);
-                                    if (CFRunLoopSourceIsValid(pDevOsX->hRunLoopSrcWakeRef))
-                                    {
-                                        //pProxyDev->iActiveCfg = irc == kIOReturnSuccess ? u8Cfg : -1;
-                                        RTListInit(&pDevOsX->HeadOfRunLoopWakeLst);
-                                        pProxyDev->iActiveCfg = -1;
-                                        pProxyDev->cIgnoreSetConfigs = 1;
-
-                                        pProxyDev->Backend.pv = pDevOsX;
-                                        usbProxyDarwinAddRunLoopRef(&pDevOsX->HeadOfRunLoopLst, pDevOsX->RunLoopSrcRef);
-                                        return VINF_SUCCESS;        /* return */
-                                    }
-                                    else
-                                    {
-                                        LogRel(("USB: Device '%s' out of memory allocating runloop source\n", pszAddress));
-                                        vrc = VERR_NO_MEMORY;
-                                    }
+                                    //pProxyDev->iActiveCfg = irc == kIOReturnSuccess ? u8Cfg : -1;
+                                    RTListInit(&pDevOsX->HeadOfRunLoopWakeLst);
+                                    pProxyDev->iActiveCfg = -1;
+                                    pProxyDev->cIgnoreSetConfigs = 1;
+
+                                    pProxyDev->Backend.pv = pDevOsX;
+                                    usbProxyDarwinAddRunLoopRef(&pDevOsX->HeadOfRunLoopLst, pDevOsX->RunLoopSrcRef);
+                                    return VINF_SUCCESS;        /* return */
                                 }
-                                vrc = VERR_VUSB_DEVICE_NOT_ATTACHED;
+                                else
+                                {
+                                    LogRel(("USB: Device '%s' out of memory allocating runloop source\n", pszAddress));
+                                    vrc = VERR_NO_MEMORY;
+                                }
                             }
-                            else
-                                vrc = RTErrConvertFromDarwin(irc);
-
-                            usbProxyDarwinReleaseAllInterfaces(pDevOsX);
+                            vrc = VERR_VUSB_DEVICE_NOT_ATTACHED;
                         }
-                        /* else: already bitched */
-
-                        RTCritSectDelete(&pDevOsX->CritSect);
+                        else
+                            vrc = RTErrConvertFromDarwin(irc);
+
+                        usbProxyDarwinReleaseAllInterfaces(pDevOsX);
                     }
-
-                    RTMemFree(pDevOsX);
+                    /* else: already bitched */
+
+                    RTCritSectDelete(&pDevOsX->CritSect);
                 }
 
@@ -1352 +1347 @@
  * Closes the proxy device.
  */
-static void usbProxyDarwinClose(PUSBPROXYDEV pProxyDev)
+static DECLCALLBACK(void) usbProxyDarwinClose(PUSBPROXYDEV pProxyDev)
 {
     LogFlow(("usbProxyDarwinClose: pProxyDev=%s\n", pProxyDev->pUsbIns->pszName));
-    PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
-    Assert(pDevOsX);
-    if (!pDevOsX)
-        return;
+    PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
+    AssertPtrReturnVoid(pDevOsX);
 
     /*
@@ -1429 +1422 @@
     }
 
-    RTMemFree(pDevOsX);
-    pProxyDev->Backend.pv = NULL;
-
 #ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
     USBLibTerm();
@@ -1445 +1435 @@
  * @param   pDev    The device to reset.
  */
-static int usbProxyDarwinReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
-{
-    PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
+static DECLCALLBACK(int) usbProxyDarwinReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
+{
+    PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
     LogFlow(("usbProxyDarwinReset: pProxyDev=%s\n", pProxyDev->pUsbIns->pszName));
 
@@ -1483 +1473 @@
  * @param   iCfg            The configuration to set.
  */
-static int usbProxyDarwinSetConfig(PUSBPROXYDEV pProxyDev, int iCfg)
-{
-    PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
+static DECLCALLBACK(int) usbProxyDarwinSetConfig(PUSBPROXYDEV pProxyDev, int iCfg)
+{
+    PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
     LogFlow(("usbProxyDarwinSetConfig: pProxyDev=%s cfg=%#x\n",
              pProxyDev->pUsbIns->pszName, iCfg));
@@ -1510 +1500 @@
  * @returns success indicator (always true).
  */
-static int usbProxyDarwinClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
+static DECLCALLBACK(int) usbProxyDarwinClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
     return true;
@@ -1524 +1514 @@
  * @returns success indicator.
  */
-static int usbProxyDarwinReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf)
+static DECLCALLBACK(int) usbProxyDarwinReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
     return true;
@@ -1535 +1525 @@
  * @returns success indicator.
  */
-static int usbProxyDarwinSetInterface(PUSBPROXYDEV pProxyDev, int iIf, int iAlt)
-{
-    PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
+static DECLCALLBACK(int) usbProxyDarwinSetInterface(PUSBPROXYDEV pProxyDev, int iIf, int iAlt)
+{
+    PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
     IOReturn irc = kIOReturnSuccess;
     PUSBPROXYIFOSX pIf = usbProxyDarwinGetInterface(pDevOsX, iIf);
@@ -1582 +1572 @@
  * Clears the halted endpoint 'EndPt'.
  */
-static bool usbProxyDarwinClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
-{
-    PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
+static DECLCALLBACK(bool) usbProxyDarwinClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
+{
+    PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
     LogFlow(("usbProxyDarwinClearHaltedEp: pProxyDev=%s EndPt=%#x\n", pProxyDev->pUsbIns->pszName, EndPt));
 
@@ -1619 +1609 @@
  * @copydoc USBPROXYBACK::pfnUrbQueue
  */
-static int usbProxyDarwinUrbQueue(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxyDarwinUrbQueue(PVUSBURB pUrb)
 {
     PUSBPROXYDEV    pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
     LogFlow(("%s: usbProxyDarwinUrbQueue: pProxyDev=%s pUrb=%p EndPt=%d cbData=%d\n",
              pUrb->pszDesc, pProxyDev->pUsbIns->pszName, pUrb, pUrb->EndPt, pUrb->cbData));
@@ -1833 +1823 @@
  * @param   cMillies    Number of milliseconds to wait. Use 0 to not wait at all.
  */
-static PVUSBURB usbProxyDarwinUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
+static DECLCALLBACK(PVUSBURB) usbProxyDarwinUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
 {
     PVUSBURB pUrb = NULL;
-    PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
     CFRunLoopRef hRunLoopRef = CFRunLoopGetCurrent();
 
@@ -1907 +1897 @@
  *          requests, we should probably be fine...
  */
-static void usbProxyDarwinUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(void) usbProxyDarwinUrbCancel(PVUSBURB pUrb)
 {
     PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
     //PUSBPROXYURBOSX pUrbOsX = (PUSBPROXYURBOSX)pUrb->Dev.pvProxyUrb;
     LogFlow(("%s: usbProxyDarwinUrbCancel: pProxyDev=%s EndPt=%d\n",
@@ -1938 +1928 @@
 
 
-static int usbProxyDarwinWakeup(PUSBPROXYDEV pProxyDev)
-{
-    PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
+static DECLCALLBACK(int) usbProxyDarwinWakeup(PUSBPROXYDEV pProxyDev)
+{
+    PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
 
     LogFlow(("usbProxyDarwinWakeup: pProxyDev=%p\n", pProxyDev));
@@ -1963 +1953 @@
 extern const USBPROXYBACK g_USBProxyDeviceHost =
 {
+    /* pszName */
     "host",
+    /* cbBackend */
+    sizeof(USBPROXYDEVOSX),
     usbProxyDarwinOpen,
     NULL,

trunk/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp

@@ -7 +7 @@
  * Includes contributions from Hans Petter Selasky
  *
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -128 +128 @@
 {
     int rc = VINF_SUCCESS;
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
 
     LogFlow(("usbProxyFreeBSDDoIoCtl: iCmd=%#x\n", iCmd));
@@ -159 +159 @@
 {
     struct usb_fs_init UsbFsInit;
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     int rc;
 
@@ -190 +190 @@
 {
     struct usb_fs_uninit UsbFsUninit;
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     int rc;
 
@@ -241 +241 @@
 static int usbProxyFreeBSDEndpointOpen(PUSBPROXYDEV pProxyDev, int Endpoint, bool fIsoc, int index)
 {
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     PUSBENDPOINTFBSD pEndpointFBSD = NULL; /* shut up gcc */
     struct usb_fs_endpoint *pXferEndpoint;
@@ -316 +316 @@
 static int usbProxyFreeBSDEndpointClose(PUSBPROXYDEV pProxyDev, int Endpoint)
 {
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     PUSBENDPOINTFBSD pEndpointFBSD = &pDevFBSD->aSwEndpoint[Endpoint];
     struct usb_fs_close UsbFsClose;
@@ -360 +360 @@
  * @param   pvBackend       Backend specific pointer, unused for the linux backend.
  */
-static int usbProxyFreeBSDOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress,
-                               void *pvBackend)
-{
+static DECLCALLBACK(int) usbProxyFreeBSDOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress,
+                                             void *pvBackend)
+{
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     int rc;
 
     LogFlow(("usbProxyFreeBSDOpen: pProxyDev=%p pszAddress=%s\n", pProxyDev, pszAddress));
+
+    NOREF(pvBackend);
 
     /*
@@ -375 +378 @@
     {
         /*
-         * Allocate and initialize the linux backend data.
+         * Initialize the FreeBSD backend data.
          */
-        PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD)RTMemAllocZ(sizeof(USBPROXYDEVFBSD));
-        if (pDevFBSD)
-        {
-            pDevFBSD->hFile = hFile;
-            pProxyDev->Backend.pv = pDevFBSD;
-
-            rc = usbProxyFreeBSDFsInit(pProxyDev);
-            if (RT_SUCCESS(rc))
-            {
-                LogFlow(("usbProxyFreeBSDOpen(%p, %s): returns successfully hFile=%RTfile iActiveCfg=%d\n",
-                         pProxyDev, pszAddress, pDevFBSD->hFile, pProxyDev->iActiveCfg));
-
-                return VINF_SUCCESS;
-            }
-
-            RTMemFree(pDevFBSD);
-        }
-        else
-            rc = VERR_NO_MEMORY;
+        pDevFBSD->hFile = hFile;
+        rc = usbProxyFreeBSDFsInit(pProxyDev);
+        if (RT_SUCCESS(rc))
+        {
+            LogFlow(("usbProxyFreeBSDOpen(%p, %s): returns successfully hFile=%RTfile iActiveCfg=%d\n",
+                     pProxyDev, pszAddress, pDevFBSD->hFile, pProxyDev->iActiveCfg));
+
+            return VINF_SUCCESS;
+        }
 
         RTFileClose(hFile);
@@ -405 +398 @@
          pProxyDev, pszAddress, rc));
 
-    pProxyDev->Backend.pv = NULL;
-
-    NOREF(pvBackend);
     return rc;
 }
@@ -419 +409 @@
  * @param   pProxyDev       The proxy device.
  */
-static int usbProxyFreeBSDInit(PUSBPROXYDEV pProxyDev)
-{
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+static DECLCALLBACK(int) usbProxyFreeBSDInit(PUSBPROXYDEV pProxyDev)
+{
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     int rc;
 
@@ -449 +439 @@
  * Closes the proxy device.
  */
-static void usbProxyFreeBSDClose(PUSBPROXYDEV pProxyDev)
-{
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD)pProxyDev->Backend.pv;
+static DECLCALLBACK(void) usbProxyFreeBSDClose(PUSBPROXYDEV pProxyDev)
+{
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
 
     LogFlow(("usbProxyFreeBSDClose: pProxyDev=%s\n", pProxyDev->pUsbIns->pszName));
@@ -475 +465 @@
  * @param   pDev    The device to reset.
  */
-static int usbProxyFreeBSDReset(PUSBPROXYDEV pProxyDev, bool fResetOnFreeBSD)
-{
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+static DECLCALLBACK(int) usbProxyFreeBSDReset(PUSBPROXYDEV pProxyDev, bool fResetOnFreeBSD)
+{
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     int iParm;
     int rc = VINF_SUCCESS;
@@ -532 +522 @@
  * @param   iCfg            The configuration to set.
  */
-static int usbProxyFreeBSDSetConfig(PUSBPROXYDEV pProxyDev, int iCfg)
-{
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+static DECLCALLBACK(int) usbProxyFreeBSDSetConfig(PUSBPROXYDEV pProxyDev, int iCfg)
+{
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     int iCfgIndex;
     int rc;
@@ -589 +579 @@
  * @returns success indicator.
  */
-static int usbProxyFreeBSDClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
+static DECLCALLBACK(int) usbProxyFreeBSDClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
     int rc;
@@ -614 +604 @@
  * @returns success indicator.
  */
-static int usbProxyFreeBSDReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf)
+static DECLCALLBACK(int) usbProxyFreeBSDReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
     int rc;
@@ -633 +623 @@
  * @returns success indicator.
  */
-static int
+static DECLCALLBACK(int)
 usbProxyFreeBSDSetInterface(PUSBPROXYDEV pProxyDev, int iIf, int iAlt)
 {
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     struct usb_alt_interface UsbIntAlt;
     int rc;
@@ -673 +663 @@
  * Clears the halted endpoint 'ep_num'.
  */
-static bool usbProxyFreeBSDClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int ep_num)
+static DECLCALLBACK(bool) usbProxyFreeBSDClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int ep_num)
 {
     struct usb_ctl_request Req;
@@ -707 +697 @@
  * @copydoc USBPROXYBACK::pfnUrbQueue
  */
-static int usbProxyFreeBSDUrbQueue(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxyFreeBSDUrbQueue(PVUSBURB pUrb)
 {
     PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     PUSBENDPOINTFBSD pEndpointFBSD;
     struct usb_fs_endpoint *pXferEndpoint;
@@ -851 +841 @@
  * @param   cMillies    Number of milliseconds to wait. Use 0 to not wait at all.
  */
-static PVUSBURB usbProxyFreeBSDUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
+static DECLCALLBACK(PVUSBURB) usbProxyFreeBSDUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
 {
     struct usb_fs_endpoint *pXferEndpoint;
-    PUSBPROXYDEVFBSD pDevFBSD = (PUSBPROXYDEVFBSD) pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
     PUSBENDPOINTFBSD pEndpointFBSD;
     PVUSBURB pUrb;
@@ -1007 +997 @@
  * The URB requires reaping, so we don't change its state.
  */
-static void usbProxyFreeBSDUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(void) usbProxyFreeBSDUrbCancel(PVUSBURB pUrb)
 {
     PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
@@ -1027 +1017 @@
 extern const USBPROXYBACK g_USBProxyDeviceHost =
 {
+    /* pszName */
     "host",
+    /* cbBackend */
+    sizeof(PUSBPROXYDEVFBSD),
     usbProxyFreeBSDOpen,
     usbProxyFreeBSDInit,

trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp

@@ -160 +160 @@
     /** The device node/sysfs path of the device.
      * Used to figure out the configuration after a reset. */
-    char                szPath[1];
+    char                *pszPath;
 } USBPROXYDEVLNX, *PUSBPROXYDEVLNX;
 
@@ -194 +194 @@
 {
     int rc;
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
     do
     {
@@ -225 +225 @@
 static void usbProxLinuxUrbUnplugged(PUSBPROXYDEV pProxyDev)
 {
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
 
     /*
@@ -307 +307 @@
 static PUSBPROXYURBLNX usbProxyLinuxUrbAlloc(PUSBPROXYDEV pProxyDev, PUSBPROXYURBLNX pSplitHead)
 {
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
     PUSBPROXYURBLNX pUrbLnx;
 
@@ -360 +360 @@
 static void usbProxyLinuxUrbFree(PUSBPROXYDEV pProxyDev, PUSBPROXYURBLNX pUrbLnx)
 {
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
 
     RTCritSectEnter(&pDevLnx->CritSect);
@@ -398 +398 @@
 static void usbProxyLinuxUrbFreeSplitList(PUSBPROXYDEV pProxyDev, PUSBPROXYURBLNX pUrbLnx)
 {
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
 
     RTCritSectEnter(&pDevLnx->CritSect);
@@ -585 +585 @@
 static int usbProxyLinuxFindActiveConfig(PUSBPROXYDEV pProxyDev, const char *pszPath, int *piFirstCfg)
 {
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
     if (pDevLnx->fUsingSysfs)
         return usbProxyLinuxFindActiveConfigSysfs(pProxyDev, pszPath, piFirstCfg);
@@ -600 +600 @@
 RTDECL(int) USBProxyDeviceLinuxGetFD(PUSBPROXYDEV pProxyDev)
 {
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
     AssertReturn(pDevLnx->hFile != NIL_RTFILE, -1);
     return RTFileToNative(pDevLnx->hFile);
@@ -618 +618 @@
  * @param   pvBackend       Backend specific pointer, unused for the linux backend.
  */
-static int usbProxyLinuxOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
+static DECLCALLBACK(int) usbProxyLinuxOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
 {
     LogFlow(("usbProxyLinuxOpen: pProxyDev=%p pszAddress=%s\n", pProxyDev, pszAddress));
@@ -637 +637 @@
         {
             LogRel(("usbProxyLinuxOpen: Invalid device address: '%s'\n", pszAddress));
-            pProxyDev->Backend.pv = NULL;
             return VERR_INVALID_PARAMETER;
         }
@@ -662 +661 @@
     if (RT_SUCCESS(rc))
     {
-            /*
-             * Allocate and initialize the linux backend data.
-             */
-            PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)RTMemAllocZVar(sizeof(*pDevLnx) + cchPath);
-            if (pDevLnx)
+        /*
+         * Initialize the linux backend data.
+         */
+        PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
+        pDevLnx->pszPath = RTStrDupN(pszPath, cchPath);
+        if (pDevLnx->pszPath)
+        {
+            rc = RTPipeCreate(&pDevLnx->hPipeWakeupR, &pDevLnx->hPipeWakeupW, 0);
+            if (RT_SUCCESS(rc))
             {
-
-                rc = RTPipeCreate(&pDevLnx->hPipeWakeupR, &pDevLnx->hPipeWakeupW, 0);
+                pDevLnx->fUsingSysfs = fUsingSysfs;
+                pDevLnx->hFile = hFile;
+                rc = RTCritSectInit(&pDevLnx->CritSect);
                 if (RT_SUCCESS(rc))
                 {
-                    pDevLnx->fUsingSysfs = fUsingSysfs;
-                    memcpy(&pDevLnx->szPath[0], pszPath, cchPath);
-                    pDevLnx->szPath[cchPath] = '\0';
-                    pDevLnx->hFile = hFile;
-                    rc = RTCritSectInit(&pDevLnx->CritSect);
-                    if (RT_SUCCESS(rc))
-                    {
-                        pProxyDev->Backend.pv = pDevLnx;
-
-                        LogFlow(("usbProxyLinuxOpen(%p, %s): returns successfully File=%RTfile iActiveCfg=%d\n",
-                                 pProxyDev, pszAddress, pDevLnx->hFile, pProxyDev->iActiveCfg));
-
-                        return VINF_SUCCESS;
-                    }
-                    RTPipeClose(pDevLnx->hPipeWakeupR);
-                    RTPipeClose(pDevLnx->hPipeWakeupW);
+                    LogFlow(("usbProxyLinuxOpen(%p, %s): returns successfully File=%RTfile iActiveCfg=%d\n",
+                             pProxyDev, pszAddress, pDevLnx->hFile, pProxyDev->iActiveCfg));
+
+                    return VINF_SUCCESS;
                 }
-
-                RTMemFree(pDevLnx);
+                RTPipeClose(pDevLnx->hPipeWakeupR);
+                RTPipeClose(pDevLnx->hPipeWakeupW);
             }
-            else
-                rc = VERR_NO_MEMORY;
+        }
+        else
+            rc = VERR_NO_MEMORY;
 
         RTFileClose(hFile);
@@ -702 +695 @@
     Log(("usbProxyLinuxOpen(%p, %s) failed, rc=%s!\n", pProxyDev, pszAddress,
          RTErrGetShort(rc)));
-    pProxyDev->Backend.pv = NULL;
 
     NOREF(pvBackend);
@@ -716 +708 @@
  * @param   pProxyDev       The proxy device.
  */
-static int usbProxyLinuxInit(PUSBPROXYDEV pProxyDev)
-{
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+static DECLCALLBACK(int) usbProxyLinuxInit(PUSBPROXYDEV pProxyDev)
+{
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
 
     /*
@@ -737 +729 @@
     pProxyDev->cIgnoreSetConfigs = 1;
     int iFirstCfg;
-    pProxyDev->iActiveCfg = usbProxyLinuxFindActiveConfig(pProxyDev, pDevLnx->szPath, &iFirstCfg);
+    pProxyDev->iActiveCfg = usbProxyLinuxFindActiveConfig(pProxyDev, pDevLnx->pszPath, &iFirstCfg);
     if (pProxyDev->iActiveCfg == -1)
     {
         usbProxyLinuxDoIoCtl(pProxyDev, USBDEVFS_SETCONFIGURATION, &iFirstCfg, false, UINT32_MAX);
-        pProxyDev->iActiveCfg = usbProxyLinuxFindActiveConfig(pProxyDev, pDevLnx->szPath, NULL);
+        pProxyDev->iActiveCfg = usbProxyLinuxFindActiveConfig(pProxyDev, pDevLnx->pszPath, NULL);
         Log(("usbProxyLinuxInit: No active config! Tried to set %d: iActiveCfg=%d\n", iFirstCfg, pProxyDev->iActiveCfg));
     }
@@ -753 +745 @@
  * Closes the proxy device.
  */
-static void usbProxyLinuxClose(PUSBPROXYDEV pProxyDev)
+static DECLCALLBACK(void) usbProxyLinuxClose(PUSBPROXYDEV pProxyDev)
 {
     LogFlow(("usbProxyLinuxClose: pProxyDev=%s\n", usbProxyGetName(pProxyDev)));
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
-    Assert(pDevLnx);
-    if (!pDevLnx)
-        return;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
+    AssertPtrReturnVoid(pDevLnx);
 
     /*
@@ -831 +821 @@
     RTPipeClose(pDevLnx->hPipeWakeupW);
 
-    RTMemFree(pDevLnx);
-    pProxyDev->Backend.pv = NULL;
+    RTStrFree(pDevLnx->pszPath);
+
     LogFlow(("usbProxyLinuxClose: returns\n"));
 }
@@ -1029 +1019 @@
  * @param   pDev    The device to reset.
  */
-static int usbProxyLinuxReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
+static DECLCALLBACK(int) usbProxyLinuxReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
 {
 #ifdef NO_PORT_RESET
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
 
     /*
@@ -1058 +1048 @@
 
         /* find the active config - damn annoying. */
-        pProxyDev->iActiveCfg = usbProxyLinuxFindActiveConfig(pProxyDev, pDevLnx->szPath, NULL);
+        pProxyDev->iActiveCfg = usbProxyLinuxFindActiveConfig(pProxyDev, pDevLnx->pszPath, NULL);
         LogFlow(("usbProxyLinuxReset: returns successfully iActiveCfg=%d\n", pProxyDev->iActiveCfg));
     }
@@ -1128 +1118 @@
  * @param   iCfg            The configuration to set.
  */
-static int usbProxyLinuxSetConfig(PUSBPROXYDEV pProxyDev, int iCfg)
+static DECLCALLBACK(int) usbProxyLinuxSetConfig(PUSBPROXYDEV pProxyDev, int iCfg)
 {
     LogFlow(("usbProxyLinuxSetConfig: pProxyDev=%s cfg=%#x\n",
@@ -1146 +1136 @@
  * @returns success indicator.
  */
-static int usbProxyLinuxClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
+static DECLCALLBACK(int) usbProxyLinuxClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
     LogFlow(("usbProxyLinuxClaimInterface: pProxyDev=%s ifnum=%#x\n", usbProxyGetName(pProxyDev), iIf));
@@ -1291 +1281 @@
 static bool usbProxyLinuxSubmitURB(PUSBPROXYDEV pProxyDev, PUSBPROXYURBLNX pCur, PVUSBURB pUrb, bool *pfUnplugged)
 {
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
     unsigned        cTries = 0;
 
@@ -1463 +1453 @@
  * @copydoc USBPROXYBACK::pfnUrbQueue
  */
-static int usbProxyLinuxUrbQueue(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxyLinuxUrbQueue(PVUSBURB pUrb)
 {
     unsigned        cTries;
@@ -1471 +1461 @@
     PUSBPROXYDEV    pProxyDev = usbProxyFromVusbDev(pUrb->pDev);
 #endif
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
     LogFlow(("usbProxyLinuxUrbQueue: pProxyDev=%s pUrb=%p EndPt=%d cbData=%d\n",
              usbProxyGetName(pProxyDev), pUrb, pUrb->EndPt, pUrb->cbData));
@@ -1723 +1713 @@
  * @param   cMillies    Number of milliseconds to wait. Use 0 to not wait at all.
  */
-static PVUSBURB usbProxyLinuxUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
+static DECLCALLBACK(PVUSBURB) usbProxyLinuxUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
 {
     PUSBPROXYURBLNX pUrbLnx = NULL;
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
 
     /*
@@ -1961 +1951 @@
  * The URB requires reaping, so we don't change its state.
  */
-static void usbProxyLinuxUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(void) usbProxyLinuxUrbCancel(PVUSBURB pUrb)
 {
 #ifndef RDESKTOP
@@ -2001 +1991 @@
 static DECLCALLBACK(int) usbProxyLinuxWakeup(PUSBPROXYDEV pProxyDev)
 {
-    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
     size_t cbIgnored;
 
@@ -2014 +2004 @@
 const USBPROXYBACK g_USBProxyDeviceHost =
 {
+    /* pszName */
     "host",
+    /* cbBackend */
+    sizeof(USBPROXYDEVLNX),
     usbProxyLinuxOpen,
     usbProxyLinuxInit,

trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -92 +92 @@
     /** The tail of the landed solaris URBs. */
     PUSBPROXYURBSOL                pTaxingTail;
-    /** Pipe handle for waiking up - writing end. */
+    /** Pipe handle for waking up - writing end. */
     RTPIPE                         hPipeWakeupW;
-    /** Pipe handle for waiking up - reading end. */
+    /** Pipe handle for waking up - reading end. */
     RTPIPE                         hPipeWakeupR;
 } USBPROXYDEVSOL, *PUSBPROXYDEVSOL;
@@ -288 +288 @@
  * @param   pvBackend       Backend specific pointer, unused for the solaris backend.
  */
-static int usbProxySolarisOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
-{
+static DECLCALLBACK(int) usbProxySolarisOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
+{
+    PUSBPROXYDEVFBSD pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
+
     LogFlowFunc((USBPROXY ":usbProxySolarisOpen pProxyDev=%p pszAddress=%s pvBackend=%p\n", pProxyDev, pszAddress, pvBackend));
 
@@ -301 +303 @@
          * Allocate and initialize the solaris backend data.
          */
-        PUSBPROXYDEVSOL pDevSol = (PUSBPROXYDEVSOL)RTMemAllocZ(sizeof(*pDevSol));
-        if (RT_LIKELY(pDevSol))
+        AssertCompile(PATH_MAX >= MAXPATHLEN);
+        char szDeviceIdent[PATH_MAX+48];
+        rc = RTStrPrintf(szDeviceIdent, sizeof(szDeviceIdent), "%s", pszAddress);
+        if (RT_SUCCESS(rc))
         {
-            AssertCompile(PATH_MAX >= MAXPATHLEN);
-            char szDeviceIdent[PATH_MAX+48];
-            rc = RTStrPrintf(szDeviceIdent, sizeof(szDeviceIdent), "%s", pszAddress);
+            rc = RTCritSectInit(&pDevSol->CritSect);
             if (RT_SUCCESS(rc))
             {
-                rc = RTCritSectInit(&pDevSol->CritSect);
+                /*
+                 * Create wakeup pipe.
+                 */
+                rc = RTPipeCreate(&pDevSol->hPipeWakeupR, &pDevSol->hPipeWakeupW, 0);
                 if (RT_SUCCESS(rc))
                 {
-                    pProxyDev->Backend.pv = pDevSol;
-
-                    /*
-                     * Create wakeup pipe.
-                     */
-                    rc = RTPipeCreate(&pDevSol->hPipeWakeupR, &pDevSol->hPipeWakeupW, 0);
+                    int Instance;
+                    char *pszDevicePath = NULL;
+                    rc = USBLibGetClientInfo(szDeviceIdent, &pszDevicePath, &Instance);
                     if (RT_SUCCESS(rc))
                     {
-                        int Instance;
-                        char *pszDevicePath = NULL;
-                        rc = USBLibGetClientInfo(szDeviceIdent, &pszDevicePath, &Instance);
+                        pDevSol->pszDevicePath = pszDevicePath;
+
+                        /*
+                         * Open the client driver.
+                         */
+                        RTFILE hFile;
+                        rc = RTFileOpen(&hFile, pDevSol->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
                         if (RT_SUCCESS(rc))
                         {
-                            pDevSol->pszDevicePath = pszDevicePath;
+                            pDevSol->hFile = hFile;
+                            pDevSol->pProxyDev = pProxyDev;
 
                             /*
-                             * Open the client driver.
+                             * Verify client driver version.
                              */
-                            RTFILE hFile;
-                            rc = RTFileOpen(&hFile, pDevSol->pszDevicePath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+                            VBOXUSBREQ_GET_VERSION GetVersionReq;
+                            bzero(&GetVersionReq, sizeof(GetVersionReq));
+                            rc = usbProxySolarisIOCtl(pDevSol, VBOXUSB_IOCTL_GET_VERSION, &GetVersionReq, sizeof(GetVersionReq));
                             if (RT_SUCCESS(rc))
                             {
-                                pDevSol->hFile = hFile;
-                                pDevSol->pProxyDev = pProxyDev;
-
-                                /*
-                                 * Verify client driver version.
-                                 */
-                                VBOXUSBREQ_GET_VERSION GetVersionReq;
-                                bzero(&GetVersionReq, sizeof(GetVersionReq));
-                                rc = usbProxySolarisIOCtl(pDevSol, VBOXUSB_IOCTL_GET_VERSION, &GetVersionReq, sizeof(GetVersionReq));
-                                if (RT_SUCCESS(rc))
+                                if (   GetVersionReq.u32Major == VBOXUSB_VERSION_MAJOR
+                                    && GetVersionReq.u32Minor >= VBOXUSB_VERSION_MINOR)
                                 {
-                                    if (   GetVersionReq.u32Major == VBOXUSB_VERSION_MAJOR
-                                        && GetVersionReq.u32Minor >= VBOXUSB_VERSION_MINOR)
-                                    {
-                                        /*
-                                         * Try & get the current cached config from Solaris.
-                                         */
-                                        usbProxySolarisGetActiveConfig(pDevSol);
-                                        return VINF_SUCCESS;
-                                    }
-                                    else
-                                    {
-                                        LogRel((USBPROXY ":version mismatch! driver v%d.%d expecting ~v%d.%d\n", GetVersionReq.u32Major,
-                                                GetVersionReq.u32Minor, VBOXUSB_VERSION_MAJOR, VBOXUSB_VERSION_MINOR));
-                                        rc = VERR_VERSION_MISMATCH;
-                                    }
+                                    /*
+                                     * Try & get the current cached config from Solaris.
+                                     */
+                                    usbProxySolarisGetActiveConfig(pDevSol);
+                                    return VINF_SUCCESS;
                                 }
                                 else
                                 {
-                                    LogRel((USBPROXY ":failed to query driver version. rc=%Rrc\n", rc));
+                                    LogRel((USBPROXY ":version mismatch! driver v%d.%d expecting ~v%d.%d\n", GetVersionReq.u32Major,
+                                            GetVersionReq.u32Minor, VBOXUSB_VERSION_MAJOR, VBOXUSB_VERSION_MINOR));
+                                    rc = VERR_VERSION_MISMATCH;
                                 }
-
-                                RTFileClose(pDevSol->hFile);
-                                pDevSol->hFile = NIL_RTFILE;
-                                pDevSol->pProxyDev = NULL;
                             }
                             else
-                                LogRel((USBPROXY ":failed to open device. rc=%Rrc pszDevicePath=%s\n", rc, pDevSol->pszDevicePath));
-
-                            RTStrFree(pDevSol->pszDevicePath);
-                            pDevSol->pszDevicePath = NULL;
+                                LogRel((USBPROXY ":failed to query driver version. rc=%Rrc\n", rc));
+
+                            RTFileClose(pDevSol->hFile);
+                            pDevSol->hFile = NIL_RTFILE;
+                            pDevSol->pProxyDev = NULL;
                         }
                         else
-                        {
-                            LogRel((USBPROXY ":failed to get client info. rc=%Rrc pszDevicePath=%s\n", rc, pDevSol->pszDevicePath));
-                            if (rc == VERR_NOT_FOUND)
-                                rc = VERR_OPEN_FAILED;
-                        }
-                        RTPipeClose(pDevSol->hPipeWakeupR);
-                        RTPipeClose(pDevSol->hPipeWakeupW);
+                            LogRel((USBPROXY ":failed to open device. rc=%Rrc pszDevicePath=%s\n", rc, pDevSol->pszDevicePath));
+
+                        RTStrFree(pDevSol->pszDevicePath);
+                        pDevSol->pszDevicePath = NULL;
                     }
-
-                    RTCritSectDelete(&pDevSol->CritSect);
+                    else
+                    {
+                        LogRel((USBPROXY ":failed to get client info. rc=%Rrc pszDevicePath=%s\n", rc, pDevSol->pszDevicePath));
+                        if (rc == VERR_NOT_FOUND)
+                            rc = VERR_OPEN_FAILED;
+                    }
+                    RTPipeClose(pDevSol->hPipeWakeupR);
+                    RTPipeClose(pDevSol->hPipeWakeupW);
                 }
-                else
-                    LogRel((USBPROXY ":RTCritSectInit failed. rc=%Rrc pszAddress=%s\n", rc, pszAddress));
+
+                RTCritSectDelete(&pDevSol->CritSect);
             }
             else
-                LogRel((USBPROXY ":RTStrAPrintf failed. rc=%Rrc pszAddress=%s\n", rc, pszAddress));
-
-            RTMemFree(pDevSol);
-            pDevSol = NULL;
+                LogRel((USBPROXY ":RTCritSectInit failed. rc=%Rrc pszAddress=%s\n", rc, pszAddress));
         }
         else
-            rc = VERR_NO_MEMORY;
+            LogRel((USBPROXY ":RTStrAPrintf failed. rc=%Rrc pszAddress=%s\n", rc, pszAddress));
     }
     else
@@ -404 +393 @@
 
     USBLibTerm();
-    pProxyDev->Backend.pv = NULL;
     return rc;
 }
@@ -414 +402 @@
  * @param   pProxyDev   The device instance.
  */
-static void usbProxySolarisClose(PUSBPROXYDEV pProxyDev)
+static DECLCALLBACK(void) usbProxySolarisClose(PUSBPROXYDEV pProxyDev)
 {
     LogFlow((USBPROXY ":usbProxySolarisClose: pProxyDev=%p\n", pProxyDev));
 
-    PUSBPROXYDEVSOL pDevSol = (PUSBPROXYDEVSOL)pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
 
     /* Close the device (do not re-enumerate). */
@@ -452 +440 @@
     pDevSol->pszDevicePath = NULL;
 
-    RTMemFree(pDevSol);
-    pProxyDev->Backend.pv = NULL;
-
     USBLibTerm();
 }
@@ -466 +451 @@
  * @param   fRootHubReset       Is this a root hub reset or device specific reset request.
  */
-static int usbProxySolarisReset(PUSBPROXYDEV pProxyDev, bool fRootHubReset)
+static DECLCALLBACK(int) usbProxySolarisReset(PUSBPROXYDEV pProxyDev, bool fRootHubReset)
 {
     LogFlowFunc((USBPROXY ":usbProxySolarisReset pProxyDev=%s fRootHubReset=%d\n", pProxyDev->pUsbIns->pszName, fRootHubReset));
 
     /** Pass all resets to the device. The Trekstor USB (1.1) stick requires this to work. */
-    PUSBPROXYDEVSOL pDevSol = (PUSBPROXYDEVSOL)pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
 
     /* Soft reset the device. */
@@ -499 +484 @@
  * @param   iCfg            The configuration value to set.
  */
-static int usbProxySolarisSetConfig(PUSBPROXYDEV pProxyDev, int iCfg)
+static DECLCALLBACK(int) usbProxySolarisSetConfig(PUSBPROXYDEV pProxyDev, int iCfg)
 {
     LogFlowFunc((USBPROXY ":usbProxySolarisSetConfig: pProxyDev=%p iCfg=%#x\n", pProxyDev, iCfg));
 
-    PUSBPROXYDEVSOL pDevSol = (PUSBPROXYDEVSOL)pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
     AssertPtrReturn(pDevSol, VERR_INVALID_POINTER);
 
@@ -527 +512 @@
  * @returns success indicator (always true).
  */
-static int usbProxySolarisClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
+static DECLCALLBACK(int) usbProxySolarisClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
     return true;
@@ -541 +526 @@
  * @returns success indicator.
  */
-static int usbProxySolarisReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf)
+static DECLCALLBACK(int) usbProxySolarisReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
     return true;
@@ -552 +537 @@
  * @returns success indicator.
  */
-static int usbProxySolarisSetInterface(PUSBPROXYDEV pProxyDev, int iIf, int iAlt)
+static DECLCALLBACK(int) usbProxySolarisSetInterface(PUSBPROXYDEV pProxyDev, int iIf, int iAlt)
 {
     LogFlowFunc((USBPROXY ":usbProxySolarisSetInterface: pProxyDev=%p iIf=%d iAlt=%d\n", pProxyDev, iIf, iAlt));
 
-    PUSBPROXYDEVSOL pDevSol = (PUSBPROXYDEVSOL)pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
     AssertPtrReturn(pDevSol, VERR_INVALID_POINTER);
 
@@ -576 +561 @@
  * Clears the halted endpoint 'EndPt'.
  */
-static bool usbProxySolarisClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
+static DECLCALLBACK(bool) usbProxySolarisClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
 {
     LogFlowFunc((USBPROXY ":usbProxySolarisClearHaltedEp pProxyDev=%p EndPt=%#x\n", pProxyDev, EndPt));
 
-    PUSBPROXYDEVSOL pDevSol = (PUSBPROXYDEVSOL)pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
     AssertPtrReturn(pDevSol, VERR_INVALID_POINTER);
 
@@ -599 +584 @@
  * @copydoc USBPROXYBACK::pfnUrbQueue
  */
-static int usbProxySolarisUrbQueue(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxySolarisUrbQueue(PVUSBURB pUrb)
 {
     PUSBPROXYDEV    pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVSOL pDevSol = (PUSBPROXYDEVSOL)pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
 
     LogFlowFunc((USBPROXY ": usbProxySolarisUrbQueue: pProxyDev=%s pUrb=%p EndPt=%#x enmDir=%d cbData=%d pvData=%p\n",
@@ -665 +650 @@
  *          on Solaris. So we just abort pending URBs on the pipe.
  */
-static void usbProxySolarisUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(void) usbProxySolarisUrbCancel(PVUSBURB pUrb)
 {
     PUSBPROXYURBSOL pUrbSol = (PUSBPROXYURBSOL)pUrb->Dev.pvPrivate;
 
     PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVSOL pDevSol = (PUSBPROXYDEVSOL)pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
     AssertPtrReturnVoid(pDevSol);
 
@@ -701 +686 @@
  * @param   cMillies    Number of milliseconds to wait. Use 0 to not wait at all.
  */
-static PVUSBURB usbProxySolarisUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
+static DECLCALLBACK(PVUSBURB) usbProxySolarisUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
 {
     //LogFlowFunc((USBPROXY ":usbProxySolarisUrbReap pProxyDev=%p cMillies=%u\n", pProxyDev, cMillies));
 
-    PUSBPROXYDEVSOL pDevSol = (PUSBPROXYDEVSOL)pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
 
     /*
@@ -805 +790 @@
  * @param   pDevSol         The Solaris device instance.
  */
-PVUSBURB usbProxySolarisUrbComplete(PUSBPROXYDEVSOL pDevSol)
+static PVUSBURB usbProxySolarisUrbComplete(PUSBPROXYDEVSOL pDevSol)
 {
     LogFlowFunc((USBPROXY ":usbProxySolarisUrbComplete pDevSol=%p\n", pDevSol));
@@ -895 +880 @@
 static DECLCALLBACK(int) usbProxySolarisWakeup(PUSBPROXYDEV pProxyDev)
 {
-    PUSBPROXYDEVSOL pDevSol = (PUSBPROXYDEVSOL)pProxyDev->Backend.pv;
+    PUSBPROXYDEVFBSD pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
     size_t cbIgnored;
 
@@ -909 +894 @@
 extern const USBPROXYBACK g_USBProxyDeviceHost =
 {
+    /* pszName */
     "host",
+    /* cbBackend */
+    sizeof(USBPROXYDEVSOL),
     usbProxySolarisOpen,
     NULL,

trunk/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
  */
 
-static int usbProxyVrdpOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
+static DECLCALLBACK(int) usbProxyVrdpOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
 {
     LogFlow(("usbProxyVrdpOpen: pProxyDev=%p pszAddress=%s, pvBackend=%p\n", pProxyDev, pszAddress, pvBackend));
 
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
     int rc = VINF_SUCCESS;
 
@@ -58 +59 @@
         if (RT_SUCCESS (rc))
         {
-            PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)RTMemAlloc (sizeof(*pDevVrdp));
-            if (pDevVrdp)
-            {
-                pDevVrdp->pCallback = pCallback;
-                pDevVrdp->pDevice = pDevice;
-                pProxyDev->Backend.pv = pDevVrdp;
-                pProxyDev->iActiveCfg = 1; /** @todo that may not be always true. */
-                pProxyDev->cIgnoreSetConfigs = 1;
-                return VINF_SUCCESS;
-            }
-
-            pCallback->pfnClose (pDevice);
-            rc = VERR_NO_MEMORY;
+            pDevVrdp->pCallback = pCallback;
+            pDevVrdp->pDevice = pDevice;
+            pProxyDev->iActiveCfg = 1; /** @todo that may not be always true. */
+            pProxyDev->cIgnoreSetConfigs = 1;
+            return VINF_SUCCESS;
         }
     }
@@ -82 +75 @@
 }
 
-static void usbProxyVrdpClose(PUSBPROXYDEV pProxyDev)
+static DECLCALLBACK(void) usbProxyVrdpClose(PUSBPROXYDEV pProxyDev)
 {
     LogFlow(("usbProxyVrdpClose: pProxyDev = %p\n", pProxyDev));
 
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     pDevVrdp->pCallback->pfnClose (pDevVrdp->pDevice);
 }
 
-static int usbProxyVrdpReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
+static DECLCALLBACK(int) usbProxyVrdpReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
 {
     LogFlow(("usbProxyVrdpReset: pProxyDev = %p\n", pProxyDev));
 
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     int rc = pDevVrdp->pCallback->pfnReset (pDevVrdp->pDevice);
@@ -111 +104 @@
 }
 
-static int usbProxyVrdpSetConfig(PUSBPROXYDEV pProxyDev, int cfg)
+static DECLCALLBACK(int) usbProxyVrdpSetConfig(PUSBPROXYDEV pProxyDev, int cfg)
 {
     LogFlow(("usbProxyVrdpSetConfig: pProxyDev=%s cfg=%#x\n", pProxyDev->pUsbIns->pszName, cfg));
 
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     int rc = pDevVrdp->pCallback->pfnSetConfig (pDevVrdp->pDevice, (uint8_t)cfg);
@@ -128 +121 @@
 }
 
-static int usbProxyVrdpClaimInterface(PUSBPROXYDEV pProxyDev, int ifnum)
+static DECLCALLBACK(int) usbProxyVrdpClaimInterface(PUSBPROXYDEV pProxyDev, int ifnum)
 {
     LogFlow(("usbProxyVrdpClaimInterface: pProxyDev=%s ifnum=%#x\n", pProxyDev->pUsbIns->pszName, ifnum));
 
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     int rc = pDevVrdp->pCallback->pfnClaimInterface (pDevVrdp->pDevice, (uint8_t)ifnum);
@@ -145 +138 @@
 }
 
-static int usbProxyVrdpReleaseInterface(PUSBPROXYDEV pProxyDev, int ifnum)
+static DECLCALLBACK(int) usbProxyVrdpReleaseInterface(PUSBPROXYDEV pProxyDev, int ifnum)
 {
     LogFlow(("usbProxyVrdpReleaseInterface: pProxyDev=%s ifnum=%#x\n", pProxyDev->pUsbIns->pszName, ifnum));
 
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     int rc = pDevVrdp->pCallback->pfnReleaseInterface (pDevVrdp->pDevice, (uint8_t)ifnum);
@@ -162 +155 @@
 }
 
-static int usbProxyVrdpSetInterface(PUSBPROXYDEV pProxyDev, int ifnum, int setting)
+static DECLCALLBACK(int) usbProxyVrdpSetInterface(PUSBPROXYDEV pProxyDev, int ifnum, int setting)
 {
     LogFlow(("usbProxyVrdpSetInterface: pProxyDev=%p ifnum=%#x setting=%#x\n", pProxyDev, ifnum, setting));
 
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     int rc = pDevVrdp->pCallback->pfnInterfaceSetting (pDevVrdp->pDevice, (uint8_t)ifnum, (uint8_t)setting);
@@ -179 +172 @@
 }
 
-static bool usbProxyVrdpClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int ep)
+static DECLCALLBACK(bool) usbProxyVrdpClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int ep)
 {
     LogFlow(("usbProxyVrdpClearHaltedEp: pProxyDev=%s ep=%u\n", pProxyDev->pUsbIns->pszName, ep));
 
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     int rc = pDevVrdp->pCallback->pfnClearHaltedEP (pDevVrdp->pDevice, (uint8_t)ep);
@@ -196 +189 @@
 }
 
-static int usbProxyVrdpUrbQueue(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxyVrdpUrbQueue(PVUSBURB pUrb)
 {
     LogFlow(("usbProxyVrdpUrbQueue: pUrb=%p\n", pUrb));
@@ -208 +201 @@
 
     PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     int rc = pDevVrdp->pCallback->pfnQueueURB (pDevVrdp->pDevice, pUrb->enmType, pUrb->EndPt, pUrb->enmDir, pUrb->cbData,
@@ -222 +215 @@
 }
 
-static PVUSBURB usbProxyVrdpUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
+static DECLCALLBACK(PVUSBURB) usbProxyVrdpUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
 {
     LogFlow(("usbProxyVrdpUrbReap: pProxyDev=%s\n", pProxyDev->pUsbIns->pszName));
 
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     PVUSBURB pUrb = NULL;
@@ -252 +245 @@
 }
 
-static void usbProxyVrdpUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(void) usbProxyVrdpUrbCancel(PVUSBURB pUrb)
 {
     LogFlow(("usbProxyVrdpUrbCancel: pUrb=%p\n", pUrb));
 
     PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     pDevVrdp->pCallback->pfnCancelURB (pDevVrdp->pDevice, (PREMOTEUSBQURB)pUrb->Dev.pvPrivate);
 }
 
-static int usbProxyVrdpWakeup(PUSBPROXYDEV pProxyDev)
+static DECLCALLBACK(int) usbProxyVrdpWakeup(PUSBPROXYDEV pProxyDev)
 {
     LogFlow(("usbProxyVrdpWakeup: pProxyDev=%s\n", pProxyDev->pUsbIns->pszName));
 
-    PUSBPROXYDEVVRDP pDevVrdp = (PUSBPROXYDEVVRDP)pProxyDev->Backend.pv;
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
 
     return pDevVrdp->pCallback->pfnWakeup (pDevVrdp->pDevice);
@@ -276 +269 @@
 extern const USBPROXYBACK g_USBProxyDeviceVRDP =
 {
+    /* pszName */
     "vrdp",
+    /* cbBackend */
+    sizeof(USBPROXYDEVVRDP),
     usbProxyVrdpOpen,
     NULL,

trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp

@@ -9 +9 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -90 +90 @@
  * @returns VBox status code.
  */
-static int usbProxyWinOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
-{
-    /* Here you just need to use pProxyDev->priv to store whatever per-device
-     * data is needed
-     */
-    /*
-     * Allocate private device instance data and use USBPROXYDEV::Backend::pv to point to it.
-     */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)RTMemAllocZ(sizeof(PRIV_USBW32));
-    if (!pPriv)
-        return VERR_NO_MEMORY;
-    pProxyDev->Backend.pv = pPriv;
+static DECLCALLBACK(int) usbProxyWinOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
 
     int rc = VINF_SUCCESS;
@@ -192 +183 @@
     RTMemFree(pPriv->paQueuedUrbs);
     RTMemFree(pPriv->paHandles);
-    RTMemFree(pPriv);
-    pProxyDev->Backend.pv = NULL;
     return rc;
 }
@@ -200 +189 @@
  * Copy the device and free resources associated with the backend.
  */
-static void usbProxyWinClose(PUSBPROXYDEV pProxyDev)
+static DECLCALLBACK(void) usbProxyWinClose(PUSBPROXYDEV pProxyDev)
 {
     /* Here we just close the device and free up p->priv
@@ -206 +195 @@
      * that will have been done already
      */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     Assert(pPriv);
     if (!pPriv)
@@ -233 +222 @@
     RTMemFree(pPriv->paQueuedUrbs);
     RTMemFree(pPriv->paHandles);
-    RTMemFree(pPriv);
-    pProxyDev->Backend.pv = NULL;
-}
-
-
-static int usbProxyWinReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
-{
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+}
+
+
+static DECLCALLBACK(int) usbProxyWinReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     DWORD cbReturned;
     int  rc;
@@ -271 +258 @@
 }
 
-static int usbProxyWinSetConfig(PUSBPROXYDEV pProxyDev, int cfg)
+static DECLCALLBACK(int) usbProxyWinSetConfig(PUSBPROXYDEV pProxyDev, int cfg)
 {
     /* Send a SET_CONFIGURATION command to the device. We don't do this
@@ -280 +267 @@
      * point but it has to be synchronous.
     */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     USBSUP_SET_CONFIG in;
     DWORD cbReturned;
@@ -306 +293 @@
 }
 
-static int usbProxyWinClaimInterface(PUSBPROXYDEV p, int ifnum)
+static DECLCALLBACK(int) usbProxyWinClaimInterface(PUSBPROXYDEV p, int ifnum)
 {
     /* Called just before we use an interface. Needed on Linux to claim
@@ -313 +300 @@
      * Not relevant for Windows.
      */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)p->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
 
     pPriv->bInterfaceNumber = ifnum;
@@ -321 +308 @@
 }
 
-static int usbProxyWinReleaseInterface(PUSBPROXYDEV p, int ifnum)
+static DECLCALLBACK(int) usbProxyWinReleaseInterface(PUSBPROXYDEV p, int ifnum)
 {
     /* The opposite of claim_interface. */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)p->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
 
     Assert(pPriv);
@@ -330 +317 @@
 }
 
-static int usbProxyWinSetInterface(PUSBPROXYDEV pProxyDev, int ifnum, int setting)
+static DECLCALLBACK(int) usbProxyWinSetInterface(PUSBPROXYDEV pProxyDev, int ifnum, int setting)
 {
     /* Select an alternate setting for an interface, the same applies
@@ -336 +323 @@
      * message if you want but it must be synchronous
      */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     USBSUP_SELECT_INTERFACE in;
     DWORD cbReturned;
@@ -365 +352 @@
  * Clears the halted endpoint 'ep'.
  */
-static bool usbProxyWinClearHaltedEndPt(PUSBPROXYDEV pProxyDev, unsigned int ep)
-{
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+static DECLCALLBACK(bool) usbProxyWinClearHaltedEndPt(PUSBPROXYDEV pProxyDev, unsigned int ep)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     USBSUP_CLEAR_ENDPOINT in;
     DWORD cbReturned;
@@ -396 +383 @@
 static int usbProxyWinAbortEndPt(PUSBPROXYDEV pProxyDev, unsigned int ep)
 {
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     USBSUP_CLEAR_ENDPOINT in;
     DWORD cbReturned;
@@ -425 +412 @@
  * @copydoc USBPROXYBACK::pfnUrbQueue
  */
-static int usbProxyWinUrbQueue(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxyWinUrbQueue(PVUSBURB pUrb)
 {
     PUSBPROXYDEV    pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PPRIV_USBW32    pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     Assert(pPriv);
 
@@ -571 +558 @@
  *                      wait at all.
  */
-static PVUSBURB usbProxyWinUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
-{
-    PPRIV_USBW32      pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+static DECLCALLBACK(PVUSBURB) usbProxyWinUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     AssertReturn(pPriv, NULL);
 
@@ -732 +719 @@
  *          exactly what the guest wants to do.
  */
-static void usbProxyWinUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(void) usbProxyWinUrbCancel(PVUSBURB pUrb)
 {
     PUSBPROXYDEV      pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PPRIV_USBW32      pPriv     = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32      pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     PQUEUED_URB       pQUrbWin  = (PQUEUED_URB)pUrb->Dev.pvPrivate;
     int                     rc;
@@ -760 +747 @@
 }
 
-static int usbProxyWinWakeup(PUSBPROXYDEV pProxyDev)
-{
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+static DECLCALLBACK(int) usbProxyWinWakeup(PUSBPROXYDEV pProxyDev)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
 
     SetEvent(pPriv->hEventWakeup);
@@ -773 +760 @@
 extern const USBPROXYBACK g_USBProxyDeviceHost =
 {
+    /* pszName */
     "host",
+    /* cbBackend */
+    sizeof(PRIV_USBW32),
     usbProxyWinOpen,
     NULL,