Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/bluetooth when no link-mode is specified, explicitly...
details: https://anonhg.NetBSD.org/src/rev/b27693cf2f5b
branches: trunk
changeset: 783426:b27693cf2f5b
user: plunky <plunky%NetBSD.org@localhost>
date: Thu Dec 20 11:13:53 2012 +0000
description:
when no link-mode is specified, explicitly set a mode of (int)0
otherwise l2cap_setmode() will fail during connection setup
for bthidev.c, this fixes a problem with Microsoft Wedge Touch
mouse (which may not be able to authenticate)
for btmagic.c, include this fix in case somebody tries that
related to PR/47286
diffstat:
sys/dev/bluetooth/bthidev.c | 7 ++++---
sys/dev/bluetooth/btmagic.c | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diffs (56 lines):
diff -r 913fa77d563e -r b27693cf2f5b sys/dev/bluetooth/bthidev.c
--- a/sys/dev/bluetooth/bthidev.c Thu Dec 20 10:01:28 2012 +0000
+++ b/sys/dev/bluetooth/bthidev.c Thu Dec 20 11:13:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bthidev.c,v 1.22 2012/04/03 09:32:53 plunky Exp $ */
+/* $NetBSD: bthidev.c,v 1.23 2012/12/20 11:13:53 plunky Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.22 2012/04/03 09:32:53 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.23 2012/12/20 11:13:53 plunky Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -241,7 +241,8 @@
aprint_verbose(" %s %s", BTDEVmode,
prop_string_cstring_nocopy(obj));
- }
+ } else
+ sockopt_setint(&sc->sc_mode, 0);
obj = prop_dictionary_get(dict, BTHIDEVcontrolpsm);
if (prop_object_type(obj) == PROP_TYPE_NUMBER) {
diff -r 913fa77d563e -r b27693cf2f5b sys/dev/bluetooth/btmagic.c
--- a/sys/dev/bluetooth/btmagic.c Thu Dec 20 10:01:28 2012 +0000
+++ b/sys/dev/bluetooth/btmagic.c Thu Dec 20 11:13:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: btmagic.c,v 1.3 2012/06/02 21:36:43 dsl Exp $ */
+/* $NetBSD: btmagic.c,v 1.4 2012/12/20 11:13:53 plunky Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.3 2012/06/02 21:36:43 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.4 2012/12/20 11:13:53 plunky Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -306,7 +306,8 @@
aprint_verbose(" %s %s", BTDEVmode,
prop_string_cstring_nocopy(obj));
- }
+ } else
+ sockopt_setint(&sc->sc_mode, 0);
aprint_normal(": 3 buttons, W and Z dirs\n");
aprint_naive("\n");
Home |
Main Index |
Thread Index |
Old Index