Make sure Bluetooth stuff can be statically compiled into kernel

Submitted by:	ps
Reviewed by:	imp (mentor), ru

4 files changed, 50 insertions, 0 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 9848b77..8996ec8 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -440,6 +440,16 @@ options 	NETGRAPH_UI
 options 	NETGRAPH_VJC
 options 	NETGRAPH_ATM_ATMPIF
 
+# NgBluetooth - Netgraph Bluetooth
+options 	NETGRAPH_BLUETOOTH		# Common parts
+options 	NETGRAPH_BLUETOOTH_BT3C		# 3COM Bluetooth PCCARD
+options 	NETGRAPH_BLUETOOTH_H4		# H4 line discipline
+options 	NETGRAPH_BLUETOOTH_UBT		# Bluetooth USB dongle
+options 	NETGRAPH_BLUETOOTH_UBTBCMFW	# Firmware driver for BCM2033
+options 	NETGRAPH_BLUETOOTH_HCI		# Bluetooth HCI layer
+options 	NETGRAPH_BLUETOOTH_L2CAP	# Bluetooth L2CAP layer
+options 	NETGRAPH_BLUETOOTH_SOCKET	# Bluetooth sockets layer
+
 # NgATM - Netgraph ATM
 options 	NGATM_ATM
 options 	NGATM_ATMBASE
diff --git a/sys/conf/files b/sys/conf/files
index 27ca4cc..11bd1b3 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1353,6 +1353,27 @@ contrib/ngatm/netnatm/sig/sig_reset.c		optional ngatm_uni
 contrib/ngatm/netnatm/sig/sig_uni.c		optional ngatm_uni
 contrib/ngatm/netnatm/sig/sig_unimsgcpy.c	optional ngatm_uni
 contrib/ngatm/netnatm/sig/sig_verify.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
+netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c	optional netgraph_bluetooth_ubtbcmfw
+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
+netgraph/bluetooth/hci/ng_hci_misc.c		optional netgraph_bluetooth_hci
+netgraph/bluetooth/hci/ng_hci_ulpi.c		optional netgraph_bluetooth_hci
+netgraph/bluetooth/l2cap/ng_l2cap_cmds.c	optional netgraph_bluetooth_l2cap
+netgraph/bluetooth/l2cap/ng_l2cap_evnt.c	optional netgraph_bluetooth_l2cap
+netgraph/bluetooth/l2cap/ng_l2cap_llpi.c	optional netgraph_bluetooth_l2cap
+netgraph/bluetooth/l2cap/ng_l2cap_main.c	optional netgraph_bluetooth_l2cap
+netgraph/bluetooth/l2cap/ng_l2cap_misc.c	optional netgraph_bluetooth_l2cap
+netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c	optional netgraph_bluetooth_l2cap
+netgraph/bluetooth/socket/ng_btsocket.c		optional netgraph_bluetooth_socket
+netgraph/bluetooth/socket/ng_btsocket_hci_raw.c	optional netgraph_bluetooth_socket
+netgraph/bluetooth/socket/ng_btsocket_l2cap.c	optional netgraph_bluetooth_socket
+netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c	optional netgraph_bluetooth_socket
+netgraph/bluetooth/socket/ng_btsocket_rfcomm.c	optional netgraph_bluetooth_socket
 netgraph/ng_UI.c	optional netgraph_UI
 netgraph/ng_async.c	optional netgraph_async
 netgraph/ng_atmllc.c	optional netgraph_atmllc
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 83afd1e..fddeca1 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -63,6 +63,15 @@ INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
 # ... and the same for the NgATM stuff
 INCLUDES+= -I$S/contrib/ngatm
 
+# ... and the same for the NgBluetooth stuff
+INCLUDES+= -I$S/netgraph/bluetooth/include
+INCLUDES+= -I$S/netgraph/bluetooth/drivers/bt3c
+INCLUDES+= -I$S/netgraph/bluetooth/drivers/h4
+INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubt
+INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubtbcmfw
+INCLUDES+= -I$S/netgraph/bluetooth/hci
+INCLUDES+= -I$S/netgraph/bluetooth/l2cap
+
 COPTS=	${INCLUDES} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 .if ${CC} != "icc"
diff --git a/sys/conf/options b/sys/conf/options
index 74f4e41..6dcccc2 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -381,6 +381,16 @@ NETGRAPH_UI		opt_netgraph.h
 NETGRAPH_VJC		opt_netgraph.h
 NETGRAPH_ATM_ATMPIF	opt_netgraph.h
 
+# NgBluetooth options
+NETGRAPH_BLUETOOTH		opt_netgraph.h
+NETGRAPH_BLUETOOTH_BT3C		opt_netgraph.h
+NETGRAPH_BLUETOOTH_H4		opt_netgraph.h
+NETGRAPH_BLUETOOTH_UBT		opt_netgraph.h
+NETGRAPH_BLUETOOTH_UBTBCMFW	opt_netgraph.h
+NETGRAPH_BLUETOOTH_HCI		opt_netgraph.h
+NETGRAPH_BLUETOOTH_L2CAP	opt_netgraph.h
+NETGRAPH_BLUETOOTH_SOCKET	opt_netgraph.h
+
 # NgATM options
 NGATM_ATM		opt_netgraph.h
 NGATM_ATMBASE		opt_netgraph.h