From dc5734d94b071df224b65d45b95d9ae7c5d563ab Mon Sep 17 00:00:00 2001 From: julian Date: Sat, 10 May 2003 21:44:42 +0000 Subject: Part one of undating the bluetooth code to the newest version Submitted by: Maksim Yevmenkin Approved by: re@ --- sys/netgraph/bluetooth/common/ng_bluetooth.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'sys/netgraph/bluetooth/common/ng_bluetooth.c') diff --git a/sys/netgraph/bluetooth/common/ng_bluetooth.c b/sys/netgraph/bluetooth/common/ng_bluetooth.c index d6604b5..bf4b066 100644 --- a/sys/netgraph/bluetooth/common/ng_bluetooth.c +++ b/sys/netgraph/bluetooth/common/ng_bluetooth.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ng_bluetooth.c,v 1.1.1.1 2002/09/04 21:47:41 max Exp $ + * $Id: ng_bluetooth.c,v 1.3 2003/04/26 22:37:31 max Exp $ * $FreeBSD$ */ @@ -43,7 +43,6 @@ static u_int32_t bluetooth_hci_command_timeout_value = 5; /* sec */ static u_int32_t bluetooth_hci_connect_timeout_value = 60; /* sec */ -static u_int32_t bluetooth_hci_watchdog_timeout_value = 60; /* sec */ static u_int32_t bluetooth_hci_max_neighbor_age_value = 600; /* sec */ static u_int32_t bluetooth_l2cap_rtx_timeout_value = 60; /* sec */ static u_int32_t bluetooth_l2cap_ertx_timeout_value = 300; /* sec */ @@ -111,10 +110,6 @@ SYSCTL_PROC(_net_bluetooth_hci, OID_AUTO, connection_timeout, bluetooth_set_hci_connect_timeout_value, "I", "HCI connect timeout (sec)"); -SYSCTL_INT(_net_bluetooth_hci, OID_AUTO, watchdog_timeout, CTLFLAG_RW, - &bluetooth_hci_watchdog_timeout_value, 60, - "HCI connection watchdog timeout (sec)"); - SYSCTL_INT(_net_bluetooth_hci, OID_AUTO, max_neighbor_age, CTLFLAG_RW, &bluetooth_hci_max_neighbor_age_value, 600, "Maximal HCI neighbor cache entry age (sec)"); @@ -192,12 +187,6 @@ bluetooth_hci_connect_timeout(void) } /* bluetooth_hci_connect_timeout */ u_int32_t -bluetooth_hci_watchdog_timeout(void) -{ - return (bluetooth_hci_watchdog_timeout_value * hz); -} /* bluetooth_hci_watchdog_timeout */ - -u_int32_t bluetooth_hci_max_neighbor_age(void) { return (bluetooth_hci_max_neighbor_age_value); @@ -215,6 +204,13 @@ bluetooth_l2cap_ertx_timeout(void) return (bluetooth_l2cap_ertx_timeout_value * hz); } /* bluetooth_l2cap_ertx_timeout */ +/* + * RFCOMM + */ + +SYSCTL_NODE(_net_bluetooth, OID_AUTO, rfcomm, CTLFLAG_RW, + 0, "Bluetooth RFCOMM family"); + /* * Handle loading and unloading for this code. */ -- cgit v1.1