From nobody Sun Apr 6 00:28:29 2025 X-Original-To: dev-commits-src-branches@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 4ZVY995mN3z5sb5h; Sun, 06 Apr 2025 00:28: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 4ZVY994gT6z3wyH; Sun, 06 Apr 2025 00:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743899309; 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=I61PMHjgfICBbehnfcotA+UPPaTJjubaMCNxBA3+7eo=; b=yMNh+nuC2OLp8dDGaOqyNrh0+I/sOd08FOL9nrmybcLqUOr+5SIc7VhjA9E4i9Alh6GWF5 tHfugfIOVi/4++DIxCjx1JHg9YMH/IAGD/0YxikLNra/wdUff0uf25/l5WEBHQ3dKQT1Gb 1URt1gXromz6ccQI8fHd0uPNOQYHNZxZ+/BxCXDXqTqMCG4Yk+nvbONhjMOUB673a2OvTe 2XX46HUawQ1VmTxIU9oCgsR2ncFR4TyY7qf4PjuyrhHgjjT9yX0EsP65zRmwz9TsR3U0Ne f5JAqh6bhoeMJ2z/4bKIbLJ5VeFZBglgo8+H6yULwdymI8LB2yfqGtXCElOBlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743899309; a=rsa-sha256; cv=none; b=s2Cwhg8YKg0DeD/4K+mTWNy7NDenvWjT/3v3XfmxXcXWoDujzHCaSb0tSRM3yvfYiDFWkQ dqihN1pwZFA9FBnzsu7dFt834b10kt0LPWwJgu9G8apT8KJrM3ir1dp3eiA2YuLphUDJWF hCZTnWy875fWDQeHyDKdEA0JoZ8HJiuVBwe/NKVkOn3xu/U+Vcemyhx826KxkhMO4SdYye 4FB7hpUJGOIOaHqSFKYvEilOJFSVBs1Mb0AvjeznUlwVkpM14m7kbM2aYYEHwcHc/D5mri bTYshXxk37P4j7H50tpgK8UekRJaLtfJGQi4BNwqd+kChBnz36SJcw2IykGfsA== 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=1743899309; 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=I61PMHjgfICBbehnfcotA+UPPaTJjubaMCNxBA3+7eo=; b=nfh5qbG4rHzkHAmluslZ7WkGeNJ17NTx52Qegr3TwesSwZRN+NLBP63nNRJEdRQR4zerue Y8I7h/Xri1ecO3/OZZ1HX5KjH5DRHafYnV7RSnHm9CfFsQe6a4A56bVZtErZ9wJejW8Adm 14yw4Hmiyams0IxqaVvPT1qDZM0pbX5DNxOUlGPjSkj6lveyRnSaY9nN3k1qRgzNgXd4AX DaBWHz9+xVu26euCSzAX5gXEs2nOtvlKhJYm0/h6BkPpFB9YrGoZkrJwg/skjjg53hKFTB IilvJKR9JE9/BI/NEjohSMN+f4APXx9uAJrjDl44QnsTf3k3ryPBCL5ewWPUcA== 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 4ZVY994FsBzdjj; Sun, 06 Apr 2025 00:28: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 5360STlK065742; Sun, 6 Apr 2025 00:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5360ST0Q065739; Sun, 6 Apr 2025 00:28:29 GMT (envelope-from git) Date: Sun, 6 Apr 2025 00:28:29 GMT Message-Id: <202504060028.5360ST0Q065739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 1890f0b0df24 - stable/14 - beep(1): Use AFMT_FLOAT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1890f0b0df244fd36c511303e2068d5c6f3aa174 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1890f0b0df244fd36c511303e2068d5c6f3aa174 commit 1890f0b0df244fd36c511303e2068d5c6f3aa174 Author: Christos Margiolis AuthorDate: 2025-03-30 17:45:48 +0000 Commit: Christos Margiolis CommitDate: 2025-04-06 00:28:14 +0000 beep(1): Use AFMT_FLOAT AFMT_FLOAT is supported by sound(4) as of FILLME, so use it here, since the whole program works with floats already. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47639 (cherry picked from commit 1166cfd96f3403edb082387fbc3a4d4aa249bce8) --- usr.bin/beep/beep.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/beep/beep.c b/usr.bin/beep/beep.c index 2696bacfacf4..0bdfe2cf97a7 100644 --- a/usr.bin/beep/beep.c +++ b/usr.bin/beep/beep.c @@ -152,7 +152,7 @@ usage(void) int main(int argc, char **argv) { - int32_t *buffer; + float *buffer; size_t slope; size_t size; size_t off; @@ -208,9 +208,9 @@ main(int argc, char **argv) if (ioctl(f, SOUND_PCM_WRITE_CHANNELS, &c) != 0) errx(1, "ioctl SOUND_PCM_WRITE_CHANNELS(1) failed"); - c = AFMT_S32_NE; + c = AFMT_FLOAT; if (ioctl(f, SNDCTL_DSP_SETFMT, &c) != 0) - errx(1, "ioctl SNDCTL_DSP_SETFMT(AFMT_S32_NE) failed"); + errx(1, "ioctl SNDCTL_DSP_SETFMT(AFMT_FLOAT) failed"); if (ioctl(f, SNDCTL_DSP_SPEED, &sample_rate) != 0) errx(1, "ioctl SNDCTL_DSP_SPEED(%d) failed", sample_rate); @@ -251,7 +251,7 @@ main(int argc, char **argv) else if (off > (size - slope)) sample = sample * (size - off - 1) / (float)slope; - buffer[off] = sample * 0x7fffff00; + buffer[off] = sample; } if (write(f, buffer, size * sizeof(buffer[0])) !=