Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 31 May 2006 16:13:08 GMT
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 98218 for review
Message-ID:  <200605311613.k4VGD8CI008476@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=98218

Change 98218 by hselasky@hselasky_mini_itx on 2006/05/31 16:12:59

	Finished reworking "ums.c". "ums" should now be so called MP-safe.
	Added "usb_hid.c" from "usb.old/hid.c". 
	USB API change: "hid_get_data()" now takes three arguments.
	Please test "ums"!

Affected files ...

.. //depot/projects/usb/src/sys/conf/files#3 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#1 add
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#6 edit

Differences ...

==== //depot/projects/usb/src/sys/conf/files#3 (text+ko) ====

@@ -988,10 +988,12 @@
 dev/usb/usb_ethersubr.c		optional usb
 dev/usb/usb_if.m		optional usb
 dev/usb/usb_quirks.c		optional usb
+dev/usb/usb_hid.c		optional usb
 dev/usb/ugen.c			optional ugen
+dev/usb/ulpt.c			optional ulpt
+dev/usb/ums.c			optional ums
 #
 # USB support (not merged)
-dev/usb/hid.c			optional usb
 dev/usb/if_aue.c		optional aue
 dev/usb/if_axe.c		optional axe
 dev/usb/if_cdce.c		optional cdce
@@ -1012,11 +1014,9 @@
 dev/usb/uftdi.c			optional uftdi ucom
 dev/usb/uhid.c			optional uhid
 dev/usb/ukbd.c			optional ukbd
-dev/usb/ulpt.c			optional ulpt
 dev/usb/umass.c			optional umass
 dev/usb/umct.c			optional umct
 dev/usb/umodem.c		optional umodem
-dev/usb/ums.c			optional ums
 dev/usb/uplcom.c		optional uplcom ucom
 dev/usb/urio.c			optional urio
 dev/usb/uscanner.c		optional uscanner

==== //depot/projects/usb/src/sys/dev/usb/ums.c#4 (text+ko) ====

