Part one of undating the bluetooth code to the newest version

Submitted by:   Maksim Yevmenkin <m_evmenkin@yahoo.com>
Approved by: re@

9 files changed, 52 insertions, 29 deletions

diff --git a/sys/modules/netgraph/bluetooth/Makefile b/sys/modules/netgraph/bluetooth/Makefile
index e39315e..8fdd896 100644
--- a/sys/modules/netgraph/bluetooth/Makefile
+++ b/sys/modules/netgraph/bluetooth/Makefile
@@ -1,3 +1,4 @@
+# $Id: Makefile,v 1.2 2003/04/27 00:22:11 max Exp $
 # $FreeBSD$
 
 SUBDIR=	\
@@ -7,7 +8,8 @@ SUBDIR=	\
 	socket	\
 	bt3c	\
 	h4	\
-	ubt
+	ubt	\
+	ubtbcmfw
 
 .include <bsd.subdir.mk>
 
diff --git a/sys/modules/netgraph/bluetooth/bluetooth/Makefile b/sys/modules/netgraph/bluetooth/bluetooth/Makefile
index 005d619..55317b9 100644
--- a/sys/modules/netgraph/bluetooth/bluetooth/Makefile
+++ b/sys/modules/netgraph/bluetooth/bluetooth/Makefile
@@ -1,9 +1,9 @@
-# $Id: Makefile,v 1.1.1.1 2002/09/04 21:47:41 max Exp $
+# $Id: Makefile,v 1.1 2002/11/24 20:39:57 max Exp $
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/common
 
-CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include
+CFLAGS+=	-g -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 729d22c..de1aa20 100644
--- a/sys/modules/netgraph/bluetooth/bt3c/Makefile
+++ b/sys/modules/netgraph/bluetooth/bt3c/Makefile
@@ -1,12 +1,13 @@
-# $Id: Makefile,v 1.6 2002/09/04 21:42:00 max Exp $
+# $Id: Makefile,v 1.2 2002/11/24 20:50:56 max Exp $
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c
 
 CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
-		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c \
-		-DINVARIANTS=1 -DINVARIANT_SUPPORT=1 \
-		-DWITNESS=1 -DWITNESS_SKIPSPIN=1
+		-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
diff --git a/sys/modules/netgraph/bluetooth/h4/Makefile b/sys/modules/netgraph/bluetooth/h4/Makefile
index 9ef247e..51e85cb 100644
--- a/sys/modules/netgraph/bluetooth/h4/Makefile
+++ b/sys/modules/netgraph/bluetooth/h4/Makefile
@@ -1,12 +1,12 @@
-# $Id: Makefile,v 1.7 2002/11/03 02:15:54 max Exp $
+# $Id: Makefile,v 1.1 2002/11/24 20:40:04 max Exp $
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/h4
 
 CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
-		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/h4 \
-		-DINVARIANTS=1 -DINVARIANT_SUPPORT=1
-#		-DWITNESS=1 -DWITNESS_SKIPSPIN=1
+		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/h4
+
+#CFLAGS+=	-DINVARIANTS=1 -DINVARIANT_SUPPORT=1 
 
 KMOD=		ng_h4
 SRCS=		ng_h4.c
diff --git a/sys/modules/netgraph/bluetooth/hci/Makefile b/sys/modules/netgraph/bluetooth/hci/Makefile
index 480fb16..48a6bfa 100644
--- a/sys/modules/netgraph/bluetooth/hci/Makefile
+++ b/sys/modules/netgraph/bluetooth/hci/Makefile
@@ -1,12 +1,12 @@
-# $Id: Makefile,v 1.5 2002/09/04 21:36:51 max Exp $
+# $Id: Makefile,v 1.1 2002/11/24 20:40:05 max Exp $
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/hci
 
 CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
-		-I${.CURDIR}/../../../../netgraph/bluetooth/hci \
-		-DINVARIANTS=1 -DINVARIANT_SUPPORT=1 \
-		-DWITNESS=1 -DWITNESS_SKIPSPIN=1
+		-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  \
diff --git a/sys/modules/netgraph/bluetooth/l2cap/Makefile b/sys/modules/netgraph/bluetooth/l2cap/Makefile
index d6df40b..d2cc849 100644
--- a/sys/modules/netgraph/bluetooth/l2cap/Makefile
+++ b/sys/modules/netgraph/bluetooth/l2cap/Makefile
@@ -1,12 +1,12 @@
-# $Id: Makefile,v 1.4 2002/09/04 21:38:38 max Exp $
+# $Id: Makefile,v 1.1 2002/11/24 20:40:11 max Exp $
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/l2cap
 
 CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
-		-I${.CURDIR}/../../../../netgraph/bluetooth/l2cap \
-		-DINVARIANTS=1 -DINVARIANT_SUPPORT=1 \
-		-DWITNESS=1 -DWITNESS_SKIPSPIN=1
+		-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 \
diff --git a/sys/modules/netgraph/bluetooth/socket/Makefile b/sys/modules/netgraph/bluetooth/socket/Makefile
index 9191841f..4cb414b 100644
--- a/sys/modules/netgraph/bluetooth/socket/Makefile
+++ b/sys/modules/netgraph/bluetooth/socket/Makefile
@@ -1,17 +1,19 @@
-# $Id: Makefile,v 1.7 2002/09/04 21:43:59 max Exp $
+# $Id: Makefile,v 1.2 2003/01/12 23:37:31 max Exp $
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/socket
 
-CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
-		-DINVARIANTS=1 -DINVARIANT_SUPPORT=1 \
-		-DWITNESS=1 -DWITNESS_SKIPSPIN=1
+CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include
+
+#CFLAGS+=	-DINVARIANTS=1 -DINVARIANT_SUPPORT=1
+#CFLAGS+=	-DWITNESS=1 -DWITNESS_SKIPSPIN=1
 
 KMOD=		ng_btsocket
 SRCS=		ng_btsocket.c \
 		ng_btsocket_hci_raw.c \
 		ng_btsocket_l2cap_raw.c \
-		ng_btsocket_l2cap.c
+		ng_btsocket_l2cap.c \
+		ng_btsocket_rfcomm.c
 MAN4=		ng_btsocket.4
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/bluetooth/ubt/Makefile b/sys/modules/netgraph/bluetooth/ubt/Makefile
index 6fdda0a..ad50892 100644
--- a/sys/modules/netgraph/bluetooth/ubt/Makefile
+++ b/sys/modules/netgraph/bluetooth/ubt/Makefile
@@ -1,15 +1,16 @@
-# $Id: Makefile,v 1.5 2002/09/04 21:41:06 max Exp $
+# $Id: Makefile,v 1.2 2003/03/22 23:44:34 max Exp $
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt
 
 CFLAGS+=	-g -I${.CURDIR}/../../../../netgraph/bluetooth/include \
-		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt \
-		-DINVARIANTS=1 -DINVARIANT_SUPPORT=1 \
-		-DWITNESS=1 -DWITNESS_SKIPSPIN=1
+		-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 opt_usb.h
+SRCS=		ng_ubt.c bus_if.h device_if.h vnode_if.h opt_usb.h
 MAN4=		ng_ubt.4
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
new file mode 100644
index 0000000..ede61d7
--- /dev/null
+++ b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
@@ -0,0 +1,17 @@
+# $Id: Makefile,v 1.1 2003/04/27 00:22:12 max Exp $
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
+
+CFLAGS+=	-g -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
+
+.include <bsd.kmod.mk>
+