From nobody Sun Nov 03 17:42:35 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 4XhMPS0p7Pz5cW3v; Sun, 03 Nov 2024 17:42:36 +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 4XhMPS04r0z4gZY; Sun, 3 Nov 2024 17:42:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730655756; 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=ZLhyOgRtL1VOGqiKzhQR8yogNMvBfbHd2FdGLXfFEl8=; b=kUrY7zLgNS9cYfBSb+leXKSaqddIG5uprmXPfF3rAwmj4FAjXTvd+rb9hG6gcGl1NwTnIj UzcFlrzQ3KT22yxAO+RMwAhA4educUk/qvmTKlttmxiBzPoYbC7TanICR1L3UEtGzqU5kV 6VLlEhA7NaC4w5GwPpyWAt33kMnLTg/SXINVmPd5yqAbPrTLZw8qTUN6luuJXQCx40td43 iHnv07Vzvw2OWBKctJqPPbAh0bcE8rCmkD99H24dBywXctVXnnCumhamRMrB9zJCu8XUPl F3x+6BDisWXS05ZqaVfSCpu2cS7c9FN8raS/cqIpOtRQlLWOrjOPHwzsKG4D7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730655756; 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=ZLhyOgRtL1VOGqiKzhQR8yogNMvBfbHd2FdGLXfFEl8=; b=oezfp6gn23e5OVQrirnh+9fSEavDTOMD4jRQpqyVugVx6FhwzuA3dL9xsW/+AdtRATTAq1 97jwm8u8qg1Vv4jwho5GFYiyKEavXg7smbKnGZnYCEfWDyhauX/XSft8KlfJVT5gDFQ0tR oK2YsI9iU8FgRPqWxxvCU0BQMFmz5SJmmN93PXZvh2S4kJ8/CdXrFQwo2snH9nyDa8j2Y/ P5x6vq+4BfxzlptLuW/q7W5/NuXCniXe29FOLRttKQOVluAwHwTL/X9nDuJkrgszfvgDpB TzfsMwPtJ+CA41R+PbjbzrcY+xkA9UfwM1dWHZI83hU6aGdf8l3ZxvHIf54Fbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730655756; a=rsa-sha256; cv=none; b=B1kW1vIlcmB7k55wzc9dTbJVbLEL+Q86CzeDqKMsR8TcKjIc9LptMEEZXsi2HarDyg79Ak qt/jvaqIwWd8D+LVRNixq9lW4TkTzkf9cigiuEl7kv79V5Eo066YlVA1UUcCUHY8XkiqOy Kqijo7eq947pud4QUH7K7d7Y+66NacJWW/kEAQjEGNaab9qYFu9BWKtjU/D8dzOFGQVoax IYklxRMSjruk/MlVu9Ro82pm2zZVduYD/twY4YmXAkJRlGRQdTj83g9MwRqWFipzNXCj6o J9nKQ2YRTub8BxgRDHhxnj/4xR2gXyi3XhrEY7L5IH1YauTKTcCBfW5vbNtPDw== 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 4XhMPR6p0yzySB; Sun, 3 Nov 2024 17:42:35 +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 4A3HgZq6003147; Sun, 3 Nov 2024 17:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3HgZKF003144; Sun, 3 Nov 2024 17:42:35 GMT (envelope-from git) Date: Sun, 3 Nov 2024 17:42:35 GMT Message-Id: <202411031742.4A3HgZKF003144@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: 223436278085 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 2234362780854c426395a35403ed3dce42ccacc9 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2234362780854c426395a35403ed3dce42ccacc9 commit 2234362780854c426395a35403ed3dce42ccacc9 Author: Ed Maste AuthorDate: 2024-09-26 23:55:33 +0000 Commit: Ed Maste CommitDate: 2024-11-03 16:57:18 +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) --- 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 */ }