From owner-freebsd-current Tue Jun 1 2:36:20 1999 Delivered-To: freebsd-current@freebsd.org Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.40.131]) by hub.freebsd.org (Postfix) with ESMTP id 2C8E914C89 for ; Tue, 1 Jun 1999 02:36:13 -0700 (PDT) (envelope-from phk@critter.freebsd.dk) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.9.3/8.9.2) with ESMTP id LAA19409; Tue, 1 Jun 1999 11:35:19 +0200 (CEST) (envelope-from phk@critter.freebsd.dk) To: Dirk-Willem van Gulik Cc: USB BSD list , Christopher Masto , FreeBSD current Mailing list Subject: Re: [usb-bsd] Re: USB fixes for cdevsw change In-reply-to: Your message of "Tue, 01 Jun 1999 10:40:02 +0200." Date: Tue, 01 Jun 1999 11:35:19 +0200 Message-ID: <19407.928229719@critter.freebsd.dk> From: Poul-Henning Kamp Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Sorry for overlooking that one. In message , Dirk-Willem van Gulik writes: > > >Thanks Christopher ! > >Dw. >On Tue, 1 Jun 1999, Nick Hibma wrote: > >> >> 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 >> > >> > >> >> > > > >To Unsubscribe: send mail to majordomo@FreeBSD.org >with "unsubscribe freebsd-current" in the body of the message > -- Poul-Henning Kamp FreeBSD coreteam member phk@FreeBSD.ORG "Real hackers run -current on their laptop." FreeBSD -- It will take a long time before progress goes too far! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message