From owner-freebsd-current  Mon May 31 17:35:31 1999
Delivered-To: freebsd-current@freebsd.org
Received: from cheddar.netmonger.net (cheddar.netmonger.net [209.54.21.140])
	by hub.freebsd.org (Postfix) with ESMTP id D313414DDE
	for <current@freebsd.org>; Mon, 31 May 1999 17:35:25 -0700 (PDT)
	(envelope-from chris@cheddar.netmonger.net)
Received: (from chris@localhost)
	by cheddar.netmonger.net (8.8.8/8.8.8) id UAA24794
	for current@freebsd.org; Mon, 31 May 1999 20:35:24 -0400 (EDT)
Message-ID: <19990531203317.A24491@netmonger.net>
Date: Mon, 31 May 1999 20:33:17 -0400
From: Christopher Masto <chris@netmonger.net>
To: fb-current@freebsd.org, bsd-usb@egroups.com
Subject: USB fixes for cdevsw change
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 0.91.1i
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

USB stopped working as of the recent cdevsw cleanup.  This fixes it.

Index: usb.c
===================================================================
RCS file: /usr/cvs/freebsd/src/sys/dev/usb/usb.c,v
retrieving revision 1.12
diff -u -r1.12 usb.c
--- usb.c	1999/05/30 16:51:51	1.12
+++ usb.c	1999/06/01 00:30:23
@@ -129,7 +129,7 @@
 	/* strategy */	nostrategy,
 	/* name */	"usb",
 	/* parms */	noparms,
-	/* maj */	-1,
+	/* maj */	USB_CDEV_MAJOR,
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
Index: usbdi.c
===================================================================
RCS file: /usr/cvs/freebsd/src/sys/dev/usb/usbdi.c,v
retrieving revision 1.17
diff -u -r1.17 usbdi.c
--- usbdi.c	1999/05/31 11:25:21	1.17
+++ usbdi.c	1999/06/01 00:30:23
@@ -80,12 +80,6 @@
 
 static SIMPLEQ_HEAD(, usbd_request) usbd_free_requests;
 
-#if defined(__FreeBSD__)
-#define USB_CDEV_MAJOR	108
-
-extern struct cdevsw usb_cdevsw;
-#endif
-
 #ifdef USB_DEBUG
 char *usbd_error_strs[USBD_ERROR_MAX] = {
 	"NORMAL_COMPLETION",
Index: usbdi.h
===================================================================
RCS file: /usr/cvs/freebsd/src/sys/dev/usb/usbdi.h,v
retrieving revision 1.11
diff -u -r1.11 usbdi.h
--- usbdi.h	1999/05/20 20:02:37	1.11
+++ usbdi.h	1999/06/01 00:30:23
@@ -115,6 +115,12 @@
 #define USBD_NO_TIMEOUT 0
 #define USBD_DEFAULT_TIMEOUT 5000 /* ms = 5 s */
 
+#if defined(__FreeBSD__)
+#define USB_CDEV_MAJOR	108
+
+extern struct cdevsw usb_cdevsw;
+#endif
+
 usbd_status usbd_open_pipe
 	__P((usbd_interface_handle iface, u_int8_t address,
 	     u_int8_t flags, usbd_pipe_handle *pipe));


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message