From nobody Fri May 2 10:46:17 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 4Zpnf15mPhz5vWFF; Fri, 02 May 2025 10:46:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zpnf13lZ9z4NkJ; Fri, 02 May 2025 10:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746182777; 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=neUcSyBzceNhTvOtmUfCE7A2pU3QQpuIYatu7xppClc=; b=fTBzeFCtC07J1B7mdo9qyFyKgy49wO8hHqH0BKjVx2qnzaxRyc0/36pI89wcasXqhA8ryC zms/TvqASMcHO6KpCot8BssEkUsjgfi/WBAyDdbLpcJZzIJ3dalhYxG+ypMtJ07tlir3LU AuM3JemB+17hCiZ/GXdMPb7uFzQyCOkFBn1aIxyXYGSiM91lvEDwye0h9OiRW+dSJZns7t g60C51ulGOw1z9R/JVMANM51nCW3RUGJGoPUWmg5hWMrWVKlyr1IhNqg6seVeh/CIoQqzg pwYQ8MzHM3Vurh3FzJuiGN4Kt8AWphXTAUL3DDwcsMlWZvd6F9FBMWj1opMcvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746182777; 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=neUcSyBzceNhTvOtmUfCE7A2pU3QQpuIYatu7xppClc=; b=LIQpg+mGXu+KglapiIeavsm2SHqUpwlUbZxwCw989ktRE/GnDmiYURg+mgvdkaOmPr3CSS DkxVbOhhEf1OhCNwOTG8LH+0FdwawKO941F6fzynkAtuKiZkYL0eIt+m9+x0JL8C6TD6gr Qtd/pOvsKrrvYfQPhUpnD1hcm4aXqB4uSlbyrZB8h9nvav6VBaMfpBrYrBIOZ0nexhN2OO 1Ry69UjkzcziuHSAEY7bwf1Wiq4401E5E47pe4rdDgKGrY7ITIpo9Xf37//AoFQ7mbXM2j tNqTNqv0cNSeI80JqTD9Q9vjwtWls67SNkfZsvUBLpkqn7fEnrgp7/zlILVjnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746182777; a=rsa-sha256; cv=none; b=DF3ccBc33x/XmwsfheIsP+C1TxGm6ctgVYeIlP0H1diLbQmP1UYy03dHrMoc0/ut5sg5nS vFv+ysUtH3zFcNCO9AbVp96KpQmpz5GDJqpzkGYdJ61Ejsq+7fZJtO8Qh1DrOn4SyNfZ2g OtoAxLN/vAZgWt6sRWUwkkfAdQ86GXtwJdPT3M6tM9kOcNycTFORTTgeoAeOyOYoge44SK qWYS5xxlqGh2Fikko21CDtzvJb4judP/m7msySE1cb+eM5qBoJjWR2ITbFX+HgQEuJh/Ti M1nha7CfPzTGCF1YLEf6aJ23EXTVA5hjyX46iIuuSaC3BLzVT6XBB3UJxG977g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zpnf13Jvwz18ld; Fri, 02 May 2025 10:46:17 +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 542AkHI0036042; Fri, 2 May 2025 10:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 542AkH7T036039; Fri, 2 May 2025 10:46:17 GMT (envelope-from git) Date: Fri, 2 May 2025 10:46:17 GMT Message-Id: <202505021046.542AkH7T036039@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: d99692a81339 - stable/14 - sound: Retire SD_F_PRIO_* 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: d99692a8133959a7cb014a2fd3e3486139ee24ad Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d99692a8133959a7cb014a2fd3e3486139ee24ad commit d99692a8133959a7cb014a2fd3e3486139ee24ad Author: Christos Margiolis AuthorDate: 2025-04-25 16:55:51 +0000 Commit: Christos Margiolis CommitDate: 2025-05-02 10:44:15 +0000 sound: Retire SD_F_PRIO_* The SD_F_* flags are supposed to be softc flags, but SD_F_PRIO_RD and SD_F_PRIO_WR are just generic flags and are only used with dsp_lock_chans() and dsp_unlock_chans(). Since we already have the DSP_F_READ() and DSP_F_WRITE() macros, we can re-use them instead. I am aware the FREAD and FWRITE flags are meant to be used with open(), but I think their use here is clear enough to not cause confusion. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49978 (cherry picked from commit abb5521bddc24581a1bcbe3e3f016504a4824c73) --- sys/dev/sound/pcm/dsp.c | 34 +++++++++++++++++----------------- sys/dev/sound/pcm/sound.h | 7 +------ 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index c5caeea8a002..9b174f4592f3 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -67,6 +67,12 @@ SYSCTL_INT(_hw_snd, OID_AUTO, basename_clone, CTLFLAG_RWTUN, #define DSP_REGISTERED(x) (PCM_REGISTERED(x) && (x)->dsp_dev != NULL) +#define DSP_F_VALID(x) ((x) & (FREAD | FWRITE)) +#define DSP_F_DUPLEX(x) (((x) & (FREAD | FWRITE)) == (FREAD | FWRITE)) +#define DSP_F_SIMPLEX(x) (!DSP_F_DUPLEX(x)) +#define DSP_F_READ(x) ((x) & FREAD) +#define DSP_F_WRITE(x) ((x) & FWRITE) + #define OLDPCM_IOCTL static d_open_t dsp_open; @@ -144,18 +150,18 @@ dsp_destroy_dev(device_t dev) static void dsp_lock_chans(struct dsp_cdevpriv *priv, uint32_t prio) { - if (priv->rdch != NULL && (prio & SD_F_PRIO_RD)) + if (priv->rdch != NULL && DSP_F_READ(prio)) CHN_LOCK(priv->rdch); - if (priv->wrch != NULL && (prio & SD_F_PRIO_WR)) + if (priv->wrch != NULL && DSP_F_WRITE(prio)) CHN_LOCK(priv->wrch); } static void dsp_unlock_chans(struct dsp_cdevpriv *priv, uint32_t prio) { - if (priv->rdch != NULL && (prio & SD_F_PRIO_RD)) + if (priv->rdch != NULL && DSP_F_READ(prio)) CHN_UNLOCK(priv->rdch); - if (priv->wrch != NULL && (prio & SD_F_PRIO_WR)) + if (priv->wrch != NULL && DSP_F_WRITE(prio)) CHN_UNLOCK(priv->wrch); } @@ -234,12 +240,6 @@ dsp_chn_alloc(struct snddev_info *d, struct pcm_channel **ch, int direction, return (0); } -#define DSP_F_VALID(x) ((x) & (FREAD | FWRITE)) -#define DSP_F_DUPLEX(x) (((x) & (FREAD | FWRITE)) == (FREAD | FWRITE)) -#define DSP_F_SIMPLEX(x) (!DSP_F_DUPLEX(x)) -#define DSP_F_READ(x) ((x) & FREAD) -#define DSP_F_WRITE(x) ((x) & FWRITE) - static void dsp_close(void *data) { @@ -475,12 +475,12 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) switch (buf->uio_rw) { case UIO_READ: - prio = SD_F_PRIO_RD; + prio = FREAD; ch = &priv->rdch; chn_io = chn_read; break; case UIO_WRITE: - prio = SD_F_PRIO_WR; + prio = FWRITE; ch = &priv->wrch; chn_io = chn_write; break; @@ -1793,7 +1793,7 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) ret = 0; - dsp_lock_chans(priv, SD_F_PRIO_RD | SD_F_PRIO_WR); + dsp_lock_chans(priv, FREAD | FWRITE); wrch = priv->wrch; rdch = priv->rdch; @@ -1809,7 +1809,7 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) ret |= chn_poll(rdch, e, td); } - dsp_unlock_chans(priv, SD_F_PRIO_RD | SD_F_PRIO_WR); + dsp_unlock_chans(priv, FREAD | FWRITE); PCM_GIANT_LEAVE(d); @@ -1871,7 +1871,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, PCM_GIANT_ENTER(d); - dsp_lock_chans(priv, SD_F_PRIO_RD | SD_F_PRIO_WR); + dsp_lock_chans(priv, FREAD | FWRITE); wrch = priv->wrch; rdch = priv->rdch; @@ -1880,7 +1880,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, (*offset + size) > sndbuf_getallocsize(c->bufsoft) || (wrch != NULL && (wrch->flags & CHN_F_MMAP_INVALID)) || (rdch != NULL && (rdch->flags & CHN_F_MMAP_INVALID))) { - dsp_unlock_chans(priv, SD_F_PRIO_RD | SD_F_PRIO_WR); + dsp_unlock_chans(priv, FREAD | FWRITE); PCM_GIANT_EXIT(d); return (EINVAL); } @@ -1891,7 +1891,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, rdch->flags |= CHN_F_MMAP; *offset = (uintptr_t)sndbuf_getbufofs(c->bufsoft, *offset); - dsp_unlock_chans(priv, SD_F_PRIO_RD | SD_F_PRIO_WR); + dsp_unlock_chans(priv, FREAD | FWRITE); *object = vm_pager_allocate(OBJT_DEVICE, i_dev, size, nprot, *offset, curthread->td_ucred); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index f7411ee096c9..fe982394dac8 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -121,9 +121,6 @@ struct snd_mixer; #define SD_F_EQ_MASK (SD_F_EQ | SD_F_EQ_ENABLED | \ SD_F_EQ_BYPASSED | SD_F_EQ_PC) -#define SD_F_PRIO_RD 0x10000000 -#define SD_F_PRIO_WR 0x20000000 - #define SD_F_BITS "\020" \ "\001SIMPLEX" \ /* "\002 */ \ @@ -138,9 +135,7 @@ struct snd_mixer; "\013EQ_BYPASSED" \ "\014EQ_PC" \ "\015PVCHANS" \ - "\016RVCHANS" \ - "\035PRIO_RD" \ - "\036PRIO_WR" + "\016RVCHANS" #define PCM_ALIVE(x) ((x) != NULL && (x)->lock != NULL) #define PCM_REGISTERED(x) (PCM_ALIVE(x) && ((x)->flags & SD_F_REGISTERED))