From nobody Fri Apr 24 16:24:42 2026 X-Original-To: dev-commits-src-main@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 4g2JFl1z6jz6bXmx for ; Fri, 24 Apr 2026 16:24:43 +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 4g2JFk6Wm6z3ZrT for ; Fri, 24 Apr 2026 16:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777047882; 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=Az2hBWcOueW2V1TnQcVrZ/5ARNtrDTzVD9ESQHFyOgw=; b=SGjFVtPi17UuJkehYFKFMj6NjFNM9AyHdkoCp0pVlI5bkyqaXqyMZARqYx8QySLlXG3lfv FvK2JMP1LmqYyNZ/86p3lkoN6VkUtEH981IxF8QpUFIoET4tooIPOeC2j8g0stapPsdGr2 Sukx/LVU1OElhQ4gRzkauWnz+BFi6W8j0FgCC67eDB1TmfemXnX9ivy2gw9V7ezJ4UaSxH TCG82TrvtL4jj9u6guj8NpSB0cFyTLFtls/0CtIenU3xKQ3240TyV9fxnWab6htKIniQs6 KvyGKgXR5bzdOQBAO/FPVn7/8wdLuDNq11ENB56K28YOWX1OVCYSiOX6Wq+xgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777047882; a=rsa-sha256; cv=none; b=q1QaIyAEf/9IAVKZPowpbiEIwVdMEB7BNDaSQnKWfbFe7+3U5RKcb4mQven6NOFaQokeUx qbixIX3UOU7srmoL7DOOa+QfD8+zrBIqI6WQuqb9NPbrRvEkgKui29GhnQzdh86k2CSOTw zSuDV8wt5pUrhy2NgRzeRLTtI2sf2ZRhcjmtK2PrLwyPNdGAcHT719wXMAsRtfU2FsC/Ls D8wBypUXyUUZdxBM/hdDgGqc1gc0rjeVR+4Cx0/lXHZlf7ORQAMfqQK4lwnt+DLsflJPeB 8S0siuRd2oy1SkvWaQxNnRef7oD7GfeJtdxdgJ8jYVj09G9SYArfHGIDTK6hfg== 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=1777047882; 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=Az2hBWcOueW2V1TnQcVrZ/5ARNtrDTzVD9ESQHFyOgw=; b=HzLzOAH8FuMBLHe6puu2g6NygPGn6TynIgu4n5y11LHgwl1fCTeZoh/8PPWMgXsP98TqjR Qu1vHaN5b4/Ah+yAcLnra3m5JLgZXKHcA6qhwRbt6LJhHjzSM0mfjyI9GYYTOxWT2jkCc6 dYpzKkvj8MqVOW1lFWkCK8aC1pN/akzqhlqFd2fSOvrfP7sqr2JR8a5GxPjB1RJbVUyEMu VDJc/3qnAz5ON7FRVMl9vo9jMFYfzEBCffIAmSDAnez2862bHnFKK+Ldq0a0xN9/m6c4ct 3R5iH21O6a9kfr5b9l3g4W20VvfG6VYyB35oSlfguudt3cF8pYTiKfLZvuP6OA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2JFk62Z2z19Sn for ; Fri, 24 Apr 2026 16:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 16:24:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Raphael Poss From: Warner Losh Subject: git: 03a515e9890b - main - speaker(4): Update outdated comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03a515e9890b0c6844457254e26dc34333b85127 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 16:24:42 +0000 Message-Id: <69eb994a.3b0b6.4a4f8e5b@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=03a515e9890b0c6844457254e26dc34333b85127 commit 03a515e9890b0c6844457254e26dc34333b85127 Author: Raphael Poss AuthorDate: 2025-12-10 19:53:21 +0000 Commit: Warner Losh CommitDate: 2026-04-24 16:23:06 +0000 speaker(4): Update outdated comments The comments in tone() were referring to pre-2000 logic that does not exist any more. This patch updates them. Signed-off-by: Raphael Poss Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1922 --- sys/dev/speaker/spkr.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index c698a4820434..2cdbbd43ff6e 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -71,23 +71,29 @@ tone(unsigned int thz, unsigned int centisecs) (void) printf("tone: thz=%d centisecs=%d\n", thz, centisecs); #endif /* DEBUG */ - /* set timer to generate clicks at given frequency in Hertz */ + /* + * Acquire the i8254 clock, configure it to drive the speaker + * signal, and turn on the speaker. + */ if (timer_spkr_acquire()) { - /* enter list of waiting procs ??? */ return; } disable_intr(); + /* Configure the speaker with the tone frequency. */ timer_spkr_setfreq(thz); enable_intr(); /* - * Set timeout to endtone function, then give up the timeslice. - * This is so other processes can execute while the tone is being + * Make the current thread sleep while the tone is being * emitted. */ timo = centisecs * hz / 100; if (timo > 0) tsleep(&endtone, SPKRPRI | PCATCH, "spkrtn", timo); + + /* + * Turn off the speaker and release the i8254 clock. + */ timer_spkr_release(); }