Date: Tue, 13 May 2003 11:47:38 +0200 From: Dag-Erling Smorgrav <des@ofug.org> To: "M. Warner Losh" <imp@bsdimp.com> Cc: obrien@FreeBSD.org Subject: Re: cvs commit: src/share/man/man4 umass.4 src/sys/dev/usb umass.c usbdevs Message-ID: <xzphe7zmb45.fsf@flood.ping.uio.no> In-Reply-To: <xzpllxbmcqr.fsf@flood.ping.uio.no> (Dag-Erling Smorgrav's message of "Tue, 13 May 2003 11:12:28 %2B0200") References: <xzpvfwg332x.fsf@flood.ping.uio.no> <20030512154517.GA20109@dragon.nuxi.com> <xzp65ogndvz.fsf@flood.ping.uio.no> <20030512.223927.39164038.imp@bsdimp.com> <xzpllxbmcqr.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Dag-Erling Smorgrav <des@ofug.org> writes:
> "M. Warner Losh" <imp@bsdimp.com> writes:
> > This patch doesn't address those drivers that might wish to build not
> > in the usb.ko module, for example the urio driver and I'm sure others.
> I know. I did mention that it was incomplete, didn't I?
This one should be a little better. The second patch fixes the
#include lines. It would be advantageous if the awk script could
generate usbdevs.h and usbdevs_data.h separately, as the latter is
only required by the usb driver and it's a waste of time and space to
generate it for all the other drivers.
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/conf/kmod.mk
===================================================================
RCS file: /home/ncvs/src/sys/conf/kmod.mk,v
retrieving revision 1.137
diff -u -r1.137 kmod.mk
--- sys/conf/kmod.mk 3 Mar 2003 22:51:22 -0000 1.137
+++ sys/conf/kmod.mk 13 May 2003 09:18:06 -0000
@@ -308,5 +308,15 @@
${OBJS}: ${SRCS:M*.h}
.endif
+# Special handling for USB drivers (which we identify by the fact that
+# they depend on opt_usb.h). These modules need usbdevs.h and
+# usbdevs_data.h which are generated from sys/dev/usb/usbdevs.
+opt_usb.h: usbdevs.h usbdevs_data.h
+usbdevs.h usbdevs_data.h: @/dev/usb/usbdevs @/dev/usb/devlist2h.awk
+ rm -f usbdevs.h usbdevs_data.h
+ ${AWK} -v type=USB -v os=FreeBSD \
+ -f @/dev/usb/devlist2h.awk @/dev/usb/usbdevs
+
+
.include <bsd.obj.mk>
.include "kern.mk"
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=usbdevs_include.diff
Index: dev/usb/if_aue.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/if_aue.c,v
retrieving revision 1.68
diff -u -r1.68 if_aue.c
--- dev/usb/if_aue.c 15 Apr 2003 06:37:27 -0000 1.68
+++ dev/usb/if_aue.c 13 May 2003 09:34:18 -0000
@@ -84,8 +84,9 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_ethersubr.h>
+
+#include "usbdevs.h"
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: dev/usb/if_axe.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/if_axe.c,v
retrieving revision 1.3
diff -u -r1.3 if_axe.c
--- dev/usb/if_axe.c 21 Apr 2003 17:34:13 -0000 1.3
+++ dev/usb/if_axe.c 13 May 2003 09:34:37 -0000
@@ -88,8 +88,9 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_ethersubr.h>
+
+#include "usbdevs.h"
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: dev/usb/if_cue.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/if_cue.c,v
retrieving revision 1.34
diff -u -r1.34 if_cue.c
--- dev/usb/if_cue.c 15 Apr 2003 06:37:27 -0000 1.34
+++ dev/usb/if_cue.c 13 May 2003 09:34:13 -0000
@@ -72,10 +72,11 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_ethersubr.h>
#include <dev/usb/if_cuereg.h>
+
+#include "usbdevs.h"
/*
* Various supported device vendors/products.
Index: dev/usb/if_kue.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/if_kue.c,v
retrieving revision 1.47
diff -u -r1.47 if_kue.c
--- dev/usb/if_kue.c 15 Apr 2003 06:37:27 -0000 1.47
+++ dev/usb/if_kue.c 13 May 2003 09:34:10 -0000
@@ -87,11 +87,12 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_ethersubr.h>
#include <dev/usb/if_kuereg.h>
#include <dev/usb/kue_fw.h>
+
+#include "usbdevs.h"
MODULE_DEPEND(kue, usb, 1, 1, 1);
MODULE_DEPEND(kue, ether, 1, 1, 1);
Index: dev/usb/if_rue.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/if_rue.c,v
retrieving revision 1.1
diff -u -r1.1 if_rue.c
--- dev/usb/if_rue.c 3 May 2003 10:16:56 -0000 1.1
+++ dev/usb/if_rue.c 13 May 2003 09:34:31 -0000
@@ -55,8 +55,9 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_ethersubr.h>
+
+#include "usbdevs.h"
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: dev/usb/ubsa.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/ubsa.c,v
retrieving revision 1.6
diff -u -r1.6 ubsa.c
--- dev/usb/ubsa.c 19 Feb 2003 05:47:15 -0000 1.6
+++ dev/usb/ubsa.c 13 May 2003 09:34:05 -0000
@@ -87,10 +87,11 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
#include <dev/usb/ucomvar.h>
+
+#include "usbdevs.h"
#ifdef USB_DEBUG
Static int ubsadebug = 0;
Index: dev/usb/ucom.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/ucom.c,v
retrieving revision 1.29
diff -u -r1.29 ucom.c
--- dev/usb/ucom.c 9 Mar 2003 11:33:26 -0000 1.29
+++ dev/usb/ucom.c 13 May 2003 09:34:02 -0000
@@ -95,10 +95,11 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
#include <dev/usb/ucomvar.h>
+
+#include "usbdevs.h"
#ifdef USB_DEBUG
static int ucomdebug = 0;
Index: dev/usb/udbp.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/udbp.c,v
retrieving revision 1.21
diff -u -r1.21 udbp.c
--- dev/usb/udbp.c 15 Mar 2003 13:03:30 -0000 1.21
+++ dev/usb/udbp.c 13 May 2003 09:33:58 -0000
@@ -96,8 +96,7 @@
#include <dev/usb/usbdivar.h>
#include <dev/usb/usbhid.h>
-#include <dev/usb/usbdevs.h>
-
+#include "usbdevs.h"
#include <netgraph/ng_message.h>
#include <netgraph/ng_parse.h>
Index: dev/usb/ufm.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/ufm.c,v
retrieving revision 1.12
diff -u -r1.12 ufm.c
--- dev/usb/ufm.c 3 Mar 2003 12:15:47 -0000 1.12
+++ dev/usb/ufm.c 13 May 2003 09:33:53 -0000
@@ -61,8 +61,9 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/dsbr100io.h>
+
+#include "usbdevs.h"
#ifdef USB_DEBUG
#define DPRINTF(x) if (ufmdebug) logprintf x
Index: dev/usb/uftdi.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/uftdi.c,v
retrieving revision 1.7
diff -u -r1.7 uftdi.c
--- dev/usb/uftdi.c 9 Mar 2003 11:19:18 -0000 1.7
+++ dev/usb/uftdi.c 13 May 2003 09:33:48 -0000
@@ -67,11 +67,12 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>
#include <dev/usb/uftdireg.h>
+
+#include "usbdevs.h"
#ifdef USB_DEBUG
static int uftdidebug = 0;
Index: dev/usb/uhid.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/uhid.c,v
retrieving revision 1.56
diff -u -r1.56 uhid.c
--- dev/usb/uhid.c 9 Apr 2003 08:43:01 -0000 1.56
+++ dev/usb/uhid.c 13 May 2003 09:33:43 -0000
@@ -75,10 +75,11 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/hid.h>
+
+#include "usbdevs.h"
/* Report descriptor for broken Wacom Graphire */
#include <dev/usb/ugraphire_rdesc.h>
Index: dev/usb/ukbd.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/ukbd.c,v
retrieving revision 1.42
diff -u -r1.42 ukbd.c
--- dev/usb/ukbd.c 29 Apr 2003 13:36:01 -0000 1.42
+++ dev/usb/ukbd.c 13 May 2003 09:33:38 -0000
@@ -64,9 +64,10 @@
#include <dev/usb/usbhid.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
#include <dev/usb/hid.h>
+
+#include "usbdevs.h"
#include <sys/kbio.h>
#include <dev/kbd/kbdreg.h>
Index: dev/usb/ulpt.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/ulpt.c,v
retrieving revision 1.55
diff -u -r1.55 ulpt.c
--- dev/usb/ulpt.c 3 Mar 2003 12:15:47 -0000 1.55
+++ dev/usb/ulpt.c 13 May 2003 09:33:32 -0000
@@ -63,8 +63,9 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
+
+#include "usbdevs.h"
#define TIMEOUT hz*16 /* wait up to 16 seconds for a ready */
#define STEP hz/4
Index: dev/usb/umass.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/umass.c,v
retrieving revision 1.81
diff -u -r1.81 umass.c
--- dev/usb/umass.c 11 May 2003 23:55:27 -0000 1.81
+++ dev/usb/umass.c 13 May 2003 09:33:26 -0000
@@ -109,7 +109,8 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
+
+#include "usbdevs.h"
#include <cam/cam.h>
#include <cam/cam_ccb.h>
Index: dev/usb/umodem.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/umodem.c,v
retrieving revision 1.47
diff -u -r1.47 umodem.c
--- dev/usb/umodem.c 9 Mar 2003 11:19:18 -0000 1.47
+++ dev/usb/umodem.c 13 May 2003 09:33:21 -0000
@@ -96,11 +96,11 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>
+
+#include "usbdevs.h"
#ifdef USB_DEBUG
int umodemdebug = 0;
Index: dev/usb/ums.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/ums.c,v
retrieving revision 1.57
diff -u -r1.57 ums.c
--- dev/usb/ums.c 3 Mar 2003 12:15:47 -0000 1.57
+++ dev/usb/ums.c 13 May 2003 09:33:17 -0000
@@ -65,9 +65,10 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
#include <dev/usb/hid.h>
+
+#include "usbdevs.h"
#include <sys/mouse.h>
Index: dev/usb/uplcom.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/uplcom.c,v
retrieving revision 1.11
diff -u -r1.11 uplcom.c
--- dev/usb/uplcom.c 19 Feb 2003 05:47:15 -0000 1.11
+++ dev/usb/uplcom.c 13 May 2003 09:33:11 -0000
@@ -96,10 +96,11 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
#include <dev/usb/ucomvar.h>
+
+#include "usbdevs.h"
#ifdef USB_DEBUG
static int uplcomdebug = 0;
Index: dev/usb/urio.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/urio.c,v
retrieving revision 1.25
diff -u -r1.25 urio.c
--- dev/usb/urio.c 3 Mar 2003 12:15:48 -0000 1.25
+++ dev/usb/urio.c 13 May 2003 09:37:48 -0000
@@ -73,7 +73,8 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
+#include "usbdevs.h"
+
#include <dev/usb/rio500_usb.h>
#ifdef USB_DEBUG
Index: dev/usb/usb_quirks.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/usb_quirks.c,v
retrieving revision 1.33
diff -u -r1.33 usb_quirks.c
--- dev/usb/usb_quirks.c 10 Apr 2003 08:25:09 -0000 1.33
+++ dev/usb/usb_quirks.c 13 May 2003 09:32:59 -0000
@@ -43,8 +43,9 @@
#include <dev/usb/usb.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
+
+#include "usbdevs.h"
#ifdef USB_DEBUG
extern int usbdebug;
Index: dev/usb/usb_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/usb_subr.c,v
retrieving revision 1.54
diff -u -r1.54 usb_subr.c
--- dev/usb/usb_subr.c 14 Jan 2003 23:07:43 -0000 1.54
+++ dev/usb/usb_subr.c 13 May 2003 09:39:05 -0000
@@ -58,9 +58,10 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
+#include "usbdevs.h"
+
#if defined(__FreeBSD__)
#include <machine/clock.h>
#define delay(d) DELAY(d)
@@ -108,7 +109,7 @@
};
#define USB_KNOWNDEV_NOPROD 0x01 /* match on vendor only */
-#include <dev/usb/usbdevs_data.h>
+#include "usbdevs_data.h"
#endif /* USBVERBOSE */
Static const char * const usbd_error_strs[] = {
Index: dev/usb/uscanner.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/uscanner.c,v
retrieving revision 1.37
diff -u -r1.37 uscanner.c
--- dev/usb/uscanner.c 3 Mar 2003 12:15:48 -0000 1.37
+++ dev/usb/uscanner.c 13 May 2003 09:32:48 -0000
@@ -70,7 +70,8 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
+#include "usbdevs.h"
+
#ifdef USB_DEBUG
#define DPRINTF(x) if (uscannerdebug) logprintf x
Index: dev/usb/uvisor.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/uvisor.c,v
retrieving revision 1.12
diff -u -r1.12 uvisor.c
--- dev/usb/uvisor.c 6 Apr 2003 17:34:50 -0000 1.12
+++ dev/usb/uvisor.c 13 May 2003 09:32:43 -0000
@@ -71,9 +71,10 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>
+
+#include "usbdevs.h"
#ifdef USB_DEBUG
#define DPRINTF(x) if (uvisordebug) printf x
Index: dev/usb/uvscom.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/uvscom.c,v
retrieving revision 1.16
diff -u -r1.16 uvscom.c
--- dev/usb/uvscom.c 9 Mar 2003 11:50:27 -0000 1.16
+++ dev/usb/uvscom.c 13 May 2003 09:32:39 -0000
@@ -66,10 +66,11 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
#include <dev/usb/ucomvar.h>
+
+#include "usbdevs.h"
SYSCTL_NODE(_hw_usb, OID_AUTO, uvscom, CTLFLAG_RW, 0, "USB uvscom");
#ifdef USB_DEBUG
Index: netgraph/bluetooth/drivers/ubt/ng_ubt.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v
retrieving revision 1.6
diff -u -r1.6 ng_ubt.c
--- netgraph/bluetooth/drivers/ubt/ng_ubt.c 10 May 2003 21:44:39 -0000 1.6
+++ netgraph/bluetooth/drivers/ubt/ng_ubt.c 13 May 2003 09:43:09 -0000
@@ -46,7 +46,8 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
-#include <dev/usb/usbdevs.h>
+
+#include "usbdevs.h"
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>
Index: netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v
retrieving revision 1.1
diff -u -r1.1 ubtbcmfw.c
--- netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c 10 May 2003 21:44:40 -0000 1.1
+++ netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c 13 May 2003 09:44:38 -0000
@@ -44,7 +44,8 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdevs.h>
+
+#include "usbdevs.h"
/*
* Download firmware to BCM2033.
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzphe7zmb45.fsf>