From nobody Wed Mar 2 23:36:38 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 821F019F8423; Wed, 2 Mar 2022 23:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K89Vt6wNnz3wPq; Wed, 2 Mar 2022 23:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646264199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iwmE1Fh/YMj/HkU6JBgyLZcITTruytXeFApD//ZzNOc=; b=ZIn20pDl0vWzdGIkrdIpF8+Ct9IM+JeIDABdYeO/9omvOtM6s1TyVpKEfJi8DgzB9ePuyo I/oSMaH95rym/zmFfiFB4dUucoqcN7Z9xsxIlWpjMHaLucCSBpK7IBR7mYLb61+B3d2xYM 4wo7LotEfH8q3GLTLqkcxvFxFUlwOSm0IrAmw3Adb0DRs7mIfRqjQfqySkpToq1WodezKk BmTd5zeqTHoXxeCduGHKNzI/MM5G/zylZjKHwWDQYvPsX6StMI4NHl9jZ1UtDlMy9ghcmb fz+Pf7yFry8Mg3GBgtDziHkLyTGi2tT9C02e4HosEqtWiyfSjtDIzU0T5UI8eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AEFFE5021; Wed, 2 Mar 2022 23:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 222NacwE001575; Wed, 2 Mar 2022 23:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222NacHn001574; Wed, 2 Mar 2022 23:36:38 GMT (envelope-from git) Date: Wed, 2 Mar 2022 23:36:38 GMT Message-Id: <202203022336.222NacHn001574@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 82e38b012cc8 - main - usbhid(4): Implement USB_REQUEST command in hid_ioctl method List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82e38b012cc832651ba195f5443e7f9fb64ce5d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646264199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iwmE1Fh/YMj/HkU6JBgyLZcITTruytXeFApD//ZzNOc=; b=gOBfBimoMy06FhPI2u/UBuAso6vmRB0eIy4i0iQ4+MVEeBYiG0//S7b34Gme9R7zlN9GuN jUziXWYpb4kpRxmkzQyRC7YBkECWZT902gHanqsLIw95JgCO1toaxS9Hk0LOy1+c8QcdjC AK8hSkgS2Y+elSVY4vTCBW8+JNhLgh5sG7IJjf0JEv1dANgD38ZHpRJ5VvflFQd5O2hSu3 Ca8LExZLaET1PMxM6DntYPIm78Zw6S9QuYTc5HIIgYSPBHkrtRm234M3jAGIKwbVeGhMpB S3Y/5IpwjoXwFNg/npI6ISCnUMajK4xVmseiuipVaCTvDrZUaQz/DHDr69zO3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646264199; a=rsa-sha256; cv=none; b=wA0bJkDmzQnhZRkv+jT3+gJqUwE4wcrIwvVp5W5SpLZVLQkQVpgSCJVGF1Os9OI844vobD Q1UOR55a39sVh7q9oDdClZCxrV5iUTLX3xINHq4Jqq618Y5VVSxyjKj/MC4vxNSi5zHeGX I67tTcx195w0n6Da5S/NkB48KRHzKU1GGaFI3G2JCoGDKS8magf+ynpdn0KQoQqK4ybJR8 vYtXZuPwAwq/fxW1lrmuXpitei+zvVgMFLVdXap8+rfeGGo+n+hyN/oYxay8BTC+TILYgo Uxdih6oAgwY4YJfD+GsMWCZ5Tdx706rvxNuAGhl4b8D39+wq63gUfOgCR23bWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=82e38b012cc832651ba195f5443e7f9fb64ce5d3 commit 82e38b012cc832651ba195f5443e7f9fb64ce5d3 Author: Vladimir Kondratyev AuthorDate: 2022-03-02 23:35:23 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-03-02 23:35:23 +0000 usbhid(4): Implement USB_REQUEST command in hid_ioctl method This command is intended to be compatible with USB_REQUEST ioctl. It is required to perform arbitrary control endpoint requests by device drivers which can switch between HID and native non-HID modes. MFC after: 2 month --- sys/dev/usb/input/usbhid.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sys/dev/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c index c6f2a1f24303..ed76f6291a11 100644 --- a/sys/dev/usb/input/usbhid.c +++ b/sys/dev/usb/input/usbhid.c @@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define USB_DEBUG_VAR usbhid_debug #include @@ -677,6 +678,35 @@ usbhid_set_protocol(device_t dev, uint16_t protocol) return (usbhid_sync_xfer(sc, USBHID_CTRL_DT, &req, NULL)); } +static int +usbhid_ioctl(device_t dev, unsigned long cmd, uintptr_t data) +{ + struct usbhid_softc* sc = device_get_softc(dev); + struct usb_ctl_request *ucr; + union usbhid_device_request req; + int error; + + switch (cmd) { + case USB_REQUEST: + ucr = (struct usb_ctl_request *)data; + req.ctrl = ucr->ucr_request; + error = usbhid_xfer_check_len( + sc, USBHID_CTRL_DT, UGETW(req.ctrl.wLength)); + if (error) + break; + + error = usbhid_sync_xfer( + sc, USBHID_CTRL_DT, &req, ucr->ucr_data); + if (error == 0) + ucr->ucr_actlen = UGETW(req.ctrl.wLength); + break; + default: + error = EINVAL; + } + + return (error); +} + static void usbhid_init_device_info(struct usb_attach_arg *uaa, struct hid_device_info *hw) { @@ -848,6 +878,7 @@ static device_method_t usbhid_methods[] = { DEVMETHOD(hid_set_report, usbhid_set_report), DEVMETHOD(hid_set_idle, usbhid_set_idle), DEVMETHOD(hid_set_protocol, usbhid_set_protocol), + DEVMETHOD(hid_ioctl, usbhid_ioctl), DEVMETHOD_END };