From owner-freebsd-ports@FreeBSD.ORG Fri Mar 27 12:27:02 2009 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 169E910656CE for ; Fri, 27 Mar 2009 12:27:02 +0000 (UTC) (envelope-from lstewart@room52.net) Received: from outbound.icp-qv1-irony-out2.iinet.net.au (outbound.icp-qv1-irony-out2.iinet.net.au [203.59.1.107]) by mx1.freebsd.org (Postfix) with ESMTP id 89E8A8FC17 for ; Fri, 27 Mar 2009 12:27:01 +0000 (UTC) (envelope-from lstewart@room52.net) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApoEAK9bzEl8qF1T/2dsb2JhbADPaIN3Bg X-IronPort-AV: E=Sophos;i="4.38,431,1233500400"; d="scan'208";a="457080103" Received: from unknown (HELO lawrence1.loshell.room52.net) ([124.168.93.83]) by outbound.icp-qv1-irony-out2.iinet.net.au with ESMTP; 27 Mar 2009 20:57:17 +0900 Message-ID: <49CCBF1D.1080900@room52.net> Date: Fri, 27 Mar 2009 22:57:17 +1100 From: Lawrence Stewart User-Agent: Thunderbird 2.0.0.21 (X11/20090326) MIME-Version: 1.0 To: samm@os2.kiev.ua Content-Type: multipart/mixed; boundary="------------060401090803030002060302" Cc: freebsd-ports@freebsd.org Subject: [PATCH] pilot-link port (as dependency of kdepim-4.2.1) broken by new usb X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2009 12:27:02 -0000 This is a multi-part message in MIME format. --------------060401090803030002060302 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, You're listed as the maintainer for the FreeBSD palm/pilot-link port. It gets pulled in as a dependency of libmal, which in turn is required by kdepim-4.2.1. On FreeBSD 8-CURRENT, the new USB stack has broken the build of this port. The attached patch allows the port to compile. The patch is only required if ${OSVERSION} >= 800064. I tested on 8.0-CURRENT (r190457) amd64. Cheers, Lawrence --------------060401090803030002060302 Content-Type: text/plain; name="patch-usb2" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-usb2" --- libpisock/freebsdusb.c.orig 2006-10-13 00:21:22.000000000 +1000 +++ libpisock/freebsdusb.c 2009-03-27 22:37:32.000000000 +1100 @@ -48,7 +48,7 @@ #if defined(__FreeBSD__) /* freebsd usb header */ -#include +#include #define MAX_BUF 256 #endif @@ -98,7 +98,7 @@ i, endpoint_fd; - struct usb_device_info udi; + struct usb2_device_descriptor udi; /* struct usb_ctl_request ur; */ /* unsigned char usbresponse[50]; */ @@ -173,18 +173,18 @@ 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", + "DEV USB_SET_RX_SHORT_XFER USB FreeBSD fd: %d failed\n", endpoint_fd)); } /* 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_RX_TIMEOUT, &i) < 0) { LOG((PI_DBG_DEV, PI_DBG_LVL_WARN, - "DEV USB_SET_TIMEOUT USB FreeBSD fd: %d failed\n", + "DEV USB_SET_RX_TIMEOUT USB FreeBSD fd: %d failed\n", endpoint_fd)); } --------------060401090803030002060302--