Date: Mon, 12 May 2003 21:50:08 +0200 From: Dag-Erling Smorgrav <des@ofug.org> To: obrien@FreeBSD.org Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/share/man/man4 umass.4 src/sys/dev/usb umass.c usbdevs Message-ID: <xzp65ogndvz.fsf@flood.ping.uio.no> In-Reply-To: <20030512154517.GA20109@dragon.nuxi.com> (David O'Brien's message of "Mon, 12 May 2003 08:45:17 -0700") References: <200305112355.h4BNtSWR030741@repoman.freebsd.org> <xzpvfwg332x.fsf@flood.ping.uio.no> <20030512154517.GA20109@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
"David O'Brien" <obrien@FreeBSD.org> 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 <dev/usb/usbdevs.h>.
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 <bsd.kmod.mk>
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzp65ogndvz.fsf>