diff options
| author | Wesley Shields <wxs@FreeBSD.org> | 2009-07-09 03:12:35 +0000 |
|---|---|---|
| committer | Wesley Shields <wxs@FreeBSD.org> | 2009-07-09 03:12:35 +0000 |
| commit | e7c045dcd9ad4d0684e9ccba76f55f7c275dfc54 (patch) | |
| tree | 37cf3011fa418b78e0ba3d2a4d56c94901044d53 /palm | |
| parent | 62cd08d6d684bb06a46579c36162d27896e8bfb4 (diff) | |
| download | ports-e7c045dcd9ad4d0684e9ccba76f55f7c275dfc54.tar.gz ports-e7c045dcd9ad4d0684e9ccba76f55f7c275dfc54.zip | |
- Unbreak on -current.
PR: ports/135694
Submitted by: Ulrich Spoerlein <uqs@spoerlein.net>
Approved by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=237467
Diffstat (limited to 'palm')
| -rw-r--r-- | palm/pilot-link/files/patch-libpisock_freebsdusb.c | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/palm/pilot-link/files/patch-libpisock_freebsdusb.c b/palm/pilot-link/files/patch-libpisock_freebsdusb.c index e6d9a5e5b8cd..811c8e54d937 100644 --- a/palm/pilot-link/files/patch-libpisock_freebsdusb.c +++ b/palm/pilot-link/files/patch-libpisock_freebsdusb.c @@ -1,15 +1,36 @@ ---- libpisock/freebsdusb.c.orig 2006-10-12 06:21:22.000000000 -0800 -+++ libpisock/freebsdusb.c 2009-03-02 10:06:01.000000000 -0900 -@@ -48,7 +48,12 @@ +--- libpisock/freebsdusb.c.orig 2006-10-12 16:21:22.000000000 +0200 ++++ libpisock/freebsdusb.c 2009-06-18 13:05:35.383212316 +0200 +@@ -48,7 +48,15 @@ #if defined(__FreeBSD__) /* freebsd usb header */ +#include <sys/param.h> -+#if __FreeBSD_version+0 >= 800064 -+#include <legacy/dev/usb/usb.h> -+#else #include <dev/usb/usb.h> ++#if __FreeBSD_version+0 >= 800092 ++#include <dev/usb/usb_ioctl.h> ++#else ++/* redefine to legacy names, so this continues to build on FreeBSD 7.x */ ++#define USB_SET_TX_TIMEOUT USB_SET_TIMEOUT ++#define USB_SET_RX_SHORT_XFER USB_SET_SHORT_XFER +#endif #define MAX_BUF 256 #endif +@@ -173,7 +181,7 @@ + will don't know exactly + what is coming so we can't specify exact byte amounts */ + i = 1; +- if (ioctl(endpoint_fd, USB_SET_SHORT_XFER, &i) < 0) { ++ if (ioctl(endpoint_fd, USB_SET_RX_SHORT_XFER, &i) < 0) { + LOG((PI_DBG_DEV, PI_DBG_LVL_WARN, + "DEV USB_SET_SHORT_XFER USB FreeBSD fd: %d failed\n", + endpoint_fd)); +@@ -182,7 +190,7 @@ + /* 0 timeout value will cause us the wait until the device has data + available or is disconnected */ + i = 0; +- if (ioctl(endpoint_fd, USB_SET_TIMEOUT, &i) < 0) { ++ if (ioctl(endpoint_fd, USB_SET_TX_TIMEOUT, &i) < 0) { + LOG((PI_DBG_DEV, PI_DBG_LVL_WARN, + "DEV USB_SET_TIMEOUT USB FreeBSD fd: %d failed\n", + endpoint_fd)); |