Update Bluetooth code.

Reviewed by: M. Warner Losh <imp@bsdimp.com>; John Hay <jhay@freebsd.org>
Approved by: M. Warner Losh <imp@bsdimp.com> (mentor)

8 files changed, 8 insertions, 26 deletions

diff --git a/sys/modules/netgraph/bluetooth/bluetooth/Makefile b/sys/modules/netgraph/bluetooth/bluetooth/Makefile
index 55317b9..aae3984 100644
--- a/sys/modules/netgraph/bluetooth/bluetooth/Makefile
+++ b/sys/modules/netgraph/bluetooth/bluetooth/Makefile
@@ -3,7 +3,7 @@
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/common
 
-CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include
 
 KMOD=		ng_bluetooth
 SRCS=		ng_bluetooth.c
diff --git a/sys/modules/netgraph/bluetooth/bt3c/Makefile b/sys/modules/netgraph/bluetooth/bt3c/Makefile
index de1aa20..4d00d32 100644
--- a/sys/modules/netgraph/bluetooth/bt3c/Makefile
+++ b/sys/modules/netgraph/bluetooth/bt3c/Makefile
@@ -3,12 +3,9 @@
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c
 
-CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
 		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c
 
-#CFLAGS+=	-DINVARIANTS=1 -DINVARIANT_SUPPORT=1
-#CFLAGS+=	-DWITNESS=1 -DWITNESS_SKIPSPIN=1
-
 KMOD=		ng_bt3c
 SRCS=		ng_bt3c_pccard.c bus_if.h card_if.h device_if.h
 MAN4=		ng_bt3c.4
diff --git a/sys/modules/netgraph/bluetooth/h4/Makefile b/sys/modules/netgraph/bluetooth/h4/Makefile
index 51e85cb..c5d63b5 100644
--- a/sys/modules/netgraph/bluetooth/h4/Makefile
+++ b/sys/modules/netgraph/bluetooth/h4/Makefile
@@ -3,11 +3,9 @@
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/h4
 
-CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
 		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/h4
 
-#CFLAGS+=	-DINVARIANTS=1 -DINVARIANT_SUPPORT=1 
-
 KMOD=		ng_h4
 SRCS=		ng_h4.c
 MAN4=		ng_h4.4
diff --git a/sys/modules/netgraph/bluetooth/hci/Makefile b/sys/modules/netgraph/bluetooth/hci/Makefile
index 48a6bfa..2423e51 100644
--- a/sys/modules/netgraph/bluetooth/hci/Makefile
+++ b/sys/modules/netgraph/bluetooth/hci/Makefile
@@ -3,11 +3,9 @@
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/hci
 
-CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
 		-I${.CURDIR}/../../../../netgraph/bluetooth/hci
 
-#CFLAGS+=	-DINVARIANTS=1 -DINVARIANT_SUPPORT=1 
-
 KMOD=		ng_hci
 SRCS=		ng_hci_main.c ng_hci_cmds.c ng_hci_evnt.c  \
 		ng_hci_ulpi.c ng_hci_misc.c
diff --git a/sys/modules/netgraph/bluetooth/l2cap/Makefile b/sys/modules/netgraph/bluetooth/l2cap/Makefile
index d2cc849..623fd86 100644
--- a/sys/modules/netgraph/bluetooth/l2cap/Makefile
+++ b/sys/modules/netgraph/bluetooth/l2cap/Makefile
@@ -3,11 +3,9 @@
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/l2cap
 
-CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
 		-I${.CURDIR}/../../../../netgraph/bluetooth/l2cap
 
-#CFLAGS+=	-DINVARIANTS=1 -DINVARIANT_SUPPORT=1 
-
 KMOD=		ng_l2cap
 SRCS=		ng_l2cap_main.c ng_l2cap_cmds.c ng_l2cap_evnt.c \
 		ng_l2cap_ulpi.c ng_l2cap_llpi.c ng_l2cap_misc.c
diff --git a/sys/modules/netgraph/bluetooth/socket/Makefile b/sys/modules/netgraph/bluetooth/socket/Makefile
index 4cb414b..ba82b5c 100644
--- a/sys/modules/netgraph/bluetooth/socket/Makefile
+++ b/sys/modules/netgraph/bluetooth/socket/Makefile
@@ -3,10 +3,7 @@
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/socket
 
-CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include
-
-#CFLAGS+=	-DINVARIANTS=1 -DINVARIANT_SUPPORT=1
-#CFLAGS+=	-DWITNESS=1 -DWITNESS_SKIPSPIN=1
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include
 
 KMOD=		ng_btsocket
 SRCS=		ng_btsocket.c \
diff --git a/sys/modules/netgraph/bluetooth/ubt/Makefile b/sys/modules/netgraph/bluetooth/ubt/Makefile
index ad50892..941bf33 100644
--- a/sys/modules/netgraph/bluetooth/ubt/Makefile
+++ b/sys/modules/netgraph/bluetooth/ubt/Makefile
@@ -3,12 +3,9 @@
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt
 
-CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
 		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt
 
-#CFLAGS+=	-DINVARIANTS=1 -DINVARIANT_SUPPORT=1
-#CFLAGS+=	-DWITNESS=1 -DWITNESS_SKIPSPIN=1
-
 KMOD=		ng_ubt
 SRCS=		ng_ubt.c bus_if.h device_if.h vnode_if.h opt_usb.h
 MAN4=		ng_ubt.4
diff --git a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
index ede61d7..a7f0fcc 100644
--- a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
+++ b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
@@ -3,12 +3,9 @@
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
 
-CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
 		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
 
-#CFLAGS+=	-DINVARIANTS=1 -DINVARIANT_SUPPORT=1
-#CFLAGS+=	-DWITNESS=1 -DWITNESS_SKIPSPIN=1
-
 KMOD=		ubtbcmfw
 SRCS=		ubtbcmfw.c bus_if.h device_if.h vnode_if.h opt_usb.h
 MAN4=		ubtbcmfw.4