@@ -1,0 +1,1127 @@
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*
+ * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
+ */
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/ioccom.h>
+#include <sys/filio.h>
+#include <sys/tty.h>
+#include <sys/file.h>
+#include <sys/vnode.h>
+#include <sys/poll.h>
+#include <sys/mouse.h>
+
+#include <dev/usb/usb_port.h>
+#include <dev/usb/usb.h>
+#include <dev/usb/usb_subr.h>
+#include <dev/usb/usb_hid.h>
+
+__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.80 2005/12/29 18:35:28 netchild Exp $");
+
+#ifdef USB_DEBUG
+#define DPRINTF(n,fmt,...)						\
+  do { if (ums_debug > (n)) {						\
+      printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0)
+
+static int ums_debug = 0;
+SYSCTL_NODE(_hw_usb, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums");
+SYSCTL_INT(_hw_usb_ums, OID_AUTO, debug, CTLFLAG_RW,
+	   &ums_debug, 0, "ums debug level");
+#else
+#define DPRINTF(...)
+#endif
+
+#define DEV2SC(dev) (dev)->si_drv1
+
+#define MOUSE_FLAGS_MASK (HIO_CONST|HIO_RELATIVE)
+#define MOUSE_FLAGS (HIO_RELATIVE)
+
+#define UMS_INT_SIZE     64 /* bytes */
+#define UMS_BUF_SIZE      8 /* bytes */
+#define UMS_IFQ_MAXLEN   50 /* units */
+#define UMS_N_TRANSFER    2 /* units */
+#define UMS_BUTTON_MAX   31 /* exclusive, must be less than 32 */
+#define UMS_BUT(i) ((i) < 3 ? (((i) + 2) % 3) : (i))
+
+struct ums_softc {
+  struct mtx          sc_mtx;
+  struct usbd_ifqueue sc_rdq_free;
+  struct usbd_ifqueue sc_rdq_used;
+  struct __callout    sc_callout;
+  struct selinfo      sc_read_sel;
+  struct hid_location sc_loc_x; 
+  struct hid_location sc_loc_y;
+  struct hid_location sc_loc_z;
+  struct hid_location sc_loc_t;
+  struct hid_location sc_loc_btn[UMS_BUTTON_MAX];
+  mousehw_t           sc_hw;
+  mousemode_t         sc_mode;
+  mousestatus_t	      sc_status;
+
+  struct usbd_xfer *  sc_xfer[UMS_N_TRANSFER];
+  void *              sc_mem_ptr_1;
+  struct cdev *	      sc_cdev_1;
+
+  u_int32_t	      sc_flags;
+#define UMS_FLAG_X_AXIS     0x0001
+#define UMS_FLAG_Y_AXIS     0x0002
+#define UMS_FLAG_Z_AXIS     0x0004
+#define UMS_FLAG_T_AXIS     0x0008
+#define UMS_FLAG_SBU        0x0010 /* spurious button up events */
+#define UMS_FLAG_SELECT     0x0020 /* select is waiting */
+#define UMS_FLAG_PIPE_ERROR 0x0040 /* set if transfer error */
+#define UMS_FLAG_WAIT_USB   0x0080 /* device is waiting for callbacks */
+#define UMS_FLAG_WAIT_CO    0x0100 /* device is waiting for callbacks */
+#define UMS_FLAG_GONE       0x0200 /* device is gone */
+#define UMS_FLAG_RD_WUP     0x0400 /* device is waiting for wakeup */
+#define UMS_FLAG_RD_SLP     0x0800 /* device is sleeping */
+#define UMS_FLAG_CLOSING    0x1000 /* device is closing */
+#define UMS_FLAG_DEV_OPEN   0x2000 /* device is open */
+
+  u_int8_t	      sc_buttons;
+  u_int8_t	      sc_iid;
+  u_int8_t            sc_wakeup_detach; /* dummy */
+  u_int8_t            sc_wakeup_read; /* dummy */
+  u_int8_t            sc_wakeup_sync_1; /* dummy */
+};
+
+static device_probe_t ums_probe;
+static device_attach_t ums_attach;
+static device_detach_t ums_detach;
+static d_close_t ums_close;
+
+static void
+ums_put_queue(struct ums_softc *sc, int32_t dx, int32_t dy, 
+	      int32_t dz, int32_t dt, int32_t buttons);
+
+extern cdevsw_t ums_cdevsw;
+
+static void
+ums_put_queue_timeout(void *__sc)
+{
+	struct ums_softc *sc = __sc;
+
+	mtx_assert(&(sc->sc_mtx), MA_OWNED);
+
+	ums_put_queue(sc, 0, 0, 0, 0, 0);
+
+	mtx_unlock(&(sc->sc_mtx));
+
+	return;
+}
+
+static void
+ums_clear_stall_callback(struct usbd_xfer *xfer1)
+{
+	usb_device_request_t *req = xfer1->buffer;
+	struct ums_softc *sc = xfer1->priv_sc;
+	struct usbd_xfer *xfer0 = sc->sc_xfer[0];
+
+	USBD_CHECK_STATUS(xfer1);
+
+ tr_setup:
+
+        /* setup a CLEAR STALL packet */
+
+        req->bmRequestType = UT_WRITE_ENDPOINT;
+        req->bRequest = UR_CLEAR_FEATURE;
+        USETW(req->wValue, UF_ENDPOINT_HALT);
+        req->wIndex[0] = xfer0->pipe->edesc->bEndpointAddress;
+        req->wIndex[1] = 0;
+        USETW(req->wLength, 0);
+
+        usbd_start_hardware(xfer1);
+        return;
+
+ tr_error:
+ tr_transferred:
+
+	sc->sc_flags &= ~UMS_FLAG_PIPE_ERROR;
+
+	if (xfer1->error != USBD_CANCELLED) {
+
+	    xfer0->pipe->clearstall = 0;
+	    xfer0->pipe->toggle_next = 0;
+
+	    usbd_transfer_start(xfer0);
+	}
+	return;
+}
+
+static void
+ums_intr_callback(struct usbd_xfer *xfer)
+{
+	struct ums_softc *sc = xfer->priv_sc;
+	struct usbd_mbuf *m;
+	u_int8_t *buf = xfer->buffer;
+	u_int16_t len = xfer->actlen;
+	int32_t buttons = 0;
+	int32_t dx;
+	int32_t dy;
+	int32_t dz;
+	int32_t dt;
+	u_int8_t i;
+
+	USBD_CHECK_STATUS(xfer);
+
+ tr_transferred:
+	DPRINTF(5, "sc=%p actlen=%d\n", sc, len);
+	DPRINTF(5, "data = %02x %02x %02x %02x "
+		"%02x %02x %02x %02x\n",
+		buf[0], buf[1], buf[2], buf[3], 
+		buf[4], buf[5], buf[6], buf[7]);
+
+	/*
+	 * The M$ Wireless Intellimouse 2.0 sends 1 extra leading byte of
+	 * data compared to most USB mice. This byte frequently switches
+	 * from 0x01 (usual state) to 0x02. I assume it is to allow
+	 * extra, non-standard, reporting (say battery-life). However
+	 * at the same time it generates a left-click message on the button
+	 * byte which causes spurious left-click's where there shouldn't be.
+	 * This should sort that.
+	 * Currently it's the only user of UMS_FLAG_T_AXIS so use it as an identifier.
+	 * We probably should switch to some more official quirk.
+	 */
+	if (sc->sc_iid) {
+	    if (sc->sc_flags & UMS_FLAG_T_AXIS) {
+	      if (*buf == 0x02) {
+		  goto tr_setup;
+	      }
+	    } else {
+	      if (*buf != sc->sc_iid) {
+		  goto tr_setup;
+	      }
+	    }
+
+	    if (len) {
+	      len--;
+	      buf++;
+	    } else {
+	      goto tr_setup;
+	    }
+	}
+
+	dx = (sc->sc_flags & UMS_FLAG_X_AXIS) ?
+	  hid_get_data(buf, len, &sc->sc_loc_x) : 0;
+
+	dy = (sc->sc_flags & UMS_FLAG_Y_AXIS) ?
+	  -hid_get_data(buf, len, &sc->sc_loc_y) : 0;
+
+	dz = (sc->sc_flags & UMS_FLAG_Z_AXIS) ?
+	  -hid_get_data(buf, len, &sc->sc_loc_z) : 0;
+
+	dt = (sc->sc_flags & UMS_FLAG_T_AXIS) ?
+	  -hid_get_data(buf, len, &sc->sc_loc_t) : 0;
+
+	for (i = 0; i < sc->sc_buttons; i++) {
+	    if (hid_get_data(buf, len, &sc->sc_loc_btn[i])) {
+	        buttons |= (1 << UMS_BUT(i));
+	    }
+	}
+
+	if (dx || dy || dz || dt || (buttons != sc->sc_status.button)) {
+
+	    DPRINTF(5, "x:%d y:%d z:%d t:%d buttons:0x%08x\n",
+		    dx, dy, dz, dt, buttons);
+
+	    sc->sc_status.button = buttons;
+	    sc->sc_status.dx += dx;
+	    sc->sc_status.dy += dy;
+	    sc->sc_status.dz += dz;
+	    /* sc->sc_status.dt += dt;*/ /* no way to export this yet */
+
+	    /*
+	     * The Qtronix keyboard has a built in PS/2 port for a mouse.
+	     * The firmware once in a while posts a spurious button up
+	     * event. This event we ignore by doing a timeout for 50 msecs.
+	     * If we receive dx=dy=dz=buttons=0 before we add the event to
+	     * the queue.
+	     * In any other case we delete the timeout event.
+	     */
+	    if ((sc->sc_flags & UMS_FLAG_SBU) &&
+		(dx == 0) && (dy == 0) && (dz == 0) && (dt == 0) && 
+		(buttons == 0)) {
+
+	        __callout_reset(&(sc->sc_callout), hz / 20, 
+				&ums_put_queue_timeout, sc);
+	    } else {
+
+	        __callout_stop(&(sc->sc_callout));
+
+		ums_put_queue(sc, dx, dy, dz, dt, buttons);
+	    }
+	}
+
+ tr_setup:
+	USBD_IF_POLL(&sc->sc_rdq_free, m);
+
+	if (m && (!(sc->sc_flags & UMS_FLAG_PIPE_ERROR))) {
+	    usbd_start_hardware(xfer);
+	}
+	return;
+
+ tr_error:
+	if (xfer->error != USBD_CANCELLED) {
+	    /* start clear stall */
+	    sc->sc_flags |= UMS_FLAG_PIPE_ERROR;
+
+	    usbd_transfer_start(sc->sc_xfer[1]);
+	}
+	return;
+}
+
+static const struct usbd_config ums_config[UMS_N_TRANSFER] = {
+
+    [0] = {
+      .type      = UE_INTERRUPT,
+      .endpoint  = -1, /* any */
+      .direction = UE_DIR_IN,
+      .flags     = USBD_SHORT_XFER_OK,
+      .bufsize   = UMS_INT_SIZE, /* bytes */
+      .callback  = &ums_intr_callback,
+    },
+
+    [1] = {
+      .type      = UE_CONTROL,
+      .endpoint  = 0x00, /* Control pipe */
+      .direction = -1,
+      .bufsize   = sizeof(usb_device_request_t),
+      .callback  = &ums_clear_stall_callback,
+      .timeout   = 1000, /* 1 second */
+    },
+};
+
+static void
+ums_detach_complete(struct usbd_memory_info *info)
+{
+	struct ums_softc *sc = info->priv_sc;
+
+	mtx_lock(&(sc->sc_mtx));
+
+	if (sc->sc_flags &   UMS_FLAG_WAIT_USB) {
+	    sc->sc_flags &= ~UMS_FLAG_WAIT_USB;
+	    wakeup(&(sc->sc_wakeup_detach));
+	}
+
+	mtx_unlock(&(sc->sc_mtx));
+
+	return;
+}
+
+static int
+ums_probe(device_t dev)
+{
+	struct usb_attach_arg *uaa = device_get_ivars(dev);
+	usb_interface_descriptor_t *id;
+	void *d_ptr;
+	int32_t d_len;
+	int32_t error = 0;
+
+	DPRINTF(10, "\n");
+
+	if (uaa->iface == NULL) {
+	    return UMATCH_NONE;
+	}
+
+	id = usbd_get_interface_descriptor(uaa->iface);
+
+	if ((id == NULL) || 
+	    (id->bInterfaceClass != UICLASS_HID)) {
+	    return UMATCH_NONE;
+	}
+
+	error = usbreq_read_report_desc(uaa->device, uaa->iface_index, 
+					&d_ptr, &d_len, M_TEMP);
+	if (error) {
+	    return UMATCH_NONE;
+	}
+
+	if (hid_is_collection(d_ptr, d_len, 
+			      HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE)))
+	    error = UMATCH_IFACECLASS;
+	else
+	    error = UMATCH_NONE;
+
+	free(d_ptr, M_TEMP);
+
+	return error;
+}
+
+static int
+ums_attach(device_t dev)
+{
+	struct usb_attach_arg *uaa = device_get_ivars(dev);
+	struct ums_softc *sc = device_get_softc(dev);
+	void *d_ptr = NULL;
+	int32_t unit = device_get_unit(dev);
+	int32_t d_len;
+	int32_t isize;
+	u_int32_t flags;
+	usbd_status err;
+	u_int8_t i;
+
+	DPRINTF(10, "sc=%p\n", sc);
+
+	sc->sc_rdq_free.ifq_maxlen = UMS_IFQ_MAXLEN;
+	sc->sc_rdq_used.ifq_maxlen = UMS_IFQ_MAXLEN;
+
+	usbd_set_desc(dev, uaa->device);
+
+	mtx_init(&(sc->sc_mtx), "ums lock", NULL, MTX_DEF|MTX_RECURSE);
+
+	__callout_init_mtx(&(sc->sc_callout),
+			   &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
+#if 0
+	/* TODO: "__callout_init_mtx()" does not support this: */
+
+	sc->sc_flags |= UMS_FLAG_WAIT_CO; 
+#endif
+
+ 	sc->sc_mem_ptr_1 = 
+	  usbd_alloc_mbufs(M_DEVBUF, &(sc->sc_rdq_free), 
+			   UMS_BUF_SIZE, UMS_IFQ_MAXLEN);
+
+	if (sc->sc_mem_ptr_1 == NULL) {
+	    goto detach;
+	}
+
+	err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, 
+				  ums_config, UMS_N_TRANSFER, sc, 
+				  &(sc->sc_mtx), &ums_detach_complete);
+	if (err) {
+	    DPRINTF(0, "error=%s\n", usbd_errstr(err)) ;
+	    goto detach;
+	}
+
+	sc->sc_flags |= UMS_FLAG_WAIT_USB;
+
+	err = usbreq_read_report_desc(uaa->device, uaa->iface_index, 
+				      &d_ptr, &d_len, M_TEMP);
+	if (err) {
+	    device_printf(dev, "error reading report description\n");
+	    goto detach;
+	}
+
+	if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X),
+			hid_input, &sc->sc_loc_x, &flags)) {
+
+	    if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
+	        sc->sc_flags |= UMS_FLAG_X_AXIS;
+	    }
+	}
+
+	if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y),
+		       hid_input, &sc->sc_loc_y, &flags)) {
+
+	    if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
+	        sc->sc_flags |= UMS_FLAG_Y_AXIS;
+	    }
+	}
+
+	/* try to guess the Z activator: first check Z, then WHEEL */
+
+	if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Z),
+		       hid_input, &sc->sc_loc_z, &flags) ||
+	    hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL),
+		       hid_input, &sc->sc_loc_z, &flags) ||
+	    hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_TWHEEL),
+		       hid_input, &sc->sc_loc_z, &flags)) {
+
+	    if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
+	        sc->sc_flags |= UMS_FLAG_Z_AXIS;
+	    }
+	}
+
+	/* The Microsoft Wireless Intellimouse 2.0 reports it's wheel
+	 * using 0x0048, which is HUG_TWHEEL, and seems to expect you
+	 * to know that the byte after the wheel is the tilt axis.
+	 * There are no other HID axis descriptors other than X,Y and 
+	 * TWHEEL
+	 */
+	if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_TWHEEL),
+		       hid_input, &sc->sc_loc_t, &flags)) {
+
+	    sc->sc_loc_t.pos += 8;
+
+	    if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
+	        sc->sc_flags |= UMS_FLAG_T_AXIS;
+	    }
+	}
+
+	/* figure out the number of buttons */
+
+	for (i = 0; i < UMS_BUTTON_MAX; i++) {
+	    if (!hid_locate(d_ptr, d_len, HID_USAGE2(HUP_BUTTON, (i+1)),
+			    hid_input, &(sc->sc_loc_btn[i]), NULL)) {
+	        break;
+	    }
+	}
+
+	sc->sc_buttons = i;
+
+	device_printf(dev, "%d buttons and [%s%s%s%s] coordinates\n",
+		      (sc->sc_buttons),
+		      (sc->sc_flags & UMS_FLAG_X_AXIS) ? "X" : "",
+		      (sc->sc_flags & UMS_FLAG_Y_AXIS) ? "Y" : "",
+		      (sc->sc_flags & UMS_FLAG_Z_AXIS) ? "Z" : "",
+		      (sc->sc_flags & UMS_FLAG_T_AXIS) ? "T" : "");
+
+	isize = hid_report_size(d_ptr, d_len, hid_input, &sc->sc_iid);
+
+	if (isize > UMS_INT_SIZE) {
+	    DPRINTF(0, "cannot handle a report "
+		    "size of %d bytes\n", isize);
+	    goto detach;
+	}
+
+	sc->sc_xfer[0]->length = isize;
+
+	free(d_ptr, M_TEMP);
+
+#ifdef USB_DEBUG
+	DPRINTF(0, "sc=%p\n", sc);
+	DPRINTF(0, "X\t%d/%d\n", sc->sc_loc_x.pos, sc->sc_loc_x.size);
+	DPRINTF(0, "Y\t%d/%d\n", sc->sc_loc_y.pos, sc->sc_loc_y.size);
+	DPRINTF(0, "Z\t%d/%d\n", sc->sc_loc_z.pos, sc->sc_loc_z.size);
+	DPRINTF(0, "T\t%d/%d\n", sc->sc_loc_t.pos, sc->sc_loc_t.size);
+
+	for (i = 0; i < sc->sc_buttons; i++) {
+	    DPRINTF(0, "B%d\t%d/%d\n",
+		    i+1 , sc->sc_loc_btn[i].pos, sc->sc_loc_btn[i].size);
+	}
+	DPRINTF(0, "size=%d, id=%d\n", isize, sc->sc_iid);
+#endif
+
+	if (sc->sc_buttons > MOUSE_MSC_MAXBUTTON)
+	    sc->sc_hw.buttons = MOUSE_MSC_MAXBUTTON;
+	else
+	    sc->sc_hw.buttons = sc->sc_buttons;
+
+	sc->sc_hw.iftype = MOUSE_IF_USB;
+	sc->sc_hw.type = MOUSE_MOUSE;
+	sc->sc_hw.model = MOUSE_MODEL_GENERIC;
+	sc->sc_hw.hwid = 0;
+
+	sc->sc_mode.protocol = MOUSE_PROTO_MSC;
+	sc->sc_mode.rate = -1;
+	sc->sc_mode.resolution = MOUSE_RES_UNKNOWN;
+	sc->sc_mode.accelfactor = 0;
+	sc->sc_mode.level = 0;
+	sc->sc_mode.packetsize = MOUSE_MSC_PACKETSIZE;
+	sc->sc_mode.syncmask[0] = MOUSE_MSC_SYNCMASK;
+	sc->sc_mode.syncmask[1] = MOUSE_MSC_SYNC;
+
+	sc->sc_status.flags = 0;
+	sc->sc_status.button = 0;
+	sc->sc_status.obutton = 0;
+	sc->sc_status.dx = 0;
+	sc->sc_status.dy = 0;
+	sc->sc_status.dz = 0;
+
+	sc->sc_cdev_1 = make_dev
+	  (&ums_cdevsw, unit, UID_ROOT, GID_OPERATOR, 0644, "ums%d", unit);
+
+	if (sc->sc_cdev_1) {
+	    DEV2SC(sc->sc_cdev_1) = sc;
+	}
+
+	return 0;
+
+ detach:
+	if (d_ptr) {
+	    free(d_ptr, M_TEMP);
+	}
+	ums_detach(dev);
+	return ENOMEM;
+}
+
+static int
+ums_detach(device_t self)
+{
+	struct ums_softc *sc = device_get_softc(self);
+
+	int error;
+
+	DPRINTF(0, "sc=%p\n", sc);
+
+	mtx_lock(&(sc->sc_mtx));
+	sc->sc_flags |= UMS_FLAG_GONE;
+	mtx_unlock(&(sc->sc_mtx));
+
+	if (sc->sc_cdev_1) {
+
+	    ums_close(sc->sc_cdev_1, 0, 0, 0);
+
+	    DEV2SC(sc->sc_cdev_1) = NULL;
+
+	    destroy_dev(sc->sc_cdev_1);
+	}
+
+	mtx_lock(&(sc->sc_mtx));
+
+	__callout_stop(&(sc->sc_callout));
+
+	mtx_unlock(&(sc->sc_mtx));
+
+	usbd_transfer_unsetup(sc->sc_xfer, UMS_N_TRANSFER);
+
+	if (sc->sc_mem_ptr_1) {
+	    free(sc->sc_mem_ptr_1, M_DEVBUF);
+	}
+
+	/* wait for callbacks to be aborted */
+
+	mtx_lock(&(sc->sc_mtx));
+	while (sc->sc_flags & (UMS_FLAG_WAIT_USB|UMS_FLAG_WAIT_CO)) {
+
+	    error = msleep(&(sc->sc_wakeup_detach), &(sc->sc_mtx), 
+			   PRIBIO, "ums_sync_2", 0);
+	}
+	mtx_unlock(&(sc->sc_mtx));
+
+	mtx_destroy(&(sc->sc_mtx));
+
+	return 0;
+}
+
+#if ((MOUSE_SYS_PACKETSIZE != 8) || \
+     (MOUSE_MSC_PACKETSIZE != 5))
+#error "Software assumptions are not met. Please update code."
+#endif
+
+static void
+ums_put_queue(struct ums_softc *sc, int32_t dx, int32_t dy, 
+	      int32_t dz, int32_t dt, int32_t buttons)
+{
+	struct usbd_mbuf *m;
+	u_int8_t *buf;
+
+	USBD_IF_DEQUEUE(&sc->sc_rdq_free, m);
+
+	if (m) {
+	    USBD_MBUF_RESET(m);
+
+	    if (dx >  254)		dx =  254;
+	    if (dx < -256)		dx = -256;
+	    if (dy >  254)		dy =  254;
+	    if (dy < -256)		dy = -256;
+	    if (dz >  126)		dz =  126;
+	    if (dz < -128)		dz = -128;
+	    if (dt >  126)		dt =  126;
+	    if (dt < -128)		dt = -128;
+
+	    buf = m->cur_data_ptr;
+	    m->cur_data_len = sc->sc_mode.packetsize;
+
+	    buf[0] = sc->sc_mode.syncmask[1];
+	    buf[0] |= ~buttons & MOUSE_MSC_BUTTONS;
+	    buf[1] = dx >> 1;
+	    buf[2] = dy >> 1;
+	    buf[3] = dx - (dx >> 1);
+	    buf[4] = dy - (dy >> 1);
+
+	    if (sc->sc_mode.level == 1) {
+	        buf[5] = dz >> 1;
+		buf[6] = dz - (dz >> 1);
+		buf[7] = ((~buttons >> 3) & MOUSE_SYS_EXTBUTTONS);
+	    }
+
+	    USBD_IF_ENQUEUE(&(sc->sc_rdq_used), m);
+
+	    if (sc->sc_flags &   UMS_FLAG_RD_WUP) {
+	        sc->sc_flags &= ~UMS_FLAG_RD_WUP;
+	        wakeup(&(sc->sc_wakeup_read));
+	    }
+
+	    if (sc->sc_flags & UMS_FLAG_SELECT) {
+	        sc->sc_flags &= ~UMS_FLAG_SELECT;
+		selwakeup(&(sc->sc_read_sel));
+	    }
+
+	} else {
+	    DPRINTF(0, "Buffer full, discarded packet\n");
+	}
+
+	return;
+}
+
+static int
+ums_uiomove(struct ums_softc *sc, u_int32_t context_bit, 
+	    void *cp, int n, struct uio *uio)
+{
+	int error;
+
+	sc->sc_flags |= context_bit;
+
+	mtx_unlock(&(sc->sc_mtx));
+
+	error = uiomove(cp, n, uio);
+
+	mtx_lock(&(sc->sc_mtx));
+
+	sc->sc_flags &= ~context_bit;
+
+	if (sc->sc_flags & UMS_FLAG_CLOSING) {
+	    wakeup(&(sc->sc_wakeup_sync_1));
+	    error = EINTR;
+	}
+	return error;
+}
+
+static int
+ums_msleep(struct ums_softc *sc, u_int32_t context_bit, void *ident)
+{
+	int error;
+
+	sc->sc_flags |= context_bit;
+
+	error = msleep(ident, &(sc->sc_mtx), PRIBIO|PCATCH, "ums_sleep", 0);
+
+	sc->sc_flags &= ~context_bit;
+
+	if (sc->sc_flags & UMS_FLAG_CLOSING) {
+	    wakeup(&(sc->sc_wakeup_sync_1));
+	    error = EINTR;
+	}
+	return error;
+}
+
+static void
+ums_reset_buf(struct ums_softc *sc)
+{
+	struct usbd_mbuf *m;
+
+	/* reset read queue */
+
+	while(1) {
+	    USBD_IF_DEQUEUE(&(sc->sc_rdq_used), m);
+
+	    if (m) {
+	      USBD_IF_ENQUEUE(&(sc->sc_rdq_free), m);
+	    } else {
+	      break;
+	    }
+	}
+	return;
+}
+
+static int
+ums_open(struct cdev *dev, int flag, int fmt, struct thread *td)
+{
+	struct ums_softc *sc = DEV2SC(dev);
+	int error = 0;
+
+	DPRINTF(1, "\n");
+
+	if (sc == NULL) {
+	    return EIO;
+	}
+
+	mtx_lock(&(sc->sc_mtx));
+
+	/* check flags */
+
+	if (sc->sc_flags & 
+	    (UMS_FLAG_DEV_OPEN|UMS_FLAG_GONE)) {
+	    error = EBUSY;
+	    goto done;
+	}
+
+	/* reset buffer */
+
+	ums_reset_buf(sc);
+
+	/* reset status */
+
+	sc->sc_status.flags = 0;
+	sc->sc_status.button = 0;
+	sc->sc_status.obutton = 0;
+	sc->sc_status.dx = 0;
+	sc->sc_status.dy = 0;
+	sc->sc_status.dz = 0;
+	/* sc->sc_status.dt = 0; */
+
+	/* start interrupt transfer */
+
+	usbd_transfer_start(sc->sc_xfer[0]);
+
+	sc->sc_flags |= UMS_FLAG_DEV_OPEN;
+
+ done:
+	mtx_unlock(&(sc->sc_mtx));
+
+	return error;
+}
+
+static int
+ums_close(struct cdev *dev, int flag, int fmt, struct thread *td)
+{
+	struct ums_softc *sc = DEV2SC(dev);
+	int error;
+
+	DPRINTF(1, "\n");
+
+	if (sc == NULL) {
+	    return EIO;
+	}
+
+	mtx_lock(&(sc->sc_mtx));
+
+	if (sc->sc_flags & UMS_FLAG_CLOSING) {
+	    goto done;
+	}
+
+	if (sc->sc_flags & UMS_FLAG_DEV_OPEN) {
+
+ 	    sc->sc_flags |= UMS_FLAG_CLOSING;
+
+	    /* stop transfers */
+
+	    if (sc->sc_xfer[0]) {
+	        usbd_transfer_stop(sc->sc_xfer[0]);
+	    }
+
+	    if (sc->sc_xfer[1]) {
+	        usbd_transfer_stop(sc->sc_xfer[1]);
+	    }
+
+	    /* stop callout */
+
+	    __callout_stop(&(sc->sc_callout));
+
+	    while (sc->sc_flags &
+		   (UMS_FLAG_RD_SLP|UMS_FLAG_RD_WUP)) {
+
+	        if (sc->sc_flags &   UMS_FLAG_RD_WUP) {
+		    sc->sc_flags &= ~UMS_FLAG_RD_WUP;
+		    wakeup(&(sc->sc_wakeup_read));
+		}
+
+		error = msleep(&(sc->sc_wakeup_sync_1), &(sc->sc_mtx), 
+			       PRIBIO, "ums_sync_1", 0);
+	    }
+
+	    if (sc->sc_flags &   UMS_FLAG_SELECT) {
+	        sc->sc_flags &= ~UMS_FLAG_SELECT;
+		selwakeup(&(sc->sc_read_sel));
+	    }
+
+	    sc->sc_flags &= ~(UMS_FLAG_DEV_OPEN|
+			      UMS_FLAG_CLOSING);
+	}
+
+ done:
+	mtx_unlock(&(sc->sc_mtx));
+
+	DPRINTF(0, "closed\n");
+
+	return 0;
+}
+
+static int
+ums_read(struct cdev *dev, struct uio *uio, int flag)
+{
+	struct ums_softc *sc = DEV2SC(dev);
+	struct usbd_mbuf *m;
+	int error = 0;
+	int io_len;
+
+	if (sc == NULL) {
+	    return EIO;
+	}
+
+	DPRINTF(1, "\n");
+
+	mtx_lock(&(sc->sc_mtx));
+
+	if (sc->sc_flags & (UMS_FLAG_CLOSING|UMS_FLAG_GONE|
+			    UMS_FLAG_RD_SLP)) {
+		error = EIO;
+		goto done;
+	}
+
+	while (uio->uio_resid) {
+
+	    USBD_IF_DEQUEUE(&(sc->sc_rdq_used), m);
+
+	    if (m == NULL) {
+
+	        /* start reader thread */
+
+	        usbd_transfer_start(sc->sc_xfer[0]);
+
+		if (flag & O_NONBLOCK) {
+		    error = EWOULDBLOCK;
+		    goto done;
+		}
+
+	        error = ums_msleep(sc, (UMS_FLAG_RD_SLP|UMS_FLAG_RD_WUP), 
+				   &(sc->sc_wakeup_read));
+		if (error) {
+		    break;
+		} else {
+		    continue;
+		}
+	    }
+
+	    io_len = min(m->cur_data_len, uio->uio_resid);
+
+	    DPRINTF(1, "transfer %d bytes from %p\n", 
+		    io_len, m->cur_data_ptr);
+
+	    error = ums_uiomove(sc, UMS_FLAG_RD_SLP, m->cur_data_ptr, 
+				io_len, uio);
+
+	    m->cur_data_len -= io_len;
+	    m->cur_data_ptr += io_len;
+
+	    if (m->cur_data_len == 0) {
+	        USBD_IF_ENQUEUE(&sc->sc_rdq_free, m);
+	    } else {
+	        USBD_IF_PREPEND(&sc->sc_rdq_used, m);
+	    }
+
+	    if (error) {
+	       break;
+	    }
+	}
+
+ done:
+	mtx_unlock(&(sc->sc_mtx));
+
+	return error;
+}
+
+static int
+ums_poll(struct cdev *dev, int events, struct thread *td)
+{
+	struct ums_softc *sc = DEV2SC(dev);
+	struct usbd_mbuf *m;
+	int32_t revents = 0;
+
+	if (sc == NULL) {
+	    return POLLNVAL;
+	}
+
+	DPRINTF(1, "\n");
+
+	mtx_lock(&(sc->sc_mtx));
+
+	if (sc->sc_flags & (UMS_FLAG_CLOSING|UMS_FLAG_GONE)) {

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605311613.k4VGD8CI008476>