1 files changed, 0 insertions, 175 deletions
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp
deleted file mode 100644
index 0224a77751ba..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
---- src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp.orig	2014-11-21 16:22:08.000000000 +0100
-+++ src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp	2014-11-28 17:25:16.000000000 +0100
-@@ -52,6 +52,7 @@
- #include <iprt/asm.h>
- #include <iprt/string.h>
- #include <iprt/file.h>
-+#include <iprt/pipe.h>
- #include "../USBProxyDevice.h"
- 
- /** Maximum endpoints supported. */
-@@ -95,12 +96,16 @@
- {
-     /** The open file. */
-     RTFILE                 hFile;
--    /** Software endpoint structures */
--    USBENDPOINTFBSD        aSwEndpoint[USBFBSD_MAXENDPOINTS];
-     /** Flag whether an URB is cancelling. */
-     bool                   fCancelling;
-     /** Flag whether initialised or not */
-     bool                   fInit;
-+    /** Pipe handle for waking up - writing end. */
-+    RTPIPE                 hPipeWakeupW;
-+    /** Pipe handle for waking up - reading end. */
-+    RTPIPE                 hPipeWakeupR;
-+    /** Software endpoint structures */
-+    USBENDPOINTFBSD        aSwEndpoint[USBFBSD_MAXENDPOINTS];
-     /** Kernel endpoint structures */
-     struct usb_fs_endpoint aHwEndpoint[USBFBSD_MAXENDPOINTS];
- } USBPROXYDEVFBSD, *PUSBPROXYDEVFBSD;
-@@ -383,10 +388,17 @@
-         rc = usbProxyFreeBSDFsInit(pProxyDev);
-         if (RT_SUCCESS(rc))
-         {
--            LogFlow(("usbProxyFreeBSDOpen(%p, %s): returns successfully hFile=%RTfile iActiveCfg=%d\n",
--                     pProxyDev, pszAddress, pDevFBSD->hFile, pProxyDev->iActiveCfg));
-+            /*
-+             * Create wakeup pipe.
-+             */
-+            rc = RTPipeCreate(&pDevFBSD->hPipeWakeupR, &pDevFBSD->hPipeWakeupW, 0);
-+            if (RT_SUCCESS(rc))
-+            {
-+                LogFlow(("usbProxyFreeBSDOpen(%p, %s): returns successfully hFile=%RTfile iActiveCfg=%d\n",
-+                         pProxyDev, pszAddress, pDevFBSD->hFile, pProxyDev->iActiveCfg));
- 
--            return VINF_SUCCESS;
-+                return VINF_SUCCESS;
-+            }
-         }
- 
-         RTFileClose(hFile);
-@@ -449,12 +461,12 @@
- 
-     usbProxyFreeBSDFsUnInit(pProxyDev);
- 
-+    RTPipeClose(pDevFBSD->hPipeWakeupR);
-+    RTPipeClose(pDevFBSD->hPipeWakeupW);
-+
-     RTFileClose(pDevFBSD->hFile);
-     pDevFBSD->hFile = NIL_RTFILE;
- 
--    RTMemFree(pDevFBSD);
--    pProxyDev->Backend.pv = NULL;
--
-     LogFlow(("usbProxyFreeBSDClose: returns\n"));
- }
- 
-@@ -688,9 +700,10 @@
-              pUrb, (unsigned)pUrb->EndPt, (unsigned)pUrb->enmDir));
- 
-     ep_num = pUrb->EndPt;
--
--    if ((pUrb->enmType != VUSBXFERTYPE_MSG) && (pUrb->enmDir == VUSBDIRECTION_IN))
-+    if ((pUrb->enmType != VUSBXFERTYPE_MSG) && (pUrb->enmDir == VUSBDIRECTION_IN)) {
-+        /* set IN-direction bit */
-         ep_num |= 0x80;
-+    }
- 
-     index = 0;
- 
-@@ -822,7 +835,7 @@
-     PUSBENDPOINTFBSD pEndpointFBSD;
-     PVUSBURB pUrb;
-     struct usb_fs_complete UsbFsComplete;
--    struct pollfd PollFd;
-+    struct pollfd pfd[2];
-     int rc;
- 
-     LogFlow(("usbProxyFreeBSDUrbReap: pProxyDev=%p, cMillies=%u\n",
-@@ -946,23 +959,38 @@
-                  (unsigned)pEndpointFBSD->acbData[1]));
- 
-     }
--    else if (cMillies && rc == VERR_RESOURCE_BUSY)
-+    else if (cMillies != 0 && rc == VERR_RESOURCE_BUSY)
-     {
--        /* Poll for finished transfers */
--        PollFd.fd = RTFileToNative(pDevFBSD->hFile);
--        PollFd.events = POLLIN | POLLRDNORM;
--        PollFd.revents = 0;
--
--        rc = poll(&PollFd, 1, (cMillies == RT_INDEFINITE_WAIT) ? INFTIM : cMillies);
--        if (rc >= 1)
--        {
--            goto repeat;
--        }
--        else
-+        for (;;)
-         {
--            LogFlow(("usbProxyFreeBSDUrbReap: "
--                     "poll returned rc=%d\n", rc));
-+            pfd[0].fd = RTFileToNative(pDevFBSD->hFile);
-+            pfd[0].events = POLLIN | POLLRDNORM;
-+            pfd[0].revents = 0;
-+
-+            pfd[1].fd = RTPipeToNative(pDevFBSD->hPipeWakeupR);
-+            pfd[1].events = POLLIN | POLLRDNORM;
-+            pfd[1].revents = 0;
-+
-+            rc = poll(pfd, 2, (cMillies == RT_INDEFINITE_WAIT) ? INFTIM : cMillies);
-+            if (rc > 0)
-+            {
-+                if (pfd[1].revents & POLLIN)
-+                {
-+                    /* Got woken up, drain pipe. */
-+                    uint8_t bRead;
-+                    size_t cbIgnored = 0;
-+                    RTPipeRead(pDevFBSD->hPipeWakeupR, &bRead, 1, &cbIgnored);
-+                    /* Make sure we return from this function */
-+                    cMillies = 0;
-+                }
-+                break;
-+            }
-+            if (rc == 0)
-+                return NULL;
-+            if (errno != EAGAIN)
-+                return NULL;
-         }
-+        goto repeat;
-     }
-     return pUrb;
- }
-@@ -984,6 +1012,16 @@
-     return usbProxyFreeBSDEndpointClose(pProxyDev, index);
- }
- 
-+static DECLCALLBACK(int) usbProxyFreeBSDWakeup(PUSBPROXYDEV pProxyDev)
-+{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
-+    size_t cbIgnored;
-+
-+    LogFlowFunc(("pProxyDev=%p\n", pProxyDev));
-+
-+    return RTPipeWrite(pDevFBSD->hPipeWakeupW, "", 1, &cbIgnored);
-+}
-+
- /**
-  * The FreeBSD USB Proxy Backend.
-  */
-@@ -992,7 +1030,7 @@
-     /* pszName */
-     "host",
-     /* cbBackend */
--    sizeof(PUSBPROXYDEVFBSD),
-+    sizeof(USBPROXYDEVFBSD),
-     usbProxyFreeBSDOpen,
-     usbProxyFreeBSDInit,
-     usbProxyFreeBSDClose,
-@@ -1005,6 +1043,7 @@
-     usbProxyFreeBSDUrbQueue,
-     usbProxyFreeBSDUrbCancel,
-     usbProxyFreeBSDUrbReap,
-+    usbProxyFreeBSDWakeup,
-     0
- };
-