Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/usb further tweaks for USB_PRODUCT_MICROSOFT_24GHZ_X...
details: https://anonhg.NetBSD.org/src/rev/dfad46bae277
branches: trunk
changeset: 1009083:dfad46bae277
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Sun Apr 12 07:41:11 2020 +0000
description:
further tweaks for USB_PRODUCT_MICROSOFT_24GHZ_XCVR80 from PR kern/55161
remove case for USB_PRODUCT_MICROSOFT_24GHZ_XCVR70, likely needs similar
tweaks and can't really be added untested
diffstat:
sys/dev/usb/ums.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diffs (51 lines):
diff -r 089fcf021a87 -r dfad46bae277 sys/dev/usb/ums.c
--- a/sys/dev/usb/ums.c Sun Apr 12 07:16:09 2020 +0000
+++ b/sys/dev/usb/ums.c Sun Apr 12 07:41:11 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.97 2020/04/11 06:57:32 jdolecek Exp $ */
+/* $NetBSD: ums.c,v 1.98 2020/04/12 07:41:11 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.97 2020/04/11 06:57:32 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.98 2020/04/12 07:41:11 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -164,6 +164,7 @@
if (uha->uiaa->uiaa_vendor == USB_VENDOR_MICROSOFT) {
int fixpos;
+ int woffset = 8;
/*
* The Microsoft Wireless Laser Mouse 6000 v2.0 and the
* Microsoft Comfort Mouse 2.0 report a bad position for
@@ -173,11 +174,13 @@
switch (uha->uiaa->uiaa_product) {
case USB_PRODUCT_MICROSOFT_24GHZ_XCVR10:
case USB_PRODUCT_MICROSOFT_24GHZ_XCVR20:
- case USB_PRODUCT_MICROSOFT_24GHZ_XCVR70:
- case USB_PRODUCT_MICROSOFT_24GHZ_XCVR80:
case USB_PRODUCT_MICROSOFT_NATURAL_6000:
fixpos = 24;
break;
+ case USB_PRODUCT_MICROSOFT_24GHZ_XCVR80:
+ fixpos = 40;
+ woffset = sc->sc_ms.hidms_loc_z.size;
+ break;
case USB_PRODUCT_MICROSOFT_CM6000:
fixpos = 40;
break;
@@ -192,7 +195,7 @@
if ((sc->sc_ms.flags & HIDMS_W) &&
sc->sc_ms.hidms_loc_w.pos == 0)
sc->sc_ms.hidms_loc_w.pos =
- sc->sc_ms.hidms_loc_z.pos + 8;
+ sc->sc_ms.hidms_loc_z.pos + woffset;
}
}
Home |
Main Index |
Thread Index |
Old Index