From nobody Wed Apr 22 20:08:10 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 4g19JV4RB1z6bDq5 for ; Wed, 22 Apr 2026 20:08:10 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g19JV1hlnz3LX5 for ; Wed, 22 Apr 2026 20:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776888490; 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=gWFmC2kda8mth9rbH1QZ5OtOArUkBXGO+7xPqQMUQec=; b=U/DqALvFf1MKW5w6N2eyX7yBGMrIz7ID0ZRA0MfVDXdZopN0LNYihea9FdP419jGbKZjpB sfUvuDlQ8WcwIwQMv7yxsHTyFln8qqXT7fBRSUXySTXzXQmpYDnNh3m/7zJoPc70ue/Rd+ LVoMAeHN0SCLF3SqTPgkmpD5iIHjb2MKVhTQpnZiHoCnEHmjJfzPHCTFbNxiYch1GI9RwH 3JCAM7RWepstCR1MCx8bzIL95pglXXsWYhGq5Gp/5YIcyAZ6r/uv9KPAwB9lMboE9d4aYr 4nmhTAV6SjbejHhzEw8y3iQMgUEDzALshJZmTIHlkBut5ry4C0Bzph+KgMLboA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776888490; a=rsa-sha256; cv=none; b=OKwoTGYJgXZI7Hl6TmCVLV+6OmEYgksadBnlSFB/2Ytxp55sWkDYDdSTkE3MTm46KJIk2o qibQRyWhRgbTaWv4pteFcdQsvQHowUhkqHMD8G1r3ombvn2XL5DbD1J9ngT5HtBwaWgcrn 55mr9lIv2MkstoDUzhubA4MFqBDKgG9A5nVnv6Kdu0S6P9kQXA8oVNA61CAx+4cDG7DY4F rbywyrDWLomHUWOXnPpj3Q9K58hjtMF/N+KmaJAZ92zm1D27UjwruJFCU7ejWjrupqrC46 req3NX0aV6yL7ryB7QNtfvGZPAa5BnLLntZhFs2A03Nvs83pVhS0s2k8S7TpuA== 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=1776888490; 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=gWFmC2kda8mth9rbH1QZ5OtOArUkBXGO+7xPqQMUQec=; b=SwyW+ABeJw3+2c/NebC2ERUXceun8libPf+Xdfl28zNhshJo7daY1/VUR8hxhL4KO8JJar VhMYAdngvuylI4BLb2Ct0eYLwXFMVgHhFjYgX6UcoJkilh8VnanjmVJBfaTg4VDALpLNba 7JFrNxNlAZYiDmunRgxyhTbxaMoCBRMmRPPN9/JsWpFWqZ4EUm2egJZO3+7XeAvd3PhlOC bi26n5634CnFDg3Fj5rrVZ+bzxyEVgsjMOm41I4DDozkO41Ppzj4pMLgTDXIa3G+KVXsU9 bID6VvsUEA1+l7k2eh/NKHNLYBHykyY764dHMnYzG40pROJlShWTzahnsU0+Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g19JV1F2WzlqM for ; Wed, 22 Apr 2026 20:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f671 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 20:08:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Toby Slight From: Vladimir Kondratyev Subject: git: fec425a2a8b7 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: fec425a2a8b77d1367d03136a373efec1b671a34 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 20:08:10 +0000 Message-Id: <69e92aaa.1f671.f97ad1e@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=fec425a2a8b77d1367d03136a373efec1b671a34 commit fec425a2a8b77d1367d03136a373efec1b671a34 Author: Toby Slight AuthorDate: 2026-03-29 13:16:57 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-04-22 19:59:03 +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 (cherry picked from commit 920ad3cef178c9bea37c0d07c22440828a5cb7c8) --- 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"