d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hook ubt and ubtbcmfw back up to the build.

Browse Source
This commit is contained in:
Andrew Thompson 2009-05-27 16:43:40 +00:00
parent cfeb7489c2
commit 06079f1405
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=192909
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/conf/files
View File

@ -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_uni \
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

11
sys/modules/netgraph/bluetooth/ubt/Makefile
View File

@ -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>

11
sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
View File

@ -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>

1
sys/modules/usb/Makefile
View File

@ -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

3
sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
View File

@ -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;