D51605.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51605.diff
View Options

	diff --git a/sys/dev/hid/hidquirk.h b/sys/dev/hid/hidquirk.h
	--- a/sys/dev/hid/hidquirk.h
	+++ b/sys/dev/hid/hidquirk.h
	@@ -50,6 +50,7 @@
	HQ(IS_XBOX360GP), /* device is XBox 360 GamePad */ \
	HQ(NOWRITE), /* device does not support writes */ \
	HQ(IICHID_SAMPLING), /* IIC backend runs in sampling mode */ \
	+ HQ(NO_READAHEAD), /* Disable interrupt after one report */\
	\
	/* Various quirks */ \
	HQ(HID_IGNORE), /* device should be ignored by hid class */ \
	diff --git a/sys/dev/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c
	--- a/sys/dev/usb/input/usbhid.c
	+++ b/sys/dev/usb/input/usbhid.c
	@@ -114,6 +114,7 @@
	void *cb_ctx;
	int waiters;
	bool influx;
	+ bool no_readahead;
	};

	struct usbhid_softc {
	@@ -272,7 +273,7 @@
	sc->sc_intr_handler(sc->sc_intr_ctx, xfer_ctx->buf,
	xfer_ctx->req.intr.actlen);

	- return (0);
	+ return (xfer_ctx->no_readahead ? ECANCELED : 0);
	}

	static int
	@@ -430,6 +431,7 @@
	.cb = usbhid_intr_handler_cb,
	.cb_ctx = sc,
	.buf = sc->sc_intr_buf,
	+ .no_readahead = hid_test_quirk(&sc->sc_hw, HQ_NO_READAHEAD),
	};
	sc->sc_xfer_ctx[POLL_XFER(USBHID_INTR_IN_DT)] = (struct usbhid_xfer_ctx) {
	.req.intr.maxlen =