Re: Bluetooth stack for FreeBSD

Maksim Yevmenkin <[email protected]>
Newsgroups gmane.os.freebsd.devel.mobile
Message-ID <[email protected]>
Hackers,

please find attached patches for the latest snapshot (2002-09-09).
i would like to take the moment and thank the following people
for help.

Simon Dick <[email protected]>
FUJIMOTO Kou <[email protected]>

thanks,
max
btsocket.diff (text/plain, 1.3 KB)
Index: ng_btsocket.c
===================================================================
RCS file: /usr/local/cvs/btsocket/ng_btsocket.c,v
retrieving revision 1.19
diff -u -7 -r1.19 ng_btsocket.c
--- ng_btsocket.c	9 Sep 2002 00:06:31 -0000	1.19
+++ ng_btsocket.c	13 Sep 2002 17:29:02 -0000
@@ -37,14 +37,16 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <bitstring.h>
+#include <netgraph/ng_message.h>
+#include <netgraph/netgraph.h>
 #include "ng_bluetooth.h"
 #include "ng_hci.h"
 #include "ng_l2cap.h"
 #include "ng_btsocket.h"
 #include "ng_btsocket_hci_raw.h"
 #include "ng_btsocket_l2cap.h"
 
@@ -217,16 +219,18 @@
 	"ng_btsocket",
 	ng_btsocket_modevent,
 	NULL
 };
 
 DECLARE_MODULE(ng_btsocket, ng_btsocket_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
 MODULE_VERSION(ng_btsocket, NG_BLUETOOTH_VERSION);
-MODULE_DEPEND(ng_l2cap, ng_bluetooth, NG_BLUETOOTH_VERSION,
+MODULE_DEPEND(ng_btsocket, ng_bluetooth, NG_BLUETOOTH_VERSION,
 	NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION);
+MODULE_DEPEND(ng_btsocket, netgraph, NG_ABI_VERSION,
+	NG_ABI_VERSION, NG_ABI_VERSION);
 
 /*
  * Handle loading and unloading for this node type.
  * This is to handle auxiliary linkages (e.g protocol domain addition).
  */
 
 static int
hcdump.diff (text/plain, 476 B)
Index: Makefile
===================================================================
RCS file: /usr/local/cvs/hcdump/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	6 Sep 2002 18:40:03 -0000	1.4
+++ Makefile	13 Sep 2002 18:34:45 -0000
@@ -7,6 +7,6 @@
 MAN1=		hcdump.1
 WARNS?=		2
 SRCS=		hcdump.c hci.c l2cap.c utils.c
-CFLAGS+=	-g -I../hci/ -I../../current/l2cap/ -I../btsocket
+CFLAGS+=	-g -I../hci/ -I../l2cap/ -I../btsocket
 
 .include <bsd.prog.mk>
ubt.diff (text/plain, 1.6 KB)
Index: ubt.c
===================================================================
RCS file: /usr/local/cvs/ubt/ubt.c,v
retrieving revision 1.6
diff -u -7 -r1.6 ubt.c
--- ubt.c	4 Sep 2002 21:41:06 -0000	1.6
+++ ubt.c	13 Sep 2002 16:29:35 -0000
@@ -209,15 +209,17 @@
 /*
  * Probe for a USB Bluetooth device
  */
 
 USB_MATCH(ubt)
 {
 	Static struct usb_devno const	ubt_devices[] = {
-		{ USB_VENDOR_3COM, USB_PRODUCT_3COM_3CREB96 },
+		{ USB_VENDOR_3COM,    USB_PRODUCT_3COM_3CREB96 },
+		{ USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_BT_DONGLE },
+		{ USB_VENDOR_TDK,     USB_PRODUCT_TDK_BT_DONGLE },
 		{ 0, 0 }
 	};
 
 	USB_MATCH_START(ubt, uaa);
 
 	if (uaa->iface == NULL || 
 	    usb_lookup(ubt_devices, uaa->vendor, uaa->product) == NULL)
Index: ubt.h
===================================================================
RCS file: /usr/local/cvs/ubt/ubt.h,v
retrieving revision 1.4
diff -u -7 -r1.4 ubt.h
--- ubt.h	4 Sep 2002 21:41:06 -0000	1.4
+++ ubt.h	13 Sep 2002 16:28:33 -0000
@@ -30,14 +30,16 @@
  */
 
 #ifndef _UBT_H_
 #define _UBT_H_
 
 /* XXX FIXME Does not belong here. Move to usbdevs.h later */
 #define USB_PRODUCT_3COM_3CREB96	0x00a0 /* 3Com Bluetooth USB dongle */
+#define USB_PRODUCT_MITSUMI_BT_DONGLE	0x641f /* Mitsumi Bluetooth USB dongle*/
+#define USB_PRODUCT_TDK_BT_DONGLE	0x0309 /* TDK Bluetooth USB dongle */
 
 /* XXX FIXME Does not belong here. Move to usb.h later */
 #define UICLASS_WIRELESS_CONTROLLER	0xe0	/* Wireless Controller */
 #define UISUBCLASS_RF_CONTROLLER	0x01	/* RF Controller */
 #define UIPROTO_BLUETOOTH		0x01	/* Bluetooth programming */
 
 /**************************************************************************
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.