 @@ -1,14 +1,14 @@
-/*	$NetBSD: bthidev.c,v 1.23 2012/12/20 11:13:53 plunky Exp $	*/
+/*	$NetBSD: bthidev.c,v 1.24 2012/12/20 11:17:47 plunky Exp $	*/
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Iain Hibbert for Itronix Inc.
+ *
  * 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
 @@ -22,27 +22,27 @@
  * 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 ITRONIX INC. 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.23 2012/12/20 11:13:53 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.24 2012/12/20 11:17:47 plunky Exp $");
 #include <sys/param.h>
 #include <sys/condvar.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 @@ -183,26 +183,27 @@ bthidev_attach(device_t parent, device_t
+{
 	struct bthidev_softc *sc = device_private(self);
 	prop_dictionary_t dict = aux;
 	prop_object_t obj;
 	device_t dev;
 	struct bthidev_attach_args bha;
 	struct bthidev *hidev;
 	struct hid_data *d;
 	struct hid_item h;
 	const void *desc;
 	int locs[BTHIDBUSCF_NLOCS];
 	int maxid, rep, dlen;
 	int vendor, product;
 	int err;
 	/*
 	 * Init softc
 	 */
 	sc->sc_dev = self;
 	LIST_INIT(&sc->sc_list);
 	MBUFQ_INIT(&sc->sc_inq);
 	callout_init(&sc->sc_reconnect, 0);
 	callout_setfunc(&sc->sc_reconnect, bthidev_timeout, sc);
 	sc->sc_state = BTHID_CLOSED;
 	sc->sc_flags = BTHID_CONNECTING;
 	sc->sc_ctlpsm = L2CAP_PSM_HID_CNTL;
 	sc->sc_intpsm = L2CAP_PSM_HID_INTR;
 @@ -327,28 +328,29 @@ bthidev_attach(device_t parent, device_t
 			hidev->sc_id = rep;
 			hidev->sc_input = bha.ba_input;
 			hidev->sc_feature = bha.ba_feature;
 			LIST_INSERT_HEAD(&sc->sc_list, hidev, sc_next);
+		}
+	}
 	pmf_device_register(self, NULL, NULL);
 	/*
 	 * start bluetooth connections
 	 */
 	mutex_enter(bt_lock);
-	if ((sc->sc_flags & BTHID_RECONNECT) == 0)
+	if ((sc->sc_flags & BTHID_RECONNECT) == 0
-		bthidev_listen(sc);
+	    && (err = bthidev_listen(sc)) != 0)
 		aprint_error_dev(self, "failed to listen (%d)\n", err);
 	if (sc->sc_flags & BTHID_CONNECTING)
 		bthidev_connect(sc);
 	mutex_exit(bt_lock);
+}
 static int
 bthidev_detach(device_t self, int flags)
