From nobody Sun Nov 03 17:42:36 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 4XhMPT1nldz5cWC1; Sun, 03 Nov 2024 17:42:37 +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 4XhMPT161tz4gtQ; Sun, 3 Nov 2024 17:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730655757; 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=24xoVvWJQGPvvLwiFDtlZiaUs/yQnkoSinMg5P0b1lE=; b=Bwvbsx7lq2M4v9zBp6QbJ8w4B3qW6NCIfJr9IdhRbgshsONaRn3KM7jP1HWm/p1VOxIWpa d+SISMtZEeFax5JToBrg1bVbRZc+GuaAmIx/ryusgwDFMbvttLevA85C8AOI9nBBe87WXR 51lLdoZjpTFrmUYUQ6k5ZDiFIGvtAvauzXQmXP4j6WNu6DmN7ma8hgTduzwdiQyt2Wmbds gw4sgdBsHZ77ENyqzGB6BJ0PuOL/zmCRGGcJd1ZM8LGCK+TysZqlt5NGSBPRDBnPSogTjE 8QKFMWOknPO2Ob9TWNhN9bnRCLCeKoIdlmuF2AY/OC48v2aZbrr7yMVQF6XSVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730655757; 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=24xoVvWJQGPvvLwiFDtlZiaUs/yQnkoSinMg5P0b1lE=; b=f2VTHZVBulNFtRS3GzcIz4P0TzYW5h0CpCCtC8q3u6DOmWzUPdBGRIdhPN0+FTT9TYNled pp1+Ux+NFOeAZPQ/yxmnk/BJLHyeWcG0cHkKWL258ew+lMkZ3PiecsqiDgasnOINaKS8/4 9qOd1Dl02DWXRsReUi5lSdcWQYu33FfyYe2GPB9vxHJClzgc8dpAue7nvg1E4cR61GyiCp tMURpGAl1Ug5rD17duQM6j+NzWsz5XhGPcJf66TrHBMAn4pqCK5VyuRbIobnUdvhMfLe0o HeV4dNuB86bUGpqh/FeSNyBQ7UoyLkSdcJ+zU/RvgGTc0fFcRembDNN+uTE6zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730655757; a=rsa-sha256; cv=none; b=jIo9mBqoZQUsc0KBjOL5iQKbdEb491jvSh3cG9ntsPzgQuqXsi1HxXyfNa5NDS1KbrKryy 8qRuMn3goye4pIFYnmXFQE8ptLn2j4QoieevQKel+FuDQ05+ujusg3lcamtGQP35fx4ITS ZY9H+7l7DE09cxA69bT8Dk9IB+e0Q8UiVc/LIObeGSBOx9J6/wwB+vw1l2kWyHdKA8bnIh Fny4OQs6TJ5iAnvkOXeVXihF/TbWJbzAR86zIHL0CpadzyFRGUuAXqhBus6nC6Fh0k4RbG CSHjPm40+BPpeoPnd1yP5Cq/umDfB1aboEOyF1r5KvLGZyUv/d+h2pEiDmiEfA== 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 4XhMPT0jPbzysr; Sun, 3 Nov 2024 17:42:37 +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 4A3HgbRn003196; Sun, 3 Nov 2024 17:42:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3HgaTn003193; Sun, 3 Nov 2024 17:42:36 GMT (envelope-from git) Date: Sun, 3 Nov 2024 17:42:36 GMT Message-Id: <202411031742.4A3HgaTn003193@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: 1c9f1cb4f0a7 - stable/14 - vt: Fix frequency calcuation for bell 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: 1c9f1cb4f0a71bef37796a8ba139b86cc716ee88 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1c9f1cb4f0a71bef37796a8ba139b86cc716ee88 commit 1c9f1cb4f0a71bef37796a8ba139b86cc716ee88 Author: Warner Losh AuthorDate: 2021-11-03 21:55:55 +0000 Commit: Ed Maste CommitDate: 2024-11-03 16:57:19 +0000 vt: Fix frequency calcuation for bell 386BSD provided a MD function sysbeep. This took two arguments (pitch and period). Pitch was jammed into the PIT's divisor directly (which means the argument was expected to sound a tone at '1193182 / pitch' Hz). FreeBSD inherited this interface. In commit e46598588587 (svn 177642, Mar 26 2008), phk changed this function to take a tone to sound in hz. He converted all in-tree instances of 1193182 / hz to just hz (and kept the few misguided folks that passed hz directly unchanged -- this was part of what motivated the change). He converted the places where we pre-computed the 8254 divisor from being pitch to 1193182 / pitch (since that converts the divisor to the frequency and the interfaces that were exposed to userland exposed it in these units in places, continuing the tradition inherited from SCO System V/386 Unix in spots). In 2009, Ed Shouten was contracted by the FreeBSD Foundation to write / finish newcons. This work was done in perforce and was imported into subversion in user/ed/newcons in revision 199072 (https://svnweb.freebsd.org/base?view=revision&revision=199072) which was later imported into FreeBSD by ray@ (Aleksandr Rybalko). From that earliest import into svn import to this date, we ring the bell with: sysbeep(1193182 / VT_BELLPITCH, VT_BELLDURATION); where VT_BELLPITCH was defined to be 800. This results in a bell frequency of 1491Hz, more or less today. This is similar to the frequency that syscons and pcvt used (1493Hz and 1500Hz respectively). This in turn was inherited from 386BSD, it seems, which used the hard coded value 0x31b which is 795 -> 1500Hz. This '800' was intended to be the bell tone (eg 800Hz) and this interface was one that wasn't converted. The most common terminal prior to the rise of PCs was the VT100, which had an approximately 800Hz bell. Ed Shouten has confirmed that the original intent was 800Hz and changing this was overlooked after the change to -current was made. This restors that original intent and makes the bell less obnoxious in the process. Reviewed by: des, adrian Differential Revision: https://reviews.freebsd.org/D32594 Sponsored by: Netflix (cherry picked from commit ba48d52ca6c867559156dd916631f9ac47abe80f) This change was accidentally reverted in 80f21bb039ce. (cherry picked from commit 2416be588ea113cc06b924ed85861ed3bc391fe0) --- sys/dev/vt/vt_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index e27f74b03a0f..f3cc4e29cf07 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -120,7 +120,7 @@ static const struct terminal_class vt_termclass = { /* Bell pitch/duration. */ #define VT_BELLDURATION (SBT_1S / 20) -#define VT_BELLPITCH (1193182 / 800) /* Approx 1491Hz */ +#define VT_BELLPITCH 800 #define VT_UNIT(vw) ((vw)->vw_device->vd_unit * VT_MAXWINDOWS + \ (vw)->vw_number)