From nobody Sun Mar 29 13:17:45 2026 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 4fkFL23ghtz6X4FJ for ; Sun, 29 Mar 2026 13:17:46 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fkFL166Mmz3wSZ for ; Sun, 29 Mar 2026 13:17:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774790265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z3os/oUY0oxFgPJ25NpSBFPHocHOY+ULonnrX+mN2CU=; b=JAjSnxIzjqwCWuxFw2NKvfBVdmu8gwFz7Udd3txDDxVFyKzE8Ijx7Z+rTuEm8lR1u0Qx39 Ban1JiOrcvzt4RukDiDkVT70DoBZLpa5DhMiYIUwvUYA+ESc7RuwT5cn9EItMHPnNbj5uH JeUdMgvlVsXkVQD0AY7FqDp1H8iVkE394DhakzGoEBll9RwscvgQbUViqiZZ+lNMvHrxQN Ldltfrmau5QlvJOJleM8cksjCZXYy58ODwpWtXTzxD5YIBAmhFKHnYhw5a3xkGYMYKW7y9 Trs0TpR69GKDDIhUct/HqK/HWcjcVitUyr9topkU09NmIkNdipKXfgbOa+eL+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774790265; a=rsa-sha256; cv=none; b=BOOgGQhZ2gFm/Tn2PU+FMOhf2CTv+8p46hitUG2jt7xrLvJX9ztCMVKOrbek8osenXbWnW XnwGOGh3FbrjJ05EfRY2Hsnl18neuvgMWIyM0CXdNkfmto9TuUouKnxCFOmLnujHT+5VDT xMqchfnmgSQJXbra0HmNuelGgUbRJVG1prakkg/+m20zJQl+tmS35LvaTCn5AGakE/DWGr Aq73WTk3kpcxoAKtjy6Tl+dUhUcaoyRJx/Pomp5KplSW2Fv27iVtU+GsTbJKABjhN9aXIz Zq2JFMf0LIubbjdrQQ4JtsrOIsASR16rwzV8VENzyOTgU+M08WRDHgw9YTT1FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774790265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z3os/oUY0oxFgPJ25NpSBFPHocHOY+ULonnrX+mN2CU=; b=pOTzK7cJe6XAvhYQDuMwGvyX8JmnBCXNiCXSw36/D4U0Wj4As7pzEoosYjNMgQo5jSKQEI K/XL5+SU/67JCHXDKgpVn7oOSz68aRO6B2TNzKCnvq9E9sGV+w3JruddOUJp51Qb4soQke 948K8pgwe6BPyo/L1pGCxeD/vjS1ZjELGThTmuca3uCYPCtdfbo2TR2stwM7zfakG0FHrl ZvZByFscFIuIscXmIeZOW8+gd4TPGrpYbBb1AKM2/OEN4h0W7me/RGYT0NbQvXjIg21oYA af+R4TdU6cSWugNGMVOGCixo+Dxaxl2taX+nVn0gwcH0it00eXC7daOwToDMrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkFL14kW3z1CLK for ; Sun, 29 Mar 2026 13:17:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2107e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 29 Mar 2026 13:17:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Toby Slight From: Vladimir Kondratyev Subject: git: 920ad3cef178 - main - ukbd(4): make debug guard consistent with hkbd(4) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 920ad3cef178c9bea37c0d07c22440828a5cb7c8 Auto-Submitted: auto-generated Date: Sun, 29 Mar 2026 13:17:45 +0000 Message-Id: <69c92679.2107e.7413c022@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=920ad3cef178c9bea37c0d07c22440828a5cb7c8 commit 920ad3cef178c9bea37c0d07c22440828a5cb7c8 Author: Toby Slight AuthorDate: 2026-03-29 13:16:57 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-03-29 13:16:57 +0000 ukbd(4): make debug guard consistent with hkbd(4) Signed-off-by: Toby Slight Reviewed by: wulf MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1998 --- sys/dev/usb/input/ukbd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c index 37deb5c56fbd..7a33a9ad2efe 100644 --- a/sys/dev/usb/input/ukbd.c +++ b/sys/dev/usb/input/ukbd.c @@ -95,21 +95,23 @@ #ifdef USB_DEBUG static int ukbd_debug = 0; +#endif static int ukbd_no_leds = 0; static int ukbd_pollrate = 0; static int ukbd_apple_fn_mode = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, ukbd, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "USB keyboard"); +#ifdef USB_DEBUG SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, debug, CTLFLAG_RWTUN, &ukbd_debug, 0, "Debug level"); +#endif SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, no_leds, CTLFLAG_RWTUN, &ukbd_no_leds, 0, "Disables setting of keyboard leds"); SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, pollrate, CTLFLAG_RWTUN, &ukbd_pollrate, 0, "Force this polling rate, 1-1000Hz"); SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, apple_fn_mode, CTLFLAG_RWTUN, &ukbd_apple_fn_mode, 0, "0 = Fn + F1..12 -> media, 1 = F1..F12 -> media"); -#endif #define UKBD_EMULATE_ATSCANCODE 1 #define UKBD_DRIVER_NAME "ukbd"