From owner-cvs-src@FreeBSD.ORG Mon May 12 12:50:15 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E88437B405; Mon, 12 May 2003 12:50:15 -0700 (PDT) Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8859843F93; Mon, 12 May 2003 12:50:13 -0700 (PDT) (envelope-from des@ofug.org) Received: by flood.ping.uio.no (Postfix, from userid 2602) id 2BBD6530F; Mon, 12 May 2003 21:50:09 +0200 (CEST) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: obrien@FreeBSD.org References: <200305112355.h4BNtSWR030741@repoman.freebsd.org> <20030512154517.GA20109@dragon.nuxi.com> From: Dag-Erling Smorgrav Date: Mon, 12 May 2003 21:50:08 +0200 In-Reply-To: <20030512154517.GA20109@dragon.nuxi.com> (David O'Brien's message of "Mon, 12 May 2003 08:45:17 -0700") Message-ID: User-Agent: Gnus/5.1001 (Gnus v5.10.1) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" cc: Josef Karthauser cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/share/man/man4 umass.4 src/sys/dev/usb umass.c usbdevs X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2003 19:50:15 -0000 --=-=-= "David O'Brien" writes: > On Mon, May 12, 2003 at 11:51:34AM +0200, Dag-Erling Smorgrav wrote: > > Please remember to regenerate usbdevs.h next time... > Or better yet -- make it generated at kernel build time. I have a patch here that causes it to be generated at the depend stage if needed, but the drivers need to be updated to #include "usbdevs.h" instead of . DES -- Dag-Erling Smorgrav - des@ofug.org --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=usbdevs.diff Index: sys/conf/kern.post.mk =================================================================== RCS file: /home/ncvs/src/sys/conf/kern.post.mk,v retrieving revision 1.41 diff -u -r1.41 kern.post.mk --- sys/conf/kern.post.mk 30 Apr 2003 12:19:25 -0000 1.41 +++ sys/conf/kern.post.mk 12 May 2003 19:43:43 -0000 @@ -228,4 +228,9 @@ majors.o: ${NORMAL_C} +usbdevs.h usbdevs_data.h: $S/dev/usb/usbdevs $S/dev/usb/devlist2h.awk + rm -f usbdevs.h usbdevs_data.h + ${AWK} -v type=USB -v os=FreeBSD \ + -f $S/dev/usb/devlist2h.awk $S/dev/usb/usbdevs + .include "kern.mk" Index: sys/modules/usb/Makefile =================================================================== RCS file: /home/ncvs/src/sys/modules/usb/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- sys/modules/usb/Makefile 14 Apr 2003 14:04:08 -0000 1.12 +++ sys/modules/usb/Makefile 12 May 2003 19:45:22 -0000 @@ -10,6 +10,7 @@ SRCS= bus_if.h device_if.h usb_if.h usb_if.c \ vnode_if.h \ opt_usb.h \ + usbdevs.h usbdevs_data.h \ hid.c hid.h usbhid.h \ uhub.c \ usb.c usb.h \ @@ -26,5 +27,10 @@ SRCS+= ohci_pci.c ohci.c ohcireg.h ohcivar.h SRCS+= ehci_pci.c ehci.c ehcireg.h ehcivar.h SRCS+= opt_bus.h pci_if.h + +usbdevs.h usbdevs_data.h: $S/dev/usb/usbdevs $S/dev/usb/devlist2h.awk + rm -f usbdevs.h usbdevs_data.h + ${AWK} -v type=USB -v os=FreeBSD \ + -f $S/dev/usb/devlist2h.awk $S/dev/usb/usbdevs .include --=-=-=--