Date: Thu, 18 Jun 2009 13:59:33 +0200 (CEST) From: Ulrich Spoerlein <uqs@spoerlein.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: samm@os2.kiev.ua, hps@FreeBSD.org Subject: ports/135694: [PATCH] palm/pilot-link: Unbreak on 8-CURRENT Message-ID: <200906181159.n5IBxX6n047491@roadrunner.spoerlein.net> Resent-Message-ID: <200906181200.n5IC08OD021365@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135694
>Category: ports
>Synopsis: [PATCH] palm/pilot-link: Unbreak on 8-CURRENT
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 18 12:00:07 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
>Description:
The legacy USB stack has been removed, this port no longer builds.
I mapped the ioctls as best as I could and compile-tested on 7.2/i386 and
8.0/amd64.
@Hans Petter: Could you please take a look at the patch to see if it is the
right approach? Many thanks!
Port maintainer (samm@os2.kiev.ua) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- pilot-link-0.12.3,1.patch begins here ---
Index: files/patch-libpisock_freebsdusb.c
===================================================================
RCS file: /tank/ncvs/ports/palm/pilot-link/files/patch-libpisock_freebsdusb.c,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-libpisock_freebsdusb.c
--- files/patch-libpisock_freebsdusb.c 2 Apr 2009 11:44:53 -0000 1.1
+++ files/patch-libpisock_freebsdusb.c 18 Jun 2009 11:56:45 -0000
@@ -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));
--- pilot-link-0.12.3,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906181159.n5IBxX6n047491>