From nobody Sun Nov 03 17:45:11 2024 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 4XhMSR4MtBz5cWk2; Sun, 03 Nov 2024 17:45:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhMSR3cjCz4hWV; Sun, 3 Nov 2024 17:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730655911; 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=kwxcj4bv3rQKo3QGqDojbr2fbHxw495unetIv5jS1Qs=; b=U4ApVTQpejfy4U+ETUUF24zrsga3UwkfJq/54s/wAjZGQYcDB2y9dKqvOC0W1zX9UJtwbT WU6t7FUxKx6+KmabnWmFy3w2ztdYuafUEx96FeAe9YSS7NzBgU7xTObFcomncWRlal39jb 24IejlSY2Rx7q0QtwTsBIbhLVDoOTc2klvkuPf7jhVDarz/xVLxgUujJ1q3lHWYBQ33cLu 7E1728O4qHnUTzgi2ioXhUAfOU9omp80+SrJbEOS3jD1vZnkz+ajTwqvXTUvaJy8szcSph vZJIlvdJ6UjMoAEgfS1ACa7Eic3zMNHjhwLGQ6sw5mc9T9ZAarBaOfiHanTQjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730655911; 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=kwxcj4bv3rQKo3QGqDojbr2fbHxw495unetIv5jS1Qs=; b=P18g2MoxhyqVC1zrnimYMS1EAAvimJNL40x0uJalc6OKJ4TZsiIheFXbVN7XX/39GJ5Ic9 KQv01iYFq4/3Sopx/vfLn7xxp8uhpKN8HCHXOHZVpZeWB0gRDbmVTUz/wJWGpEC1lVJ9WQ eK7tUCf8epfK/cnCtnH02PZbhcS18i+vl0R1c6ghiR6k7teoHVL6MTbdpR9m4LSbHY14rG 37wqua7SrizOiHQ6uOnxndl+lMq+tD/NLQbZnZUTxJ/NQUFzvS4jYZgUMvDbD9no2Rdqzs UHxXv5pibkMbly0Rmjbd33XWb4wdcmagKNxzzCutZIlmQPFb8qOuyFcmp69ALQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730655911; a=rsa-sha256; cv=none; b=ZWyQjMJ8jOLQVhRS5Y2CnX5TeSnXF5byx5v+czMJsgQrUciUvFT75GonpQ5wgJANAIjUPY uRKEato1MprwAXupLB7eFPOHlbDslk/TY1gsGT78crHbllNuFEn0TnGuWDwF9QszVOHhx1 gjqjM/iDL4Nxjw4WizzO9kkwvnBKhDOOcl/+7QF8NRJ9y5X5I8mD6Zg1q5oWiVKoOkyBLU t+4j201rSg7ekxm9hVOJkCMYsnFD9jNu7+tfRdcnuk0VeRpIBMXhBsI/e/mQgfK1XkhX/g rLkzh424jRLyiPiWqRwIz5723SnDGOxOel+2BTIsUKwx8C0afaeI7wVQYFPc1g== 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 4XhMSR35cPzyss; Sun, 3 Nov 2024 17:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A3HjBET004107; Sun, 3 Nov 2024 17:45:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3HjBLu004104; Sun, 3 Nov 2024 17:45:11 GMT (envelope-from git) Date: Sun, 3 Nov 2024 17:45:11 GMT Message-Id: <202411031745.4A3HjBLu004104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 761088364c96 - stable/13 - kbdcontrol: correct bell frequency for vt(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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 761088364c96ba9af8e6417336c677f98f90b2b1 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=761088364c96ba9af8e6417336c677f98f90b2b1 commit 761088364c96ba9af8e6417336c677f98f90b2b1 Author: Ed Maste AuthorDate: 2024-09-26 23:55:33 +0000 Commit: Ed Maste CommitDate: 2024-11-03 17:44:49 +0000 kbdcontrol: correct bell frequency for vt(4) Do the `1193182 / pitch` hack only for sc(4). PR: 281713 Reported by: Rudolf Polzer Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46803 (cherry picked from commit f65c19a242de322930f6a1cd7d5e6bf3ce19ce42) (cherry picked from commit 2234362780854c426395a35403ed3dce42ccacc9) --- usr.sbin/kbdcontrol/kbdcontrol.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index b08705481a5d..2d2110ef5c9c 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.c +++ b/usr.sbin/kbdcontrol/kbdcontrol.c @@ -1037,8 +1037,10 @@ badopt: warnx("argument to -b must be duration.pitch or [quiet.]visual|normal|off"); return; } - if (pitch != 0) - pitch = 1193182 / pitch; /* in Hz */ + if (!is_vt4()) { + if (pitch != 0) + pitch = 1193182 / pitch; /* in Hz */ + } duration /= 10; /* in 10 m sec */ }