From owner-dev-commits-src-all@freebsd.org Sun Apr 11 21:49:59 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E3BA5E003E; Sun, 11 Apr 2021 21:49:59 +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 4FJQWq283Yz4fcC; Sun, 11 Apr 2021 21:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2B2833894; Sun, 11 Apr 2021 21:49:59 +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 13BLnx60067471; Sun, 11 Apr 2021 21:49:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13BLnxi9067470; Sun, 11 Apr 2021 21:49:59 GMT (envelope-from git) Date: Sun, 11 Apr 2021 21:49:59 GMT Message-Id: <202104112149.13BLnxi9067470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 99bc385243e8 - stable/13 - hid: add opt_hid.h to modules that use HID_DEBUG 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 99bc385243e80406ccb504384132738023be182a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 21:49:59 -0000 The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=99bc385243e80406ccb504384132738023be182a commit 99bc385243e80406ccb504384132738023be182a Author: Vladimir Kondratyev AuthorDate: 2021-03-03 22:21:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2021-04-11 21:48:51 +0000 hid: add opt_hid.h to modules that use HID_DEBUG Submitted by: Greg V Reviewed by: imp, wulf MFC after: 1 week Differential revision: https://reviews.freebsd.org/D28995 (cherry picked from commit 6241b57131a60bc2bd0eda41c145aa9659c2886b) --- sys/dev/hid/hconf.c | 2 ++ sys/dev/hid/hkbd.c | 1 + sys/modules/hid/hconf/Makefile | 1 + sys/modules/hid/hkbd/Makefile | 2 +- sys/modules/hid/ps4dshock/Makefile | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/hid/hconf.c b/sys/dev/hid/hconf.c index cb0465e71b3e..90cd52d3116c 100644 --- a/sys/dev/hid/hconf.c +++ b/sys/dev/hid/hconf.c @@ -34,6 +34,8 @@ __FBSDID("$FreeBSD$"); * https://docs.microsoft.com/en-us/windows-hardware/design/component-guidelines/windows-precision-touchpad-required-hid-top-level-collections */ +#include "opt_hid.h" + #include #include #include diff --git a/sys/dev/hid/hkbd.c b/sys/dev/hid/hkbd.c index 89325f9b2499..775ad677f4de 100644 --- a/sys/dev/hid/hkbd.c +++ b/sys/dev/hid/hkbd.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf */ +#include "opt_hid.h" #include "opt_kbd.h" #include "opt_hkbd.h" #include "opt_evdev.h" diff --git a/sys/modules/hid/hconf/Makefile b/sys/modules/hid/hconf/Makefile index 1e5c68fe1848..0ac8d969cd71 100644 --- a/sys/modules/hid/hconf/Makefile +++ b/sys/modules/hid/hconf/Makefile @@ -4,6 +4,7 @@ KMOD= hconf SRCS= hconf.c +SRCS+= opt_hid.h SRCS+= bus_if.h device_if.h .include diff --git a/sys/modules/hid/hkbd/Makefile b/sys/modules/hid/hkbd/Makefile index 38221227d1cd..8bb1c339ac6c 100644 --- a/sys/modules/hid/hkbd/Makefile +++ b/sys/modules/hid/hkbd/Makefile @@ -4,7 +4,7 @@ KMOD= hkbd SRCS= hkbd.c -SRCS+= opt_evdev.h opt_kbd.h opt_hkbd.h +SRCS+= opt_hid.h opt_evdev.h opt_kbd.h opt_hkbd.h SRCS+= bus_if.h device_if.h .include diff --git a/sys/modules/hid/ps4dshock/Makefile b/sys/modules/hid/ps4dshock/Makefile index 688494f33ac6..ab46ba3f2363 100644 --- a/sys/modules/hid/ps4dshock/Makefile +++ b/sys/modules/hid/ps4dshock/Makefile @@ -4,6 +4,7 @@ KMOD= ps4dshock SRCS= ps4dshock.c +SRCS+= opt_hid.h SRCS+= bus_if.h device_if.h usbdevs.h .include