diff options
| author | joshua stein <jcs@cvs.openbsd.org> | 2014-02-06 16:43:05 +0000 |
|---|---|---|
| committer | joshua stein <jcs@cvs.openbsd.org> | 2014-02-06 16:43:05 +0000 |
| commit | 81dc57cd1a2a245ab981239d48c74ab770a4e3da (patch) | |
| tree | 6f3bdedb34960f99be88da33488404f9d6fb16f8 | |
| parent | 6c452f375a1f5cfc16968532bf43bae298562fbb (diff) | |
revert some HID changes that broke on older models
discussed with mpi@ and jung@
| -rw-r--r-- | sys/dev/usb/ubcmtp.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/sys/dev/usb/ubcmtp.c b/sys/dev/usb/ubcmtp.c index 65d3c4a5fbb..3b706d54512 100644 --- a/sys/dev/usb/ubcmtp.c +++ b/sys/dev/usb/ubcmtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubcmtp.c,v 1.4 2014/01/22 06:00:22 jcs Exp $ */ +/* $OpenBSD: ubcmtp.c,v 1.5 2014/02/06 16:43:04 jcs Exp $ */ /* * Copyright (c) 2013-2014, joshua stein <jcs@openbsd.org> @@ -599,6 +599,7 @@ ubcmtp_ioctl(void *v, unsigned long cmd, caddr_t data, int flag, struct proc *p) int ubcmtp_raw_mode(struct ubcmtp_softc *sc, int enable) { + usb_device_request_t r; usbd_status err; uint8_t buf[8]; @@ -606,8 +607,13 @@ ubcmtp_raw_mode(struct ubcmtp_softc *sc, int enable) if (sc->dev_type->type >= UBCMTP_TYPE3) return (0); - err = uhidev_get_report(&sc->sc_hdev, UHID_FEATURE_REPORT, buf, - UBCMTP_WELLSPRING_MODE_LEN); + r.bRequest = UR_GET_REPORT; + r.bmRequestType = UT_READ_CLASS_INTERFACE; + USETW2(r.wValue, UHID_FEATURE_REPORT, 0); + USETW(r.wIndex, 0); + USETW(r.wLength, UBCMTP_WELLSPRING_MODE_LEN); + + err = usbd_do_request(sc->sc_udev, &r, buf); if (err != USBD_NORMAL_COMPLETION) { printf("%s: %s: failed to get feature report\n", sc->sc_dev.dv_xname, __func__); @@ -618,8 +624,13 @@ ubcmtp_raw_mode(struct ubcmtp_softc *sc, int enable) buf[0] = (enable ? UBCMTP_WELLSPRING_MODE_RAW : UBCMTP_WELLSPRING_MODE_HID); - err = uhidev_set_report(&sc->sc_hdev, UHID_FEATURE_REPORT, buf, - UBCMTP_WELLSPRING_MODE_LEN); + r.bRequest = UR_SET_REPORT; + r.bmRequestType = UT_WRITE_CLASS_INTERFACE; + USETW2(r.wValue, UHID_FEATURE_REPORT, 0); + USETW(r.wIndex, 0); + USETW(r.wLength, UBCMTP_WELLSPRING_MODE_LEN); + + err = usbd_do_request(sc->sc_udev, &r, buf); if (err != USBD_NORMAL_COMPLETION) { printf("%s: %s: failed to toggle raw mode\n", sc->sc_dev.dv_xname, __func__); |