+{
 	struct bthidev_softc *sc = device_private(self);
 	struct bthidev *hidev;
 	mutex_enter(bt_lock);
 @@ -551,28 +553,30 @@ bthidev_connect(struct bthidev_softc *sc
 		aprint_verbose_dev(sc->sc_dev, "connect (#%d)\n", sc->sc_attempts);
 	memset(&sa, 0, sizeof(sa));
 	sa.bt_len = sizeof(sa);
 	sa.bt_family = AF_BLUETOOTH;
 	err = l2cap_attach(&sc->sc_ctl, &bthidev_ctl_proto, sc);
 	if (err) {
 		aprint_error_dev(sc->sc_dev, "l2cap_attach failed (%d)\n", err);
 		return err;
+	}
 	err = l2cap_setopt(sc->sc_ctl, &sc->sc_mode);
-	if (err)
+	if (err) {
 		aprint_error_dev(sc->sc_dev, "l2cap_setopt failed (%d)\n", err);
 		return err;
+	}
 	bdaddr_copy(&sa.bt_bdaddr, &sc->sc_laddr);
 	err = l2cap_bind(sc->sc_ctl, &sa);
 	if (err) {
 		aprint_error_dev(sc->sc_dev, "l2cap_bind failed (%d)\n", err);
 		return err;
+	}
 	sa.bt_psm = sc->sc_ctlpsm;
 	bdaddr_copy(&sa.bt_bdaddr, &sc->sc_raddr);
 	err = l2cap_connect(sc->sc_ctl, &sa);
 	if (err) {
 		aprint_error_dev(sc->sc_dev, "l2cap_connect failed (%d)\n", err);
 @@ -792,27 +796,27 @@ bthidev_int_connected(void *arg)
 static void
 bthidev_ctl_disconnected(void *arg, int err)
+{
 	struct bthidev_softc *sc = arg;
 	if (sc->sc_ctl != NULL) {
 		l2cap_detach(&sc->sc_ctl);
 		sc->sc_ctl = NULL;
+	}
 	sc->sc_state = BTHID_CLOSED;
 	if (sc->sc_int == NULL) {
-		aprint_normal_dev(sc->sc_dev, "disconnected\n");
+		aprint_normal_dev(sc->sc_dev, "disconnected (%d)\n", err);
 		sc->sc_flags &= ~BTHID_CONNECTING;
 		if (sc->sc_flags & BTHID_RECONNECT)
 			callout_schedule(&sc->sc_reconnect,
 					BTHID_RETRY_INTERVAL * hz);
 		else
 			sc->sc_state = BTHID_WAIT_CTL;
 	} else {
 		/*
 		 * The interrupt channel should have been closed first,
 		 * but its potentially unsafe to detach that from here.
 		 * Give them a second to do the right thing or let the
 		 * callout handle it.
 @@ -824,27 +828,27 @@ bthidev_ctl_disconnected(void *arg, int
 static void
 bthidev_int_disconnected(void *arg, int err)
+{
 	struct bthidev_softc *sc = arg;
 	if (sc->sc_int != NULL) {
 		l2cap_detach(&sc->sc_int);
 		sc->sc_int = NULL;
+	}
 	sc->sc_state = BTHID_CLOSED;
 	if (sc->sc_ctl == NULL) {
-		aprint_normal_dev(sc->sc_dev, "disconnected\n");
+		aprint_normal_dev(sc->sc_dev, "disconnected (%d)\n", err);
 		sc->sc_flags &= ~BTHID_CONNECTING;
 		if (sc->sc_flags & BTHID_RECONNECT)
 			callout_schedule(&sc->sc_reconnect,
 					BTHID_RETRY_INTERVAL * hz);
 		else
 			sc->sc_state = BTHID_WAIT_CTL;
 	} else {
 		/*
 		 * The control channel should be closing also, allow
 		 * them a chance to do that before we force it.
 		 */
 		callout_schedule(&sc->sc_reconnect, hz);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: btmagic.c,v 1.4 2012/12/20 11:13:53 plunky Exp $	*/
+/*	$NetBSD: btmagic.c,v 1.5 2012/12/20 11:17:47 plunky Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Iain Hibbert.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -75,27 +75,27 @@
  * for such complications.
+ *
  * This driver interprets the touch reports only as far as emulating a
  * middle mouse button and providing horizontal and vertical scroll action.
  * Full gesture support would be more complicated and is left as an exercise
  * for the reader.
+ *
  * Credit for decoding the proprietary touch reports goes to Michael Poole
  * who wrote the Linux hid-magicmouse input driver.
+ *
  *****************************************************************************/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.4 2012/12/20 11:13:53 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.5 2012/12/20 11:17:47 plunky Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 @@ -262,26 +262,27 @@ btmagic_match(device_t self, cfdata_t cf
 	    && p == USB_PRODUCT_APPLE_MAGICMOUSE)
 		return 2;	/* trump bthidev(4) */
 	return 0;
+}
 static void
 btmagic_attach(device_t parent, device_t self, void *aux)
+{
 	struct btmagic_softc *sc = device_private(self);
 	struct wsmousedev_attach_args wsma;
 	const struct sysctlnode *node;
 	prop_object_t obj;
 	int err;
 	/*
 	 * Init softc
 	 */
 	sc->sc_dev = self;
 	sc->sc_state = BTMAGIC_CLOSED;
 	callout_init(&sc->sc_timeout, 0);
 	callout_setfunc(&sc->sc_timeout, btmagic_timeout, sc);
 	sockopt_init(&sc->sc_mode, BTPROTO_L2CAP, SO_L2CAP_LM, 0);
 	/*
 	 * extract config from proplist
 	 */
 @@ -382,27 +383,28 @@ btmagic_attach(device_t parent, device_t
 	wsma.accesscookie = self;
 	sc->sc_wsmouse = config_found(self, &wsma, wsmousedevprint);
 	if (sc->sc_wsmouse == NULL) {
 		aprint_error_dev(self, "failed to attach wsmouse\n");
 		return;
+	}
 	pmf_device_register(self, NULL, NULL);
 	/*
 	 * start bluetooth connections
 	 */
 	mutex_enter(bt_lock);
-	btmagic_listen(sc);
+	if ((err = btmagic_listen(sc)) != 0)
 		aprint_error_dev(self, "failed to listen (%d)\n", err);
 	btmagic_connect(sc);
 	mutex_exit(bt_lock);
+}
 static int
 btmagic_detach(device_t self, int flags)
+{
 	struct btmagic_softc *sc = device_private(self);
 	int err = 0;
 	mutex_enter(bt_lock);
 	/* release interrupt listen */
 @@ -523,28 +525,31 @@ btmagic_connect(struct btmagic_softc *sc
 	memset(&sa, 0, sizeof(sa));
 	sa.bt_len = sizeof(sa);
 	sa.bt_family = AF_BLUETOOTH;
 	err = l2cap_attach(&sc->sc_ctl, &btmagic_ctl_proto, sc);
 	if (err) {
 		printf("%s: l2cap_attach failed (%d)\n",
 		    device_xname(sc->sc_dev), err);
 		return err;
+	}
 	err = l2cap_setopt(sc->sc_ctl, &sc->sc_mode);
-	if (err)
+	if (err) {
 		printf("%s: l2cap_setopt failed (%d)\n",
 		    device_xname(sc->sc_dev), err);
 		return err;
+	}
 	bdaddr_copy(&sa.bt_bdaddr, &sc->sc_laddr);
 	err = l2cap_bind(sc->sc_ctl, &sa);
 	if (err) {
 		printf("%s: l2cap_bind failed (%d)\n",
 		    device_xname(sc->sc_dev), err);
 		return err;
+	}
 	sa.bt_psm = L2CAP_PSM_HID_CNTL;
 	bdaddr_copy(&sa.bt_bdaddr, &sc->sc_raddr);
 	err = l2cap_connect(sc->sc_ctl, &sa);
 	if (err) {
 @@ -875,53 +880,53 @@ btmagic_int_connected(void *arg)
  * we are lost. If both channels are closed, schedule another connection.
  */
 static void
 btmagic_ctl_disconnected(void *arg, int err)
+{
 	struct btmagic_softc *sc = arg;
 	if (sc->sc_ctl != NULL) {
 		l2cap_detach(&sc->sc_ctl);
 		sc->sc_ctl = NULL;
+	}
 	if (sc->sc_int == NULL) {
-		printf("%s: disconnected\n", device_xname(sc->sc_dev));
+		printf("%s: disconnected (%d)\n", device_xname(sc->sc_dev), err);
 		CLR(sc->sc_flags, BTMAGIC_CONNECTING);
 		sc->sc_state = BTMAGIC_WAIT_CTL;
 	} else {
 		/*
 		 * The interrupt channel should have been closed first,
 		 * but its potentially unsafe to detach that from here.
 		 * Give them a second to do the right thing or let the
 		 * callout handle it.
 		 */
 		sc->sc_state = BTMAGIC_CLOSED;
 		callout_schedule(&sc->sc_timeout, hz);
+	}
+}
 static void
 btmagic_int_disconnected(void *arg, int err)
+{
 	struct btmagic_softc *sc = arg;
 	if (sc->sc_int != NULL) {
 		l2cap_detach(&sc->sc_int);
 		sc->sc_int = NULL;
+	}
 	if (sc->sc_ctl == NULL) {
-		printf("%s: disconnected\n", device_xname(sc->sc_dev));
+		printf("%s: disconnected (%d)\n", device_xname(sc->sc_dev), err);
 		CLR(sc->sc_flags, BTMAGIC_CONNECTING);
 		sc->sc_state = BTMAGIC_WAIT_CTL;
 	} else {
 		/*
 		 * The control channel should be closing also, allow
 		 * them a chance to do that before we force it.
 		 */
 		sc->sc_state = BTMAGIC_CLOSED;
 		callout_schedule(&sc->sc_timeout, hz);
+	}
+}
 /*