Remove some unused leftover code; original request from jasper@

5 files changed, 8 insertions, 55 deletions

diff --git a/sys/netbt/bt_input.c b/sys/netbt/bt_input.c
index 440d69389a9..61976fbebb4 100644
--- a/sys/netbt/bt_input.c
+++ b/sys/netbt/bt_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_input.c,v 1.4 2007/05/31 23:50:19 uwe Exp $	*/
+/*	$OpenBSD: bt_input.c,v 1.5 2007/06/24 20:55:27 uwe Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -16,50 +16,19 @@
  */
 
 #include <sys/param.h>
-#include <sys/mbuf.h>
-#include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/timeout.h>
 
-#include <net/if.h>
-#include <net/if_types.h>
 #include <net/netisr.h>
 
-#include <netbt/bluetooth.h>
-#include <netbt/bt_var.h>
 #include <netbt/hci.h>
 
-extern void hci_intr(void *);	/* XXX */
-
-struct ifqueue btintrq;
-
-void
-bt_init(void)
-{
-	btintrq.ifq_maxlen = IFQ_MAXLEN;
-}
-
 void
 btintr(void)
 {
 	struct hci_unit *unit;
-	struct mbuf *m;
-	int s;
 
 	TAILQ_FOREACH(unit, &hci_unit_list, hci_next) {
 		hci_intr(unit);
 	}
-
-	for (;;) {
-		s = splnet();
-		IF_DEQUEUE(&btintrq, m);
-		splx(s);
-
-		if (m == NULL)
-			break;
-
-#if 0
-		ng_btsocket_hci_raw_data_input(m);
-#endif
-	}
 }
diff --git a/sys/netbt/bt_proto.c b/sys/netbt/bt_proto.c
index 1bc8c573fae..5d379e33137 100644
--- a/sys/netbt/bt_proto.c
+++ b/sys/netbt/bt_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_proto.c,v 1.3 2007/06/01 02:46:11 uwe Exp $	*/
+/*	$OpenBSD: bt_proto.c,v 1.4 2007/06/24 20:55:27 uwe Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -63,7 +63,7 @@ struct protosw btsw[] = {
 
 struct domain btdomain = {
 	AF_BLUETOOTH, "bluetooth",
-	bt_init, NULL/*externalize*/, NULL/*dispose*/,
+	NULL/*init*/, NULL/*externalize*/, NULL/*dispose*/,
 	btsw, &btsw[sizeof(btsw) / sizeof(btsw[0])], NULL,
 	NULL/*rtattach*/, 32, sizeof(struct sockaddr_bt),
 	NULL/*ifattach*/, NULL/*ifdetach*/
diff --git a/sys/netbt/bt_var.h b/sys/netbt/bt_var.h
index d677f12d338..6d9ecb5ea18 100644
--- a/sys/netbt/bt_var.h
+++ b/sys/netbt/bt_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_var.h,v 1.1 2005/01/14 12:04:02 grange Exp $	*/
+/*	$OpenBSD: bt_var.h,v 1.2 2007/06/24 20:55:27 uwe Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -18,8 +18,4 @@
 #ifndef _NETBT_BT_VAR_H_
 #define _NETBT_BT_VAR_H_
 
-extern struct ifqueue btintrq;
-
-void bt_init(void);
-
 #endif	/* !_NETBT_BT_VAR_H_ */
diff --git a/sys/netbt/hci.h b/sys/netbt/hci.h
index 700bceb2e59..da5202bac2b 100644
--- a/sys/netbt/hci.h
+++ b/sys/netbt/hci.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hci.h,v 1.7 2007/06/19 08:12:34 uwe Exp $	*/
+/*	$OpenBSD: hci.h,v 1.8 2007/06/24 20:55:27 uwe Exp $	*/
 /*	$NetBSD: hci.h,v 1.10 2007/04/21 06:15:23 plunky Exp $	*/
 
 /*-
@@ -55,7 +55,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: hci.h,v 1.7 2007/06/19 08:12:34 uwe Exp $
+ * $Id: hci.h,v 1.8 2007/06/24 20:55:27 uwe Exp $
  * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_hci.h,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 
@@ -2221,6 +2221,7 @@ void hci_complete_sco(struct hci_unit *, struct mbuf *);
 void hci_output_cmd(struct hci_unit *, struct mbuf *);
 void hci_output_acl(struct hci_unit *, struct mbuf *);
 void hci_output_sco(struct hci_unit *, struct mbuf *);
+void hci_intr(void *);
 
 /* XXX mimic NetBSD for now, although we don't have these interfaces */
 #define M_GETCTX(m, t)	((t)(m)->m_pkthdr.rcvif)
diff --git a/sys/netbt/hci_unit.c b/sys/netbt/hci_unit.c
index 71c05b9532b..21aca86e196 100644
--- a/sys/netbt/hci_unit.c
+++ b/sys/netbt/hci_unit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hci_unit.c,v 1.6 2007/06/06 21:37:08 uwe Exp $	*/
+/*	$OpenBSD: hci_unit.c,v 1.7 2007/06/24 20:55:27 uwe Exp $	*/
 /*	$NetBSD: hci_unit.c,v 1.4 2007/03/30 20:47:03 plunky Exp $	*/
 
 /*-
@@ -61,9 +61,6 @@ int hci_scorxq_max = 50;
  * bluetooth unit functions
  */
 
-void hci_enable_task(void *, void *);
-void hci_intr(void *);
-
 void
 hci_attach(struct hci_unit *unit)
 {
@@ -93,16 +90,6 @@ hci_detach(struct hci_unit *unit)
 	TAILQ_REMOVE(&hci_unit_list, unit, hci_next);
 }
 
-void
-hci_enable_task(void *arg0, void *arg1)
-{
-	struct hci_unit *unit = arg0;
-
-	unit->hci_flags |= BTF_UP;
-	if (hci_enable(unit) != 0)
-		unit->hci_flags &= ~BTF_UP;
-}
-
 int
 hci_enable(struct hci_unit *unit)
 {