Module Name: src
Committed By: jmcneill
Date: Fri Aug 11 11:54:08 UTC 2017
Modified Files:
src/usr.sbin/btattach: btattach.8 btattach.c
Log Message:
Make the "bcm43xx" type use H4 transport and add a new "bcm43xx-3wire"
type for use with H5 transport. The naming of the types here matches
those used in a series of BlueZ patches from the Raspberry Pi foundation.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/btattach/btattach.8
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/btattach/btattach.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/btattach/btattach.8
diff -u src/usr.sbin/btattach/btattach.8:1.8 src/usr.sbin/btattach/btattach.8:1.9
--- src/usr.sbin/btattach/btattach.8:1.8 Tue Mar 18 18:20:46 2014
+++ src/usr.sbin/btattach/btattach.8 Fri Aug 11 11:54:08 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: btattach.8,v 1.8 2014/03/18 18:20:46 riastradh Exp $
+.\" $NetBSD: btattach.8,v 1.9 2017/08/11 11:54:08 jmcneill Exp $
.\"
.\" Copyright (c) 2007 KIYOHARA Takashi
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd March 9, 2010
+.Dd August 11, 2017
.Dt BTATTACH 8
.Os
.Sh NAME
@@ -58,6 +58,10 @@ Supported types are:
.Bl -tag -compact -width ericssonxx -offset indent
.It Cm bcm2035
Broadcom BCM2035
+.It Cm bcm43xx
+Broadcom BCM43xx
+.It Cm bcm43xx-3wire
+Broadcom BCM43xx (3-wire)
.It Cm bcsp
Generic BCSP (BlueCore Serial Protocol)
.It Cm bgb2xx
Index: src/usr.sbin/btattach/btattach.c
diff -u src/usr.sbin/btattach/btattach.c:1.14 src/usr.sbin/btattach/btattach.c:1.15
--- src/usr.sbin/btattach/btattach.c:1.14 Thu Aug 10 13:34:29 2017
+++ src/usr.sbin/btattach/btattach.c Fri Aug 11 11:54:08 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: btattach.c,v 1.14 2017/08/10 13:34:29 nat Exp $ */
+/* $NetBSD: btattach.c,v 1.15 2017/08/11 11:54:08 jmcneill Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008 Iain Hibbert. All rights reserved.");
-__RCSID("$NetBSD: btattach.c,v 1.14 2017/08/10 13:34:29 nat Exp $");
+__RCSID("$NetBSD: btattach.c,v 1.15 2017/08/11 11:54:08 jmcneill Exp $");
#include <sys/ioctl.h>
#include <sys/param.h>
@@ -63,12 +63,19 @@ static const struct devtype types[] = {
},
{
.name = "bcm43xx",
- .line = "bth5",
+ .line = "btuart",
.descr = "Broadcom BCM43xx",
.init = &init_bcm43xx,
.speed = B115200,
},
{
+ .name = "bcm43xx-3wire",
+ .line = "bth5",
+ .descr = "Broadcom BCM43xx (3-wire)",
+ .init = &init_bcm43xx,
+ .speed = B115200,
+ },
+ {
.name = "bcsp",
.line = "bcsp",
.descr = "Generic BlueCore Serial Protocol",
