From owner-svn-src-user@FreeBSD.ORG  Tue Jan  5 22:50:36 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC39B106568F;
	Tue,  5 Jan 2010 22:50:36 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C0E98FC1B;
	Tue,  5 Jan 2010 22:50:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o05Moae3036804;
	Tue, 5 Jan 2010 22:50:36 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o05MoaKo036802;
	Tue, 5 Jan 2010 22:50:36 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201001052250.o05MoaKo036802@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 5 Jan 2010 22:50:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201618 - user/rpaulo/ubthidctl
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jan 2010 22:50:36 -0000

Author: rpaulo
Date: Tue Jan  5 22:50:36 2010
New Revision: 201618
URL: http://svn.freebsd.org/changeset/base/201618

Log:
  Try to cope with the new usb stack.

Modified:
  user/rpaulo/ubthidctl/ubthidctl.c

Modified: user/rpaulo/ubthidctl/ubthidctl.c
==============================================================================
--- user/rpaulo/ubthidctl/ubthidctl.c	Tue Jan  5 22:37:05 2010	(r201617)
+++ user/rpaulo/ubthidctl/ubthidctl.c	Tue Jan  5 22:50:36 2010	(r201618)
@@ -22,9 +22,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- *
  */
 
 /*
@@ -33,9 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-#ifdef __FreeBSD__
 __FBSDID("$FreeBSD$");
-#endif
 
 #include <err.h>
 #include <fcntl.h>
@@ -46,7 +41,8 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/ioctl.h>
 
-#include <dev/usb/usb.h>
+#include <dev/usb/usb_ioctl.h>
+#include <dev/usb/usbdi.h>
 
 typedef enum {
 	HCI = 0,
@@ -81,7 +77,7 @@ finddevice(tblentry_t tblentry)
 	dev.devno = -1;
 	
 	for (i = 0; i < 20; i++) {
-		snprintf(filename, sizeof(filename) - 1, "/dev/usb%d", i); 
+		snprintf(filename, sizeof(filename) - 1, "/dev/ugen%d.1", i); 
 		fd = open(filename, O_RDONLY);
 		if (fd < 0)
 			return dev;
@@ -171,7 +167,7 @@ switchmode(const char *dev, const int de
 	USETW(req.ucr_request.wIndex, 0);
 	USETW(req.ucr_request.wLength, 0);
 	req.ucr_data = NULL;
-	req.ucr_flags = USBD_SHORT_XFER_OK;
+	req.ucr_flags = USB_SHORT_XFER_OK;
 	req.ucr_request.bmRequestType = UT_VENDOR;
 	req.ucr_request.bRequest = 0;