diff options
| author | Uwe Stuehler <uwe@cvs.openbsd.org> | 2007-05-30 08:10:04 +0000 |
|---|---|---|
| committer | Uwe Stuehler <uwe@cvs.openbsd.org> | 2007-05-30 08:10:04 +0000 |
| commit | 79c4abd2d3fa42608583a3969a456626ef26fa86 (patch) | |
| tree | ef92066e1711835480517cd973e4bdcc19d3e207 /sys | |
| parent | 598c2422d97e24eead099347fe8d7d5295ae8eba (diff) | |
Unbreak the tree for gwk
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/files | 6 | ||||
| -rw-r--r-- | sys/netbt/bt_input.c | 8 | ||||
| -rw-r--r-- | sys/netbt/bt_proto.c | 13 |
3 files changed, 12 insertions, 15 deletions
diff --git a/sys/conf/files b/sys/conf/files index 92b6d33e08a..49115795c4a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.402 2007/05/30 04:35:10 uwe Exp $ +# $OpenBSD: files,v 1.403 2007/05/30 08:10:02 uwe Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -824,7 +824,9 @@ file netatalk/at_proto.c netatalk file netatalk/ddp_input.c netatalk file netatalk/ddp_output.c netatalk file netatalk/ddp_usrreq.c netatalk -file netbt/hci_event.c bluetooth needs-flag +file netbt/bt_input.c bluetooth needs-flag +file netbt/bt_proto.c bluetooth +file netbt/hci_event.c bluetooth file netbt/hci_link.c bluetooth file netbt/hci_misc.c bluetooth file netbt/hci_socket.c bluetooth diff --git a/sys/netbt/bt_input.c b/sys/netbt/bt_input.c index 3584f194603..d15841e26c7 100644 --- a/sys/netbt/bt_input.c +++ b/sys/netbt/bt_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_input.c,v 1.2 2006/03/04 22:40:16 brad Exp $ */ +/* $OpenBSD: bt_input.c,v 1.3 2007/05/30 08:10:02 uwe Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org> * @@ -25,11 +25,7 @@ #include <net/netisr.h> #include <netbt/bluetooth.h> -#include <netbt/hci.h> -#include <netbt/l2cap.h> -#include <netbt/bt.h> #include <netbt/bt_var.h> -#include <netbt/hci_var.h> struct ifqueue btintrq; @@ -53,6 +49,8 @@ btintr(void) 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 43d74b790f2..e7ac31effdc 100644 --- a/sys/netbt/bt_proto.c +++ b/sys/netbt/bt_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_proto.c,v 1.1 2005/01/14 12:04:02 grange Exp $ */ +/* $OpenBSD: bt_proto.c,v 1.2 2007/05/30 08:10:03 uwe Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org> * @@ -19,22 +19,19 @@ #include <sys/domain.h> #include <sys/protosw.h> #include <sys/socket.h> +#include <sys/timeout.h> #include <netbt/bluetooth.h> #include <netbt/hci.h> -#include <netbt/l2cap.h> -#include <netbt/bt.h> #include <netbt/bt_var.h> -#include <netbt/hci_var.h> -#include <netbt/l2cap_var.h> struct domain btdomain; struct protosw btsw[] = { - { SOCK_RAW, &btdomain, BLUETOOTH_PROTO_HCI, + { SOCK_RAW, &btdomain, BTPROTO_HCI, PR_ATOMIC | PR_ADDR, NULL/*input*/, NULL/*output*/, NULL/*ctlinput*/, - hci_raw_ctloutput, hci_raw_usrreq, hci_raw_init, + NULL/*hci_ctloutput*/, NULL/*hci_usrreq*/, NULL/*init*/, NULL/*fasttimo*/, NULL/*slowtimo*/, NULL/*drain*/, NULL/*sysctl*/ }, @@ -67,6 +64,6 @@ struct domain btdomain = { AF_BLUETOOTH, "bluetooth", bt_init, NULL/*externalize*/, NULL/*dispose*/, btsw, &btsw[sizeof(btsw) / sizeof(btsw[0])], NULL, - NULL/*rtattach*/, 32, sizeof(struct sockaddr_hci), + NULL/*rtattach*/, 32, sizeof(struct sockaddr_bt), NULL/*ifattach*/, NULL/*ifdetach*/ }; |