From nobody Sat Nov 30 16:51:30 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 4Y0x030M39z5fJ1H; Sat, 30 Nov 2024 16:51:31 +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 4Y0x026TPrz4nmk; Sat, 30 Nov 2024 16:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732985490; 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=p4cWrDDVRx0ZcB5wF+Zx8dc79ddyUCvpa0NJznZdOKg=; b=OAIJhKERnT4N8D/H9gkAcezzFv2UZof7uCoEXops0KvD/ZrCEv1Mx5yv7UJQEFIsd1l1/d XLp1XpEwofDtbSmIodwaCZe0SgsSkk8fxKtRTebBpLRTusWA97t+elKiyCI9no84fHyzju 7OcRAWbGec+PzAexkvz798fAVJC5+R7Vi9Sc2WknMynGapcnDuVJ+e52Ul6ntOwDEkLLkS ReqK291iOec4zUAi4RxF3IZxSmVi3qKUE3JIxcplTpRo4eXfPeyX8ri4ZDp3b8lOsmtqWC BafyQCqMa8qR4whAChazpbD9pPcsuNVSB/xKgiYpybrSzetVm1HRamf11PX82w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732985490; 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=p4cWrDDVRx0ZcB5wF+Zx8dc79ddyUCvpa0NJznZdOKg=; b=n00Dz6k3UWNdwM1mXOg7/9a6yMv5U4Eq8Lym1I8G0aUdypxLIJVoPpQmmWubE+ANtpwROc grPwK+uroClg0F2tMLH1CS6uFvGwTX6bp+Vmtc8gzhwJ9Diuk40KUWQ+Wbrn9Izj+S2dTl TRnzUfjRHg1a4v0dsyimUS2acQptww89tqPBlDeYv7WkyNwjo14Xtd8IjhO3z5JgMUDTzW gaJhwZNXxLAev21olihoFMyWEwMIx3lWdQX2O8vfdi0E8aTRWVKJnPGCmp3FB5MNe0zHd9 2H6ugH8QWyAU8NqJ7sLb+3KHnTmrhzEN3VUZwIQe+hq32ckDPO5NUfDPpqtk7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732985490; a=rsa-sha256; cv=none; b=A9r/A7mKynC4d7hawWkJEE7ceqrTlGdj4EoN8uje7RWRHR8Q1Rq8i5GAOqi1U4XySJoo4n MHCh0YSQEcWw5TF+QndoiYpMNbxZ1PmY+qPnlUgaOUssEfMKmBnWnvjpn5zz4u51c8Pa8b CNXf+wFWJ+sg5cwOPXoR2B5jxR5FnPrYtgc2LIDAD2/Qtl5uLewT6TC9JGRMLoPS3UEcmS fClbnzrwLwcVe9WD+E/H67m0rv+8XhB/yWxQ8fDYHg0dDFGCtjY4VO1UfCZVrIBbJlVko0 CwIYE6h0Hh6r6V+IQx9qQck/DavWCr7cTa4C308Y2sZAnJ+NUAnPGGHwUvTiKQ== 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 4Y0x0260xFzGTK; Sat, 30 Nov 2024 16:51:30 +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 4AUGpUmC046900; Sat, 30 Nov 2024 16:51:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUGpUND046897; Sat, 30 Nov 2024 16:51:30 GMT (envelope-from git) Date: Sat, 30 Nov 2024 16:51:30 GMT Message-Id: <202411301651.4AUGpUND046897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 47a375d2bae6 - stable/13 - speaker: Use standard C bool 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 47a375d2bae684e524abf0799b587a34f679c268 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=47a375d2bae684e524abf0799b587a34f679c268 commit 47a375d2bae684e524abf0799b587a34f679c268 Author: John Baldwin AuthorDate: 2024-02-05 23:40:34 +0000 Commit: John Baldwin CommitDate: 2024-11-29 19:15:00 +0000 speaker: Use standard C bool Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43717 (cherry picked from commit c83d83206a39c7c47139acac46885bea54ee4876) --- sys/dev/speaker/spkr.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index 316d09cfdfc6..6afebda053d6 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -122,12 +122,6 @@ rest(int centisecs) * except possibly at physical block boundaries. */ -#ifndef __bool_true_false_are_defined -typedef int bool; -#endif -#define TRUE 1 -#define FALSE 0 - #define dtoi(c) ((c) - '0') static int octave; /* currently selected octave */ @@ -183,8 +177,8 @@ playinit(void) whole = (100 * SECS_PER_MIN * WHOLE_NOTE) / DFLT_TEMPO; fill = NORMAL; value = DFLT_VALUE; - octtrack = FALSE; - octprefix = TRUE; /* act as though there was an initial O(n) */ + octtrack = false; + octprefix = true; /* act as though there was an initial O(n) */ } /* @@ -281,7 +275,7 @@ playstring(char *cp, size_t slen) pitch -= OCTAVE_NOTES; } } - octprefix = FALSE; + octprefix = false; lastpitch = pitch; /* ...which may in turn be followed by an override time value */ @@ -310,29 +304,29 @@ playstring(char *cp, size_t slen) break; case 'O': if (cp[1] == 'N' || cp[1] == 'n') { - octprefix = octtrack = FALSE; + octprefix = octtrack = false; ++cp; slen--; } else if (cp[1] == 'L' || cp[1] == 'l') { - octtrack = TRUE; + octtrack = true; ++cp; slen--; } else { GETNUM(cp, octave); if (octave >= nitems(pitchtab) / OCTAVE_NOTES) octave = DFLT_OCTAVE; - octprefix = TRUE; + octprefix = true; } break; case '>': if (octave < nitems(pitchtab) / OCTAVE_NOTES - 1) octave++; - octprefix = TRUE; + octprefix = true; break; case '<': if (octave > 0) octave--; - octprefix = TRUE; + octprefix = true; break; case 'N': GETNUM(cp, pitch); @@ -397,7 +391,7 @@ playstring(char *cp, size_t slen) * endtone(), and rest() functions defined above. */ -static int spkr_active = FALSE; /* exclusion flag */ +static bool spkr_active = false; /* exclusion flag */ static char *spkr_inbuf; /* incoming buf */ static int @@ -419,7 +413,7 @@ spkropen(dev, flags, fmt, td) #endif /* DEBUG */ playinit(); spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, M_WAITOK); - spkr_active = TRUE; + spkr_active = true; return(0); } } @@ -467,7 +461,7 @@ spkrclose(dev, flags, fmt, td) wakeup(&endtone); wakeup(&endrest); free(spkr_inbuf, M_SPKR); - spkr_active = FALSE; + spkr_active = false; return(0); }