Update Bluetooth code.

Reviewed by: M. Warner Losh <imp@bsdimp.com>; John Hay <jhay@freebsd.org>
Approved by: M. Warner Losh <imp@bsdimp.com> (mentor)

12 files changed, 143 insertions, 11 deletions

diff --git a/share/man/man4/ng_bluetooth.4 b/share/man/man4/ng_bluetooth.4
index 7d19625..5fb3ec0 100644
--- a/share/man/man4/ng_bluetooth.4
+++ b/share/man/man4/ng_bluetooth.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: ng_bluetooth.4,v 1.2 2003/04/26 22:38:25 max Exp $
+.\" $Id: ng_bluetooth.4,v 1.3 2003/05/21 19:37:35 max Exp $
 .\" $FreeBSD$
 .\"
 .Dd November 9, 2002
diff --git a/share/man/man4/ng_bt3c.4 b/share/man/man4/ng_bt3c.4
index f10f83f..99a745d 100644
--- a/share/man/man4/ng_bt3c.4
+++ b/share/man/man4/ng_bt3c.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: ng_bt3c.4,v 1.1 2002/11/24 19:37:54 max Exp $
+.\" $Id: ng_bt3c.4,v 1.3 2003/09/14 23:28:51 max Exp $
 .\" $FreeBSD$
 .\"
 .Dd June 14, 2002
diff --git a/share/man/man4/ng_btsocket.4 b/share/man/man4/ng_btsocket.4
index c3405eca..b882947 100644
--- a/share/man/man4/ng_btsocket.4
+++ b/share/man/man4/ng_btsocket.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: ng_btsocket.4,v 1.6 2003/03/18 00:09:34 max Exp $
+.\" $Id: ng_btsocket.4,v 1.7 2003/05/21 19:37:35 max Exp $
 .\" $FreeBSD$
 .\"
 .Dd July 8, 2002
@@ -186,6 +186,10 @@ Returns list of active baseband connections (i.e. ACL links) for the L2CAP
 node.
 .It Dv SIOC_L2CAP_NODE_GET_CHAN_LIST
 Returns list of active channels for the L2CAP node.
+.It Dv SIOC_L2CAP_NODE_GET_AUTO_DISCON_TIMO
+Returns current value of the auto disconnect timeout for the L2CAP node.
+.It Dv SIOC_L2CAP_NODE_SET_AUTO_DISCON_TIMO
+Sets current value of the auto disconnect timeout for the L2CAP node.
 .It Dv SIOC_L2CAP_L2CA_PING
 Issues L2CAP
 .Dv ECHO_REQUEST .
diff --git a/share/man/man4/ng_h4.4 b/share/man/man4/ng_h4.4
index 024714a..760a19f 100644
--- a/share/man/man4/ng_h4.4
+++ b/share/man/man4/ng_h4.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: ng_h4.4,v 1.1 2002/11/24 19:37:54 max Exp $
+.\" $Id: ng_h4.4,v 1.2 2003/05/21 19:37:35 max Exp $
 .\" $FreeBSD$
 .\"
 .Dd June 14, 2002
diff --git a/share/man/man4/ng_hci.4 b/share/man/man4/ng_hci.4
index b0b791f..37c0b73 100644
--- a/share/man/man4/ng_hci.4
+++ b/share/man/man4/ng_hci.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: ng_hci.4,v 1.2 2003/03/18 00:09:34 max Exp $
+.\" $Id: ng_hci.4,v 1.3 2003/05/21 19:37:35 max Exp $
 .\" $FreeBSD$
 .\"
 .Dd June 25, 2002
diff --git a/share/man/man4/ng_l2cap.4 b/share/man/man4/ng_l2cap.4
index 5e9d9e9..d5c38a2 100644
--- a/share/man/man4/ng_l2cap.4
+++ b/share/man/man4/ng_l2cap.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: ng_l2cap.4,v 1.2 2003/04/28 20:16:29 max Exp $
+.\" $Id: ng_l2cap.4,v 1.4 2003/09/14 23:37:52 max Exp $
 .\" $FreeBSD$
 .\"
 .Dd July 4, 2002
@@ -58,7 +58,7 @@ The ACL link between two units is set up.
 The Baseband provides orderly
 delivery of data packets, although there might be individual packet corruption
 and duplicates.
-No more than 1 ACL link exists between any two devices.
+No more than one ACL link exists between any two devices.
 .It
 The Baseband always provides the impression of full-duplex communication
 channels.
@@ -220,7 +220,7 @@ Upper layer protocol upstream hook.
 Usually the Bluetooth L2CAP socket layer is connected to the hook.
 .It Dv ctl
 Control hook.
-Usually Bluetooth raw L2CAP sockets layer is connected to the hook.
+Usually the Bluetooth raw L2CAP sockets layer is connected to the hook.
 .El
 .Sh INTERFACE TO THE UPPER LAYER PROTOCOLS (L2CA CONTROL MESSAGES)
 Bluetooth specification says that L2CA request must block until response
diff --git a/share/man/man4/ng_ubt.4 b/share/man/man4/ng_ubt.4
index 7c91360..ca6a5a6 100644
--- a/share/man/man4/ng_ubt.4
+++ b/share/man/man4/ng_ubt.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: ng_ubt.4,v 1.2 2003/03/22 23:44:32 max Exp $
+.\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $
 .\" $FreeBSD$
 .\"
 .Dd June 14, 2002
