svn commit: r192909 - in head/sys: conf modules/netgraph/bluetooth/ubt modules/netgraph/bluetooth/ubtbcmfw modules/usb netgraph/bluetooth/drivers/ubt

[Andrew Thompson]

Author: thompsa
Date: Wed May 27 16:43:40 2009
New Revision: 192909
URL: http://svn.freebsd.org/changeset/base/192909

Log:
  Hook ubt and ubtbcmfw back up to the build.

Modified:
  head/sys/conf/files
  head/sys/modules/netgraph/bluetooth/ubt/Makefile
  head/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
  head/sys/modules/usb/Makefile
  head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Wed May 27 16:36:54 2009	(r192908)
+++ head/sys/conf/files	Wed May 27 16:43:40 2009	(r192909)
@@ -1588,11 +1588,6 @@ dev/usb/serial/uvscom.c		optional uvscom
 dev/usb/serial/usb_serial.c 	optional ucom | \
 	(u3g | uark | ubsa | ubser | uchcom | ucycom | ufoma | uftdi | ugensa | uipaq | ulpt | umct | umodem | umoscom | uplcom | uslcom | uvisor | uvscom)
 #
-# USB bluetooth drivers
-#
-dev/usb/bluetooth/ng_ubt.c		optional netgraph_bluetooth_ubt usb
-dev/usb/bluetooth/ubtbcmfw.c		optional netgraph_bluetooth_ubtbcmfw usb
-#
 # USB misc drivers
 #
 dev/usb/misc/ufm.c		optional ufm
@@ -2205,6 +2200,8 @@ netgraph/atm/uni/ng_uni.c	optional ngatm
 netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth
 netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c optional netgraph_bluetooth_bt3c
 netgraph/bluetooth/drivers/h4/ng_h4.c optional netgraph_bluetooth_h4
+netgraph/bluetooth/drivers/ubt/ng_ubt.c optional netgraph_bluetooth_ubt usb
+netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c optional netgraph_bluetooth_ubtbcmfw usb
 netgraph/bluetooth/hci/ng_hci_cmds.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_evnt.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_main.c optional netgraph_bluetooth_hci

Modified: head/sys/modules/netgraph/bluetooth/ubt/Makefile
==============================================================================
--- head/sys/modules/netgraph/bluetooth/ubt/Makefile	Wed May 27 16:36:54 2009	(r192908)
+++ head/sys/modules/netgraph/bluetooth/ubt/Makefile	Wed May 27 16:43:40 2009	(r192909)
@@ -1,12 +1,13 @@
 # $Id: Makefile,v 1.2 2003/03/22 23:44:34 max Exp $
 # $FreeBSD$
 
-S=	${.CURDIR}/../../../..
+.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt
 
-.PATH: $S/dev/usb/bluetooth
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
+		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt
 
-KMOD=	ng_ubt
-SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \
-	ng_ubt.c
+KMOD=		ng_ubt
+SRCS=		ng_ubt.c opt_bus.h opt_usb.h device_if.h bus_if.h \
+		usb_if.h usbdevs.h
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
==============================================================================
--- head/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile	Wed May 27 16:36:54 2009	(r192908)
+++ head/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile	Wed May 27 16:43:40 2009	(r192909)
@@ -1,12 +1,13 @@
 # $Id: Makefile,v 1.1 2003/04/27 00:22:12 max Exp $
 # $FreeBSD$
 
-S=	${.CURDIR}/../../../..
+.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
 
-.PATH: $S/dev/usb/bluetooth
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
+		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
 
-KMOD=	ubtbcmfw
-SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h vnode_if.h usbdevs.h \
-	ubtbcmfw.c
+KMOD=		ubtbcmfw
+SRCS=		ubtbcmfw.c opt_bus.h opt_usb.h device_if.h bus_if.h \
+		usb_if.h vnode_if.h usbdevs.h
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/usb/Makefile
==============================================================================
--- head/sys/modules/usb/Makefile	Wed May 27 16:36:54 2009	(r192908)
+++ head/sys/modules/usb/Makefile	Wed May 27 16:43:40 2009	(r192909)
@@ -26,7 +26,6 @@
 #
 
 SUBDIR = usb
-#SUBDIR += ubt bluetooth_ng ubtfw
 SUBDIR += ehci musb ohci uhci uss820dci ${_at91dci} ${_atmegadci}
 SUBDIR += rum uath upgt ural zyd
 SUBDIR += uhid ukbd ums udbp ufm

Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed May 27 16:36:54 2009	(r192908)
+++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed May 27 16:43:40 2009	(r192909)
@@ -117,8 +117,7 @@
 #include <netgraph/bluetooth/include/ng_bluetooth.h>
 #include <netgraph/bluetooth/include/ng_hci.h>
 #include <netgraph/bluetooth/include/ng_ubt.h>
-
-#include <dev/usb/bluetooth/ng_ubt_var.h>
+#include <netgraph/bluetooth/drivers/ubt/ng_ubt_var.h>
 
 static int		ubt_modevent(module_t, int, void *);
 static device_probe_t	ubt_probe;