Sat Jun 3 17:03:02 2017 UTC ()
Pull up following revision(s) (requested by pgoyette in ticket #1421):
	sys/dev/usb/files.usb: revision 1.144
Fix the USBVERBOSE stuff so it does not get included in the build if
there are no USB devices or controllers.
Without this change, a kernel with no USB devices but with USBVERBOSE
defined in the configuration file will include the usb_verbose.c file,
but will fail to link due to undefined symbols.


(snj)
diff -r1.132.2.2 -r1.132.2.3 src/sys/dev/usb/files.usb
cvs diff -r1.132.2.2 -r1.132.2.3 src/sys/dev/usb/files.usb (expand / switch to unified diff)

--- src/sys/dev/usb/files.usb 2017/04/05 19:54:19 1.132.2.2
+++ src/sys/dev/usb/files.usb 2017/06/03 17:03:02 1.132.2.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files.usb,v 1.132.2.2 2017/04/05 19:54:19 snj Exp $ 1# $NetBSD: files.usb,v 1.132.2.3 2017/06/03 17:03:02 snj Exp $
2# 2#
3# Config file and device description for machine-independent USB code. 3# Config file and device description for machine-independent USB code.
4# Included by ports that need it. Ports that use it must provide 4# Included by ports that need it. Ports that use it must provide
5# their own "major" declarations for the appropriate devices. 5# their own "major" declarations for the appropriate devices.
6 6
7defflag USBVERBOSE 7defflag USBVERBOSE
8defflag opt_usb.h USB_FRAG_DMA_WORKAROUND 8defflag opt_usb.h USB_FRAG_DMA_WORKAROUND
9 9
10# HC controllers 10# HC controllers
11defflag opt_usb.h EHCI_DEBUG: USB_DEBUG 11defflag opt_usb.h EHCI_DEBUG: USB_DEBUG
12defflag opt_usb.h OHCI_DEBUG: USB_DEBUG 12defflag opt_usb.h OHCI_DEBUG: USB_DEBUG
13defflag opt_usb.h UHCI_DEBUG: USB_DEBUG 13defflag opt_usb.h UHCI_DEBUG: USB_DEBUG
14defflag opt_usb.h DWC2_DEBUG: USB_DEBUG 14defflag opt_usb.h DWC2_DEBUG: USB_DEBUG
@@ -93,28 +93,27 @@ define usbifif { [port = -1], [configura @@ -93,28 +93,27 @@ define usbifif { [port = -1], [configura
93 [vendor = -1], [product = -1], [release = -1] } 93 [vendor = -1], [product = -1], [release = -1] }
94 94
95device usb: usbroothubif 95device usb: usbroothubif
96attach usb at usbus 96attach usb at usbus
97file dev/usb/usb.c usb needs-flag 97file dev/usb/usb.c usb needs-flag
98file dev/usb/usbdi.c usb 98file dev/usb/usbdi.c usb
99file dev/usb/usbdi_util.c usb 99file dev/usb/usbdi_util.c usb
100file dev/usb/usb_subr.c usb 100file dev/usb/usb_subr.c usb
101file dev/usb/usb_quirks.c usb 101file dev/usb/usb_quirks.c usb
102 102
103define usb_dma: usb 103define usb_dma: usb
104file dev/usb/usb_mem.c usb_dma needs-flag 104file dev/usb/usb_mem.c usb_dma needs-flag
105 105
106define usbverbose: usb 106file dev/usb/usb_verbose.c usbverbose & usb
107file dev/usb/usb_verbose.c usbverbose 
108 107
109# Hub driver 108# Hub driver
110device uhub: usbdevif, usbifif 109device uhub: usbdevif, usbifif
111attach uhub at usbroothubif with uroothub 110attach uhub at usbroothubif with uroothub
112attach uhub at usbdevif 111attach uhub at usbdevif
113file dev/usb/uhub.c usb 112file dev/usb/uhub.c usb
114 113
115# Modem and com serial port "bus" 114# Modem and com serial port "bus"
116define ucombus {[ portno = -1 ]} 115define ucombus {[ portno = -1 ]}
117 116
118# EZ-USB firmware loader 117# EZ-USB firmware loader
119define ezload 118define ezload
120file dev/usb/ezload.c ezload 119file dev/usb/ezload.c ezload