From nobody Thu Apr 18 20:35:53 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 4VL8gF5PvNz5HX88; Thu, 18 Apr 2024 20:35:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VL8gF2ZK4z4N41; Thu, 18 Apr 2024 20:35:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472553; 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=zc32XBdt1Jn1EJ5ENJwzEvjvfbY3qc4HIypkQqlDUdI=; b=K1PjzMjH+/J+jTxa2WA1pQLyy1mAGYVX23xHVes+wF57cA3T0141AkFy8PH5y9aV2K5KTY Q6DUhbQV5P81uETF5rpDWMjOJ8G0ISKwle8OnjprdhJTd6BI71oz853dQBXFASFzG8S7Up pIW1mz21LGJ4AqNl6RAB3My6imFB/KNk6rHf9f4wioRpfCX2JJQpYCLeYts1ldyL47so5v vNQXyv9RvJZwOhgLfV/wUjlCpyK9rht8ax4CrUUazxctMkxOXVRnysknrsyzu/JDdQirNp ISaGvIldmPLDHP+17efKz6ogFahLKDzgtEDTw6SlbDlIrNdll0OvvY3iMFKk1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713472553; a=rsa-sha256; cv=none; b=UAKOqJJLE/8UcqQil3jVY6yyRp9n6yNiEN41oXX7iZlEn/hMkh6F/788PpJe1bjJ9QIDl4 +bkQlnLHOIhXiRXD6swaSeNcfqry8DigG1QQRKQ/Q75C+7wy/uVdxRO550wXvoNtv3gND6 ZxyYpoh5yO1J/sG4CCewWT1K444J08qTXE1+h9rB2wNQGavnLnSo8Z0kOPffBgbaZC70/Q BxX22TF8U/2aHGAwixVY0LyE3ge+G1D+walxMZ915r7O3o1gpSUfCYF/YhMYQ+COhGzj1l UZ5XcCJLxbFuUOROHNzqf02qd9Bz8XvodJUUAzpzrkfAPOoaHGSZMeVN3jBQBA== 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=1713472553; 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=zc32XBdt1Jn1EJ5ENJwzEvjvfbY3qc4HIypkQqlDUdI=; b=aHwhiM78a6P7+drZfm8JrnnzmAmVtTIN8n5aL+Cd70qiV74Zu+W+ePQLSGI1Hdpky+TI5L wyquB1jkPfhB+A1BM+xZTXU3DLrqiy7LOgM8QzB/19gW2M/7D4UNv3ubnyug5vcEF6rEhX 8Dz8bewXwgZQadq6LT7Mg1VECQCHeJ6B2LDicr6/RX+nTOsPxCX8U23o+Gad+l/fejmJlJ uz2q1I3f2Uf3TnYe5/wtkmJa3d0l1pVXyXwVjRXZC8rj/AlnawVjQnxLZgRW/hgRZajDUW F1P+3wGtmeyV43xXAU40oTseGZApyuSCZ5qlZjJY9pxvm278mchYWq8KXOLx6Q== 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 4VL8gF21XnzPHH; Thu, 18 Apr 2024 20:35:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43IKZrLl056807; Thu, 18 Apr 2024 20:35:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKZrTU056804; Thu, 18 Apr 2024 20:35:53 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:35:53 GMT Message-Id: <202404182035.43IKZrTU056804@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: a44c45c7f597 - main - sound: Simplify unit fetching in dsp_oss_audioinfo() 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: a44c45c7f597d67d37e09396b0778a2847a30981 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a44c45c7f597d67d37e09396b0778a2847a30981 commit a44c45c7f597d67d37e09396b0778a2847a30981 Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:20 +0000 Commit: Christos Margiolis CommitDate: 2024-04-18 20:35:41 +0000 sound: Simplify unit fetching in dsp_oss_audioinfo() "i" keeps the value of the current unit, so we do not have to call PCMUNIT() and device_get_unit() to fetch it. In the mixer case, I think it is more correct to do it like this, since mixer and DSP device units have a 1-1 relationship (i.e the mixer unit is always the same as the corresponding DSP device one) and that way we can make it more clear. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44855 --- sys/dev/sound/pcm/dsp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index f685d7e38f6d..1c020ba22611 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2177,7 +2177,7 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) struct pcm_channel *ch; struct snddev_info *d; uint32_t fmts; - int i, nchan, *rates, minch, maxch; + int i, nchan, *rates, minch, maxch, unit; char *devname, buf[CHN_NAMELEN]; /* @@ -2197,9 +2197,9 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) * Search for the requested audio device (channel). Start by * iterating over pcm devices. */ - for (i = 0; pcm_devclass != NULL && - i < devclass_get_maxunit(pcm_devclass); i++) { - d = devclass_get_softc(pcm_devclass, i); + for (unit = 0; pcm_devclass != NULL && + unit < devclass_get_maxunit(pcm_devclass); unit++) { + d = devclass_get_softc(pcm_devclass, unit); if (!PCM_REGISTERED(d)) continue; @@ -2324,14 +2324,13 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) * @todo @c port_number - routing information? */ ai->port_number = -1; - ai->mixer_dev = (d->mixer_dev != NULL) ? PCMUNIT(d->mixer_dev) : -1; + ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; /** * @note * @c real_device - OSSv4 docs: "Obsolete." */ ai->real_device = -1; - snprintf(ai->devnode, sizeof(ai->devnode), - "/dev/dsp%d", device_get_unit(d->dev)); + snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); ai->enabled = device_is_attached(d->dev) ? 1 : 0; /** * @note