From owner-freebsd-current Tue Jun 1 0:26:48 1999 Delivered-To: freebsd-current@freebsd.org Received: from ns.skylink.it (ns.skylink.it [194.177.113.1]) by hub.freebsd.org (Postfix) with ESMTP id 8DF661560B for ; Tue, 1 Jun 1999 00:26:45 -0700 (PDT) (envelope-from hibma@skylink.it) Received: from heidi.plazza.it (va-185.skylink.it [194.185.55.185]) by ns.skylink.it (8.9.1/8.8.8) with ESMTP id JAA12958; Tue, 1 Jun 1999 09:26:18 +0200 Received: from localhost (localhost.plazza.it [127.0.0.1]) by heidi.plazza.it (8.8.8/8.8.5) with SMTP id JAA02747; Tue, 1 Jun 1999 09:22:17 +0200 (CEST) Date: Tue, 1 Jun 1999 09:22:17 +0200 (CEST) From: Nick Hibma X-Sender: n_hibma@heidi.plazza.it Reply-To: Nick Hibma To: Christopher Masto Cc: FreeBSD current Mailing list , USB BSD list Subject: Re: USB fixes for cdevsw change In-Reply-To: <19990531203317.A24491@netmonger.net> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Thanks. Committed. Nick On Mon, 31 May 1999, Christopher Masto wrote: > 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 > > -- e-Mail: hibma@skylink.it To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message