Re: USB4BSD release candidate number 3 - request for review

Thomas Sparrevohn <Thomas.Sparrevohn_at_btinternet.com> writes:

> On Wednesday 05 November 2008 08:15:52 Hans Petter Selasky wrote:
>> Hi,
>> 
>> > And one last thing:
>> > # usbdevs -v
>> > usbdevs: no USB controllers found
>> >
>> 
>> That command is no longer supported. Use "usbconfig" instead. I'm not sure if 
>> it is currently installed by default.
>> 
>> --HPS
>> 
>
> usbconfig does not install per default - it does not even seem to compile - 

I think this patch might be a workaround then.


Index: share/man/man4/Makefile
===================================================================
--- share/man/man4/Makefile	(revision 184644)
+++ share/man/man4/Makefile	(working copy)
_at__at_ -416,6 +416,20 _at__at_
 	ural.4 \
 	urio.4 \
 	usb.4 \
+	usb2_bluetooth.4 \
+	usb2_controller.4 \
+	usb2_core.4 \
+	usb2_ethernet.4 \
+	usb2_image.4 \
+	usb2_input.4 \
+	usb2_misc.4 \
+	usb2_ndis.4 \
+	usb2_quirk.4 \
+	usb2_serial.4 \
+	usb2_sound.4 \
+	usb2_storage.4 \
+	usb2_template.4 \
+	usb2_wlan.4 \
 	uscanner.4 \
 	uslcom.4 \
 	utopia.4 \
Index: usr.sbin/Makefile
===================================================================
--- usr.sbin/Makefile	(revision 184644)
+++ usr.sbin/Makefile	(working copy)
_at__at_ -181,6 +181,7 _at__at_
 	trpt \
 	tzsetup \
 	ugidfw \
+	${_usbconfig} \
 	${_usbdevs} \
 	${_vidcontrol} \
 	vipw \
_at__at_ -401,6 +402,7 _at__at_
 .endif
 
 .if ${MK_USB} != "no"
+_usbconfig=	usbconfig
 _usbdevs=	usbdevs
 .endif
 
Index: lib/Makefile
===================================================================
--- lib/Makefile	(revision 184644)
+++ lib/Makefile	(working copy)
_at__at_ -38,7 +38,8 _at__at_
 	${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
 	${_libsmdb} \
 	${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \
-	libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind}
+	libugidfw ${_libusb20} ${_libusbhid} ${_libvgl} libwrap liby libz \
+	${_bind}
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
 _csu=csu/${MACHINE_ARCH}-elf
_at__at_ -135,6 +136,7 _at__at_
 .endif
 
 .if ${MK_USB} != "no"
+_libusb20=	libusb20
 _libusbhid=	libusbhid
 .endif
 
Index: lib/libusb20/Makefile
===================================================================
--- lib/libusb20/Makefile	(revision 184644)
+++ lib/libusb20/Makefile	(working copy)
_at__at_ -18,7 +18,7 _at__at_
 INCS+=		libusb20_compat10.h
 MAN=		libusb20.3
 MKLINT=		no
+CFLAGS+=	-I${.CURDIR}/../../sys
 NOGCCERROR=
 
 .include <bsd.lib.mk>
-