From nobody Fri Apr 25 22:03:57 2025 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 4Zkn1B0yxSz5t7dl; Fri, 25 Apr 2025 22:03:58 +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 4Zkn196ZnSz3D9q; Fri, 25 Apr 2025 22:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745618637; 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=tcrGrEmRawPzt3BrYwE3L8gZHrr+5CDtOOQpHLhHbTk=; b=UBaTPJYQwVcvltqi24Sm7XZgoG6/czhr8/JXlCW25xrz+q1SeDMtybetc757s+ggjK34MQ 0TNfHPjzjOvNR0f00EffEtRq22CEQ8SvmQD9+u9U3P6siGBzzKS4u1eboTKBf/21gPRswe LQ6miG5nb5/FdM5Vsf01oGQmtUvOzDegL72mjQmX2WArkIheDbSIGsKCPx2a3Kr6+wg1Aq raszy4OiaDxuokMTCevIW9Zu+CDP5Tfl2JvJwgiY+jrbQezWQJqcDWzopOjp1j8yf/2a91 clWPb0FFboxU3CoNy8L3flWguwmfWd5L3DZgJBrm09gGQ01vHwLMePpWofwbGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745618637; a=rsa-sha256; cv=none; b=xJqS9e4PbZXpToBypj+h2+2gzTf4yEdDKPrZ/O07MdOSZHHyVayYnGtJlgTMYMVTSnav79 sC3R4HcfFoFyazDZDYuy7/7tviUPv9Fg6TNakcF4isOuY7zFqwbPlvc2/JHzGaKxJgqLQT EVlbPTsVzxRuc9J3QdNFzueoOIEm0VOhN8yUraF9UPNZttwxjk+rC6fqJyZFOgPQIFeog7 FRcvJc1XaolZH/vrQWU8GSeFOutqDhPZSM/8gu/RGuT/QyDEMPRY4Mp2AbyWPCBQXnulAc Bs2MXJeuaypPniywVlIo7j1mYvXUtctscfEBcWZEc0BN05S5i/rwQ279Y5OoiA== 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=1745618637; 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=tcrGrEmRawPzt3BrYwE3L8gZHrr+5CDtOOQpHLhHbTk=; b=D3OCye0sYiMFE9aEU75HtA5CRSWf/erua0xvdvm1FIzfASBhBIWj3x7lUBtHp2JNVOGbTm Yx7ecD5J5D20oRxiki810R2QxVTJgmjCInFd1fkX8jy9MsbI0XZyHsoTznMI/OK1pMJytI H/IN8uaR6+yhpR4tzXawaQKUVrncRpZFkonERaROEhgSZkd1UH8Fx/M/9COldUOnSjbpPH SXUuEfyXLKc1+autx5s74UHn7LIqryx+3mo+KPnr0YAJcpXPsDj6CVwQIYhtIXNM7Yl8vR R/ZHucaSBWHvADB7csFm0nDFQpOmL08Y0xVQgVXWcke8kf54ebWiFlfNULm2vg== 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 4Zkn19683Lzt2n; Fri, 25 Apr 2025 22:03:57 +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 53PM3voE017813; Fri, 25 Apr 2025 22:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53PM3v0V017810; Fri, 25 Apr 2025 22:03:57 GMT (envelope-from git) Date: Fri, 25 Apr 2025 22:03:57 GMT Message-Id: <202504252203.53PM3v0V017810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b095a41a3a2a - main - Revert "sound: Access softc through si_drv1 in dsp cdev methods" 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b095a41a3a2ad53e3d1c51e62ff6a85707158e08 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b095a41a3a2ad53e3d1c51e62ff6a85707158e08 commit b095a41a3a2ad53e3d1c51e62ff6a85707158e08 Author: Christos Margiolis AuthorDate: 2025-04-25 22:02:24 +0000 Commit: Christos Margiolis CommitDate: 2025-04-25 22:02:24 +0000 Revert "sound: Access softc through si_drv1 in dsp cdev methods" Committed by accident. This reverts commit facccfc8c7e1463c3139a74d746b715c4f3a02a0. --- sys/dev/sound/pcm/dsp.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index bc64b50b4510..9b174f4592f3 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -455,7 +455,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) } static __inline int -dsp_io_ops(struct cdev *i_dev, struct uio *buf, struct dsp_cdevpriv *priv) +dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) { struct snddev_info *d; struct pcm_channel **ch; @@ -467,7 +467,7 @@ dsp_io_ops(struct cdev *i_dev, struct uio *buf, struct dsp_cdevpriv *priv) (buf->uio_rw == UIO_READ || buf->uio_rw == UIO_WRITE), ("%s(): io train wreck!", __func__)); - d = i_dev->si_drv1; + d = priv->sc; if (!DSP_REGISTERED(d)) return (EBADF); @@ -536,7 +536,7 @@ dsp_read(struct cdev *i_dev, struct uio *buf, int flag) if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); - return (dsp_io_ops(i_dev, buf, priv)); + return (dsp_io_ops(priv, buf)); } static int @@ -547,16 +547,18 @@ dsp_write(struct cdev *i_dev, struct uio *buf, int flag) if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); - return (dsp_io_ops(i_dev, buf, priv)); + return (dsp_io_ops(priv, buf)); } static int -dsp_ioctl_channel(struct snddev_info *d, struct dsp_cdevpriv *priv, - struct pcm_channel *volch, u_long cmd, caddr_t arg) +dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *volch, + u_long cmd, caddr_t arg) { + struct snddev_info *d; struct pcm_channel *rdch, *wrch; int j, left, right, center, mute; + d = priv->sc; if (!PCM_REGISTERED(d) || !(pcm_getflags(d->dev) & SD_F_VPC)) return (-1); @@ -684,7 +686,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); - d = i_dev->si_drv1; + d = priv->sc; if (!DSP_REGISTERED(d)) return (EBADF); @@ -701,7 +703,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, PCM_GIANT_EXIT(d); return (0); } - ret = dsp_ioctl_channel(d, priv, priv->volch, cmd, arg); + ret = dsp_ioctl_channel(priv, priv->volch, cmd, arg); if (ret != -1) { PCM_GIANT_EXIT(d); return (ret); @@ -1458,7 +1460,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, chn = wrch; } - ret = dsp_ioctl_channel(d, priv, chn, xcmd, arg); + ret = dsp_ioctl_channel(priv, chn, xcmd, arg); if (ret != -1) { PCM_GIANT_EXIT(d); return (ret); @@ -1781,7 +1783,7 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); - d = i_dev->si_drv1; + d = priv->sc; if (!DSP_REGISTERED(d)) { /* XXX many clients don't understand POLLNVAL */ return (events & (POLLHUP | POLLPRI | POLLIN | @@ -1863,7 +1865,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); - d = i_dev->si_drv1; + d = priv->sc; if (!DSP_REGISTERED(d)) return (EINVAL);