From nobody Mon Feb 27 14:40:47 2023 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 4PQNTW2bVtz3vBlw; Mon, 27 Feb 2023 14:40:47 +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 4PQNTW28H2z3HyY; Mon, 27 Feb 2023 14:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677508847; 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=WKGbx8WJHa1ApDVOwwzXIECyosouAYyihdWF2M7tUAM=; b=uQe6npwkdiQWwZJCYMkREez5Q332SdMtfp9mkftWWCiKzX1o6+ubNP/SvRczzi6I9iJyEo XSP/PT2TgprLQFusf5XvRtQ0zlIt0f6DjEVr4kPN8qFqA5hl/mAVHqmjgqh+L6DIPEvWvQ Q9L5eyS3FLFgsy5HuEJegHPgh/Sr3+w60FvpSoD1OjjgC3roglQwlC5IJAfLdPTo63V+VP YgxrmPK2JryDjiyjnb8v3AXUxHuYCda2Aelwj0A1Q/aXBrj0Gw1sdB2j6/ZfwpwYXr+sX2 XTckFja7h9KK1bhegy1weGqbyLHRRGkhhvwDDQGsMSZhfeanNlhldHx2ml8SrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677508847; 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=WKGbx8WJHa1ApDVOwwzXIECyosouAYyihdWF2M7tUAM=; b=I28ZeKQ4MQW4mT9zqXY37Z6dUPvk6WGazMxkaJN9Sy0eL+siufn6cx8dr8274kL93R/b9E kSLQlsBtIr1qRasTMSp2F3InoG/er4JXK2KahAINz18q2zDCoqOPJqZEfzX/QwD9XujYPN 1NE0Oa0t+xrXReBP6FaK9ot2b126vZFHhVabhSbIYdw11+WYm/D+uj2mHdDzmUVN4GGNo9 TCK3l2Ym0l0bl1p8fFikjGLOw/as+Ddmvi2CrTKHGZgBYLngEx/aszQFb8RJHfz8SvYwkE o/qX4Eukl8HwpKNidKLyqttMl4DQzYg3cJqANm6EAbSJA4vL8N8LF46EmBjb+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677508847; a=rsa-sha256; cv=none; b=ouAesTZCl0YB9JYFypVoBh8UoMr0i7v/nOG3bc8HG8EGmsJJ/ipv9Oy/B7jxlB+10WWz+p 9vRiSk3MB4QM+smTqmzxyZoujy/9qJ4RjySwx3mxsveL+uO4e+HGIK831mz8wWLfqaJXN1 lYnH85pjH2OWyMOUA9VRbWHJjnPJ2v3lKDOA0kXTTVXNPk5Lj0GGXOu4QONP9a/yohbE6D 6D25QKKOHqAG/3ytBBILv0Yt0JCph6EwVQF7tz9NizKVvFpswl1yCKY9UrTDyadE0Pt2o/ oF18JVrEKq2ZixHIyvWT7Zj4ocgHFjpkGvRw+Q2yefqICQXT721dJvS6eNhavw== 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 4PQNTW1BkkzVMr; Mon, 27 Feb 2023 14:40:47 +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 31REels2080059; Mon, 27 Feb 2023 14:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31REelGN080058; Mon, 27 Feb 2023 14:40:47 GMT (envelope-from git) Date: Mon, 27 Feb 2023 14:40:47 GMT Message-Id: <202302271440.31REelGN080058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cd29688e8ec5 - main - kbdreg.h: include opt_kbd.h 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd29688e8ec55a45cda1a5620dfc9b3ba297c0c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cd29688e8ec55a45cda1a5620dfc9b3ba297c0c1 commit cd29688e8ec55a45cda1a5620dfc9b3ba297c0c1 Author: Warner Losh AuthorDate: 2023-02-27 14:27:45 +0000 Commit: Warner Losh CommitDate: 2023-02-27 14:37:32 +0000 kbdreg.h: include opt_kbd.h This is a kernel-only file, so it's safe to include opt_kbd.h. However, add #ifdef _KERNEL guards to emphasize that. And also move the include of opt_kbd.h in atkbdcreg.h to inside the kernel guards. Nothing outside the kernel in tree uses the rest of that file, but I'm less comfortable moving the #ifdef _KERNEL to the top of that file. Sponsored by: Netflix --- sys/dev/atkbdc/atkbdcreg.h | 4 ++-- sys/dev/kbd/kbdreg.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h index 956861b657d6..c0bfbf27a880 100644 --- a/sys/dev/atkbdc/atkbdcreg.h +++ b/sys/dev/atkbdc/atkbdcreg.h @@ -36,8 +36,6 @@ #ifndef _DEV_ATKBDC_ATKBDCREG_H_ #define _DEV_ATKBDC_ATKBDCREG_H_ -#include "opt_kbd.h" /* Structures depend on the value if KBDIO_DEBUG */ - /* constants */ /* I/O ports */ @@ -145,6 +143,8 @@ #ifdef _KERNEL +#include "opt_kbd.h" /* Structures depend on the value if KBDIO_DEBUG */ + #define ATKBDC_DRIVER_NAME "atkbdc" /* diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h index 2839e259420d..822af48c932b 100644 --- a/sys/dev/kbd/kbdreg.h +++ b/sys/dev/kbd/kbdreg.h @@ -31,6 +31,10 @@ #ifndef _DEV_KBD_KBDREG_H_ #define _DEV_KBD_KBDREG_H_ +#ifdef _KERNEL + +#include "opt_kbd.h" /* KBD_DELAY* */ + /* forward declarations */ typedef struct keyboard keyboard_t; struct keymap; @@ -411,4 +415,5 @@ int genkbd_commonioctl(keyboard_t *kbd, u_long cmd, caddr_t arg); int genkbd_keyaction(keyboard_t *kbd, int keycode, int up, int *shiftstate, int *accents); +#endif #endif /* !_DEV_KBD_KBDREG_H_ */