diff options
| author | Bernhard Froehlich <decke@FreeBSD.org> | 2014-09-17 09:26:25 +0000 |
|---|---|---|
| committer | Bernhard Froehlich <decke@FreeBSD.org> | 2014-09-17 09:26:25 +0000 |
| commit | 1a9f6e6f13b00ae8a43420cf85ea21c429183827 (patch) | |
| tree | 4823357e46b2afc12f5ee827987065a665596fcc /emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp | |
| parent | 122c1644d98cdb4cb5414ae9b8dcc568f2d9b38e (diff) | |
| download | freebsd-ports-1a9f6e6f13b00ae8a43420cf85ea21c429183827.zip | |
- Update to 4.3.16
Submitted by: Mikhail Tsatsenko <m.tsatsenko@gmail.com>,
Jung-uk Kim <jkim@FreeBSD.org>
Obtained from: svn.redports.org/virtualbox
Diffstat (limited to 'emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp')
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp | 62 |
1 files changed, 62 insertions, 0 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 new file mode 100644 index 000000000000..1616ee2f52a2 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp @@ -0,0 +1,62 @@ +--- src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp.orig 2014-09-09 23:54:12.000000000 +0400 ++++ src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp 2014-09-11 00:40:37.313435496 +0400 +@@ -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 waiking up - writing end. */ ++ RTPIPE hPipeWakeupW; ++ /** Pipe handle for waiking up - reading end. */ ++ RTPIPE hPipeWakeupR; ++ /** Software endpoint structures */ ++ USBENDPOINTFBSD aSwEndpoint[USBFBSD_MAXENDPOINTS]; + /** Kernel endpoint structures */ + struct usb_fs_endpoint aHwEndpoint[USBFBSD_MAXENDPOINTS]; + } USBPROXYDEVFBSD, *PUSBPROXYDEVFBSD; +@@ -453,7 +458,6 @@ + pDevFBSD->hFile = NIL_RTFILE; + + RTMemFree(pDevFBSD); +- pProxyDev->Backend.pv = NULL; + + LogFlow(("usbProxyFreeBSDClose: returns\n")); + } +@@ -984,6 +988,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. + */ +@@ -1005,6 +1019,7 @@ + usbProxyFreeBSDUrbQueue, + usbProxyFreeBSDUrbCancel, + usbProxyFreeBSDUrbReap, ++ usbProxyFreeBSDWakeup, + 0 + }; + |