diff --git a/share/man/man4/ubtbcmfw.4 b/share/man/man4/ubtbcmfw.4
index 6412628..1369879 100644
--- a/share/man/man4/ubtbcmfw.4
+++ b/share/man/man4/ubtbcmfw.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: ubtbcmfw.4,v 1.1 2003/04/28 17:09:46 max Exp $
+.\" $Id: ubtbcmfw.4,v 1.3 2003/05/21 19:37:35 max Exp $
 .\" $FreeBSD$
 .\"
 .Dd April 28, 2003
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 0f59542..dab3a96 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -2,7 +2,8 @@
 #	$FreeBSD$
 
 #MISSING: dump.5 plot.5
-MAN=	a.out.5 acct.5 core.5 config.5 devfs.5 device.hints.5 \
+MAN=	a.out.5 acct.5 bluetooth.hosts.5 bluetooth.protocols.5 \
+	core.5 config.5 devfs.5 device.hints.5 \
 	dir.5 disktab.5 drivers.conf.5 \
 	elf.5 ethers.5 fbtab.5 fdescfs.5 forward.5 fs.5 fstab.5 group.5 \
 	hesiod.conf.5 \
diff --git a/share/man/man5/bluetooth.hosts.5 b/share/man/man5/bluetooth.hosts.5
new file mode 100644
index 0000000..eba3e97
--- /dev/null
+++ b/share/man/man5/bluetooth.hosts.5
@@ -0,0 +1,63 @@
+.\" Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $Id: bluetooth.hosts.5,v 1.5 2003/05/20 22:52:39 max Exp $
+.\" $FreeBSD$
+.\"
+.Dd May 8, 2003
+.Dt BLUETOOTH.HOSTS 5
+.Os
+.Sh NAME
+.Nm /etc/bluetooth/hosts
+.Nd Bluetooth host name database
+.Sh DESCRIPTION
+The
+.Nm
+file contains information regarding the known Bluetooth hosts.
+For each Bluetooth host a single line should be present with the
+following information:
+.Bd -unfilled -offset indent
+Bluetooth address
+official host name
+aliases
+.Ed
+.Pp
+Items are separated by any number of blanks and/or tab characters.
+A
+.Dq #
+indicates the beginning of a comment; characters up to the end of the line are
+not interpreted by routines which search the file.
+.Pp
+Bluetooth addresses are specified as six hex bytes separated by columns
+(BD_ADDR).
+Host names may contain any printable character other than a field
+delimiter, newline, or comment character.
+.Sh FILES
+.Bl -tag -width /etc/bluetooth/hosts -compact
+.It Pa /etc/bluetooth/hosts
+.El
+.Sh SEE ALSO
+.Xr bluetooth 3
+.Sh AUTHORS
+.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
diff --git a/share/man/man5/bluetooth.protocols.5 b/share/man/man5/bluetooth.protocols.5
new file mode 100644
index 0000000..25adebd
--- /dev/null
+++ b/share/man/man5/bluetooth.protocols.5
@@ -0,0 +1,62 @@
+.\" Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $Id: bluetooth.protocols.5,v 1.1 2003/05/20 22:52:39 max Exp $
+.\" $FreeBSD$
+.\"
+.Dd May 8, 2003
+.Dt BLUETOOTH.PROTOCOLS 5
+.Os
+.Sh NAME
+.Nm /etc/bluetooth/protocols
+.Nd Bluetooth Protocol Service Multiplexor database
+.Sh DESCRIPTION
+The
+.Nm
+file contains information regarding the known Bluetooth Protocol Service
+Multiplexor values.
+For each Bluetooth Protocol Service Multiplexor a single line should be
+present with the following information:
+.Bd -unfilled -offset indent
+official Protocol Service Multiplexor name
+official Protocol Service Multiplexor value
+aliases
+.Ed
+.Pp
+Items are separated by any number of blanks and/or tab characters.
+A
+.Dq #
+indicates the beginning of a comment; characters up to the end of the line are
+not interpreted by routines which search the file.
+.Pp
+Bluetooth Protocol Service Multiplexor names may contain any printable
+character other than a field delimiter, newline, or comment character.
+.Sh FILES
+.Bl -tag -width /etc/bluetooth/hosts -compact
+.It Pa /etc/bluetooth/protocols
+.El
+.Sh SEE ALSO
+.Xr bluetooth 3
+.Sh AUTHORS
+.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 965b187..949b2e8 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -14,6 +14,7 @@ LIBALIAS?=	${DESTDIR}${LIBDIR}/libalias.a
 LIBASN1?=	${DESTDIR}${LIBDIR}/libasn1.a	# XXX in secure dist, not base
 LIBATM?=	${DESTDIR}${LIBDIR}/libatm.a
 LIBBSDXML?=	${DESTDIR}${LIBDIR}/libbsdxml.a
+LIBBLUETOOTH?=	${DESTDIR}${LIBDIR}/libbluetooth.a
 LIBBZ2?=	${DESTDIR}${LIBDIR}/libbz2.a
 LIBC?=		${DESTDIR}${LIBDIR}/libc.a
 LIBC_PIC?=	${DESTDIR}${LIBDIR}/libc_pic.a
@@ -100,6 +101,7 @@ LIBREADLINE?=	${DESTDIR}${LIBDIR}/libreadline.a
 LIBRESOLV?=	${DESTDIR}${LIBDIR}/libresolv.a	# XXX doesn't exist
 LIBROKEN?=	${DESTDIR}${LIBDIR}/libroken.a	# XXX in secure dist, not base
 LIBRPCSVC?=	${DESTDIR}${LIBDIR}/librpcsvc.a
+LIBSDP?=	${DESTDIR}${LIBDIR}/libsdp.a
 LIBSBUF?=	${DESTDIR}${LIBDIR}/libsbuf.a
 LIBSMB?=	${DESTDIR}${LIBDIR}/libsmb.a
 LIBSSH?=	${DESTDIR}${LIBDIR}/libssh.a	# XXX in secure dist, not base