From nobody Tue Nov 05 04:20:29 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 4XjFW12KRVz5d01p; Tue, 05 Nov 2024 04:20:29 +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 4XjFW11kqKz4GqW; Tue, 5 Nov 2024 04:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780429; 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=vFZFRdUCbx8HrBBGMzqa82eiWiubausYjOTobmkMyfY=; b=xV+9yOpc+s0BsU+EqdtMd3KcopcRAStjvTZELWQwO69qB9Gb9og7T5VwXSWRBI7/nCGMbl sWEQCVeXnTXFQwhVr8YXuF6UPOSB+SbXFz8ScTLBRCPvKLEG2Bme2skdnjWGwQkbFwufGs E+QmRcF56AfaMa8t81oK9Tuwuf9a7Ulsg8ZJy6t7izYgbUW8ooiBVMG2rGGUFQTRMJu2Mf p7EynAmVYOu9Q5HxSb+IOYR/OQP7aB9+W3hZhtSVcxH+NWpl9a5Im584ZFTSNAWdGQEnQL AaGd6swT2fnbSlgiMkmkP8XyHHg3Ylleio0+S+hVPyh1ZEJf1rdMOgOvngqBbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780429; 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=vFZFRdUCbx8HrBBGMzqa82eiWiubausYjOTobmkMyfY=; b=FRTXCsTA5YbJrJBbYM9psRm+F93j8eHHOKVFkBY1aDwob2nGpGb2uHyfb71EovbjP49LhC 9BeG2BFQ3mJ7mhiOxaqcpY497C+czWyUww+4dBcP0KKy7E+YdTGQM9oLOLVmoy6uwtobod OPVqKzAOpqYaWREt1fk9Hy/zNdCAjPupbC2mZYMQJIJBYW+juqCMGVPPmlDe+lEIrns2X1 xH0kRXQFDVfmLJlLwkpodkIJdiGUX30BSOtV7EIatB8k0M+xRVIXNRN1VsWU3nOhyYGpbp d6G+j7QRwiTtX8/IvftVWKZnOd1P0bGuxsRM0iwmipuBWWt4JoAC3d4A1J+JPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730780429; a=rsa-sha256; cv=none; b=Skseb5FrOBd3W/B0TzFu6LsGHUm0crOmyY8SzsjCVEz6nnt+SP12K0/r2LMorqEM5fTgRy 6yS6ec1fKbDXbfrRU1UHDQ6kw0yoKR70jWm62WehIxWRTx2fXl5t2cEK2n/drWtdJOPzXN 859l4LY7Ba68WghLIPIiS8PO4juM6fp/zgpDFZZ8moPjrkUTA2iLe1gwscHln3YZoBo1d1 lhpW4nRNyxp4WaOQcZj4WkcfssBdMIqyiY6+w6UTci3inQJR7MpIGcUsHFCdTwX/q5ZoLE maq7BSz+8ps80vumE9+ZqsO7twxPWRMENIvasTVzGXsayL3NZSvRYzSHDNKtNQ== 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 4XjFW11Dbgz12gg; Tue, 5 Nov 2024 04:20:29 +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 4A54KT7U057905; Tue, 5 Nov 2024 04:20:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A54KTWD057901; Tue, 5 Nov 2024 04:20:29 GMT (envelope-from git) Date: Tue, 5 Nov 2024 04:20:29 GMT Message-Id: <202411050420.4A54KTWD057901@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: a752de91d015 - releng/14.2 - 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/releng/14.2 X-Git-Reftype: branch X-Git-Commit: a752de91d015b8e377757a6337b85ebdf39fb7d6 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a752de91d015b8e377757a6337b85ebdf39fb7d6 commit a752de91d015b8e377757a6337b85ebdf39fb7d6 Author: Ed Maste AuthorDate: 2024-09-26 23:55:33 +0000 Commit: Ed Maste CommitDate: 2024-11-05 04:19:13 +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) Approved by: re (cperciva) --- 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 e55165fd0888..9f8593990542 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.c +++ b/usr.sbin/kbdcontrol/kbdcontrol.c @@ -1038,8 +1038,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 */ }