[Midnightbsd-cvs] src [11282] U trunk/usr.sbin/bluetooth: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Jul 4 09:26:59 EDT 2018
Revision: 11282
http://svnweb.midnightbsd.org/src/?rev=11282
Author: laffer1
Date: 2018-07-04 09:26:59 -0400 (Wed, 04 Jul 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/usr.sbin/bluetooth/hccontrol/Makefile
trunk/usr.sbin/bluetooth/hccontrol/hccontrol.8
trunk/usr.sbin/bluetooth/hccontrol/hccontrol.c
trunk/usr.sbin/bluetooth/hccontrol/hccontrol.h
trunk/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
trunk/usr.sbin/bluetooth/hccontrol/info.c
trunk/usr.sbin/bluetooth/hccontrol/link_control.c
trunk/usr.sbin/bluetooth/hccontrol/link_policy.c
trunk/usr.sbin/bluetooth/hccontrol/node.c
trunk/usr.sbin/bluetooth/hccontrol/send_recv.c
trunk/usr.sbin/bluetooth/hccontrol/status.c
trunk/usr.sbin/bluetooth/hccontrol/util.c
trunk/usr.sbin/bluetooth/hcseriald/Makefile
trunk/usr.sbin/bluetooth/hcseriald/hcseriald.8
trunk/usr.sbin/bluetooth/hcseriald/hcseriald.c
Property Changed:
----------------
trunk/usr.sbin/bluetooth/hccontrol/hccontrol.8
trunk/usr.sbin/bluetooth/hcseriald/hcseriald.8
trunk/usr.sbin/bluetooth/l2ping/l2ping.8
trunk/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
trunk/usr.sbin/bluetooth/sdpd/sdpd.8
Modified: trunk/usr.sbin/bluetooth/hccontrol/Makefile
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/Makefile 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/Makefile 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
# $MidnightBSD$
+# $Id: Makefile,v 1.7 2003/08/14 20:06:17 max Exp $
+# $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/Makefile 121054 2003-10-12 22:04:24Z emax $
PROG= hccontrol
MAN= hccontrol.8
Modified: trunk/usr.sbin/bluetooth/hccontrol/hccontrol.8
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/hccontrol.8 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/hccontrol.8 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin at yahoo.com>
.\" All rights reserved.
.\"
@@ -22,15 +23,15 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: hccontrol.8,v 1.5 2013-01-01 17:41:47 laffer1 Exp $
-.\" $MidnightBSD$
+.\" $Id: hccontrol.8,v 1.6 2003/08/06 21:26:38 max Exp $
+.\" $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/hccontrol.8 282958 2015-05-15 10:56:22Z trasz $
.\"
-.Dd June 14, 2002
+.Dd February 7, 2015
.Dt HCCONTROL 8
.Os
.Sh NAME
.Nm hccontrol
-.Nd HCI configuration utility
+.Nd Bluetooth HCI configuration utility
.Sh SYNOPSIS
.Nm
.Op Fl hN
@@ -81,7 +82,7 @@
.Nm
are:
.Pp
-.Bl -tag -offset indent -compact
+.Bl -tag -width 40n -offset indent -compact
.It Cm Inquiry
.It Cm Create_Connection
.It Cm Disconnect
@@ -148,7 +149,7 @@
.Nm
are:
.Pp
-.Bl -tag -offset indent -compact
+.Bl -tag -width 40n -offset indent -compact
.It Cm Read_Node_State
.It Cm Initialize
.It Cm Read_Debug_Level
Property changes on: trunk/usr.sbin/bluetooth/hccontrol/hccontrol.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bluetooth/hccontrol/hccontrol.c
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/hccontrol.c 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/hccontrol.c 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* hccontrol.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: hccontrol.c,v 1.5 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: hccontrol.c,v 1.5 2003/09/05 00:38:24 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/hccontrol.c 159156 2006-06-02 00:29:01Z markus $
*/
#include <bluetooth.h>
Modified: trunk/usr.sbin/bluetooth/hccontrol/hccontrol.h
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/hccontrol.h 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/hccontrol.h 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* hccontrol.h
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: hccontrol.h,v 1.5 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: hccontrol.h,v 1.2 2003/05/19 17:29:29 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/hccontrol.h 162495 2006-09-21 02:41:04Z emax $
*/
#ifndef _HCCONTROL_H_
Modified: trunk/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* host_controller_baseband.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: host_controller_baseband.c,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: host_controller_baseband.c,v 1.4 2003/08/18 19:19:53 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c 229075 2011-12-31 12:12:41Z stefanf $
*/
#include <bluetooth.h>
@@ -1633,7 +1634,7 @@
"defines the amount of time for the duration of the page scan. \n" \
"The Page_Scan_Window can only be less than or equal to the Page_Scan_Interval.\n\n" \
"\t<interval> - Range: 0x0012 -- 0x100, Time = N * 0.625 msec\n" \
-"\t<window> - Range: 0x0012 -- 0x100, Time = N * 0.625 msen",
+"\t<window> - Range: 0x0012 -- 0x100, Time = N * 0.625 msec",
&hci_write_page_scan_activity
},
{
@@ -1655,7 +1656,7 @@
"parameter defines the amount of time for the duration of the inquiry scan.\n" \
"The Inquiry_Scan_Window can only be less than or equal to the Inquiry_Scan_Interval.\n\n" \
"\t<interval> - Range: 0x0012 -- 0x100, Time = N * 0.625 msec\n" \
-"\t<window> - Range: 0x0012 -- 0x100, Time = N * 0.625 msen",
+"\t<window> - Range: 0x0012 -- 0x100, Time = N * 0.625 msec",
&hci_write_inquiry_scan_activity
},
{
Modified: trunk/usr.sbin/bluetooth/hccontrol/info.c
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/info.c 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/info.c 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* info.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: info.c,v 1.4 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: info.c,v 1.3 2003/08/18 19:19:54 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/info.c 155964 2006-02-23 23:19:12Z markus $
*/
#include <bluetooth.h>
Modified: trunk/usr.sbin/bluetooth/hccontrol/link_control.c
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/link_control.c 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/link_control.c 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* link_control.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: link_control.c,v 1.5 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: link_control.c,v 1.4 2003/08/18 19:19:54 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/link_control.c 250460 2013-05-10 16:41:26Z eadler $
*/
#include <bluetooth.h>
@@ -357,7 +358,7 @@
goto again;
return (OK);
-} /* hci_diconnect */
+} /* hci_disconnect */
/* Send Add_SCO_Connection command to the unit */
static int
Modified: trunk/usr.sbin/bluetooth/hccontrol/link_policy.c
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/link_policy.c 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/link_policy.c 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* link_policy.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: link_policy.c,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: link_policy.c,v 1.3 2003/08/18 19:19:54 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/link_policy.c 133178 2004-08-05 16:32:41Z emax $
*/
#include <bluetooth.h>
Modified: trunk/usr.sbin/bluetooth/hccontrol/node.c
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/node.c 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/node.c 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* node.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: node.c,v 1.5 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: node.c,v 1.6 2003/07/22 21:14:02 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/node.c 299826 2016-05-15 03:15:36Z pfg $
*/
#include <sys/ioctl.h>
@@ -591,7 +592,7 @@
"Write the value of the Role Switch parameter for the HCI node. By default,\n" \
"if Role Switch is supported, local device will try to perform Role Switch\n" \
"and become Master on incoming connection. Some devices do not support Role\n" \
-"Switch and thus incomming connections from such devices will fail. Setting\n" \
+"Switch and thus incoming connections from such devices will fail. Setting\n" \
"this parameter to zero will prevent Role Switch and thus accepting device\n" \
"will remain Slave",
&hci_write_node_role_switch
Modified: trunk/usr.sbin/bluetooth/hccontrol/send_recv.c
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/send_recv.c 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/send_recv.c 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* send_recv.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: send_recv.c,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: send_recv.c,v 1.2 2003/05/21 22:40:30 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/send_recv.c 128079 2004-04-09 23:58:53Z emax $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/bluetooth/hccontrol/status.c
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/status.c 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/status.c 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* status.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: status.c,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: status.c,v 1.2 2003/05/21 22:40:30 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/status.c 128079 2004-04-09 23:58:53Z emax $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/bluetooth/hccontrol/util.c
===================================================================
--- trunk/usr.sbin/bluetooth/hccontrol/util.c 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hccontrol/util.c 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* util.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: util.c,v 1.5 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: util.c,v 1.2 2003/05/19 17:29:29 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hccontrol/util.c 162495 2006-09-21 02:41:04Z emax $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/bluetooth/hcseriald/Makefile
===================================================================
--- trunk/usr.sbin/bluetooth/hcseriald/Makefile 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hcseriald/Makefile 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
# $MidnightBSD$
+# $Id: Makefile,v 1.5 2003/08/14 20:06:21 max Exp $
+# $FreeBSD: stable/10/usr.sbin/bluetooth/hcseriald/Makefile 140941 2005-01-28 16:08:11Z ru $
PROG= hcseriald
MAN= hcseriald.8
Modified: trunk/usr.sbin/bluetooth/hcseriald/hcseriald.8
===================================================================
--- trunk/usr.sbin/bluetooth/hcseriald/hcseriald.8 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hcseriald/hcseriald.8 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin at yahoo.com>
.\" All rights reserved.
.\"
@@ -22,8 +23,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: hcseriald.8,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
-.\" $MidnightBSD$
+.\" $Id: hcseriald.8,v 1.3 2003/05/21 00:47:26 max Exp $
+.\" $FreeBSD: stable/10/usr.sbin/bluetooth/hcseriald/hcseriald.8 244040 2012-12-08 22:16:36Z eadler $
.\"
.Dd June 14, 2002
.Dt HCSERIALD 8
@@ -54,7 +55,7 @@
.It Fl f Ar device
Callout device name.
Example:
-.Fl f Pa /dev/cuad0 .
+.Fl f Pa /dev/cuau0 .
.It Fl h
Display usage message and exit.
.It Fl n Ar node_name
Property changes on: trunk/usr.sbin/bluetooth/hcseriald/hcseriald.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bluetooth/hcseriald/hcseriald.c
===================================================================
--- trunk/usr.sbin/bluetooth/hcseriald/hcseriald.c 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/hcseriald/hcseriald.c 2018-07-04 13:26:59 UTC (rev 11282)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* hcseriald.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: hcseriald.c,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: hcseriald.c,v 1.3 2003/05/21 22:40:32 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/hcseriald/hcseriald.c 244040 2012-12-08 22:16:36Z eadler $
*/
#include <sys/types.h>
@@ -257,7 +258,7 @@
{
fprintf(stderr, "Usage: %s -f device -n node_name [-s speed -d -h]\n" \
"Where:\n" \
- "\t-f device tty device name, ex. /dev/cuad1\n" \
+ "\t-f device tty device name, ex. /dev/cuau1\n" \
"\t-n node_name set Netgraph node name to node_name\n" \
"\t-s speed set tty speed, ex. 115200\n" \
"\t-d run in foreground\n" \
Index: trunk/usr.sbin/bluetooth/l2ping/l2ping.8
===================================================================
--- trunk/usr.sbin/bluetooth/l2ping/l2ping.8 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/l2ping/l2ping.8 2018-07-04 13:26:59 UTC (rev 11282)
Property changes on: trunk/usr.sbin/bluetooth/l2ping/l2ping.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
===================================================================
--- trunk/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8 2018-07-04 13:26:59 UTC (rev 11282)
Property changes on: trunk/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/usr.sbin/bluetooth/sdpd/sdpd.8
===================================================================
--- trunk/usr.sbin/bluetooth/sdpd/sdpd.8 2018-07-04 13:25:27 UTC (rev 11281)
+++ trunk/usr.sbin/bluetooth/sdpd/sdpd.8 2018-07-04 13:26:59 UTC (rev 11282)
Property changes on: trunk/usr.sbin/bluetooth/sdpd/sdpd.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list