diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-07-26 13:10:42 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-07-26 13:10:42 +0000 |
| commit | b5aa20823cf6253e8b5dec9b83e8b73c61a4dcef (patch) | |
| tree | 8e1756d6499c968d987beaef2ff82751a16e3302 /sys/dev/usb | |
| parent | 79d4bd393a24c415e07283e7f264ab50018b776b (diff) | |
If we recognize a specific mouse model where we need to override locator
information, do this after the locator information has been obtained.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/ums.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index 1cc22fc7791..c712d3e70e3 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ums.c,v 1.29 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: ums.c,v 1.30 2009/07/26 13:10:41 miod Exp $ */ /* $NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -158,7 +158,6 @@ ums_attach(struct device *parent, struct device *self, void *aux) void *desc; u_int32_t flags, quirks; int i, wheel, twheel; - struct hid_location loc_btn; sc->sc_hdev.sc_intr = ums_intr; sc->sc_hdev.sc_parent = uha->parent; @@ -269,7 +268,7 @@ ums_attach(struct device *parent, struct device *self, void *aux) /* figure out the number of buttons */ for (i = 1; i <= MAX_BUTTONS; i++) if (!hid_locate(desc, size, HID_USAGE2(HUP_BUTTON, i), - uha->reportid, hid_input, &loc_btn, 0)) + uha->reportid, hid_input, &sc->sc_loc_btn[i - 1], 0)) break; sc->nbuttons = i - 1; @@ -328,26 +327,21 @@ ums_attach(struct device *parent, struct device *self, void *aux) } printf("\n"); - for (i = 1; i <= sc->nbuttons; i++) - hid_locate(desc, size, HID_USAGE2(HUP_BUTTON, i), - uha->reportid, hid_input, - &sc->sc_loc_btn[i-1], 0); - #ifdef USB_DEBUG DPRINTF(("ums_attach: sc=%p\n", sc)); DPRINTF(("ums_attach: X\t%d/%d\n", - sc->sc_loc_x.pos, sc->sc_loc_x.size)); + sc->sc_loc_x.pos, sc->sc_loc_x.size)); DPRINTF(("ums_attach: Y\t%d/%d\n", - sc->sc_loc_y.pos, sc->sc_loc_y.size)); + sc->sc_loc_y.pos, sc->sc_loc_y.size)); if (sc->flags & UMS_Z) DPRINTF(("ums_attach: Z\t%d/%d\n", - sc->sc_loc_z.pos, sc->sc_loc_z.size)); + sc->sc_loc_z.pos, sc->sc_loc_z.size)); if (sc->flags & UMS_W) DPRINTF(("ums_attach: W\t%d/%d\n", - sc->sc_loc_w.pos, sc->sc_loc_w.size)); + sc->sc_loc_w.pos, sc->sc_loc_w.size)); for (i = 1; i <= sc->nbuttons; i++) { DPRINTF(("ums_attach: B%d\t%d/%d\n", - i, sc->sc_loc_btn[i-1].pos,sc->sc_loc_btn[i-1].size)); + i, sc->sc_loc_btn[i - 1].pos, sc->sc_loc_btn[i - 1].size)); } #endif |