From nobody Tue Nov 5 21:45:35 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 4Xjhhv6KCdz5bfN9; Tue, 05 Nov 2024 21:45:35 +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 4Xjhhv4BQZz4fGD; Tue, 5 Nov 2024 21:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843135; 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=LF9iqh/4JJ96sMLMABMREaBdEqyw2dSSO2Xpd/vbV/M=; b=t8Qk+ZT1VJ+t/qcT3fAw3yrLKT2kEzfUsJcOzfpRy695ku8A+y1wwLMAtQvOp7jvyovsdp W6NOlVv3S0mdwhSsPVIa+b6XMFmCYtYpQYMyiWGEom+9C2Gjr0Id6uw6cWxmAbCbYR972H cxE2gc93AeRtyt5/Kkmr8PushCJz/A2u97Avx+QxlLZ2YEjuwMve5rbc0GWjf1b6awLVXy r3/ZNkvQPxv9dtk7aF9jCSGq/03s5zFTy+Ok1/oGw/bdtqvn2FfisO/w+imEjzGvkusWrq TEjyc2ZcOG9Wma4f7k12eD7yfpnY099quLtbTwbQKgn11fY1TucCLrg2C3x+Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843135; 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=LF9iqh/4JJ96sMLMABMREaBdEqyw2dSSO2Xpd/vbV/M=; b=tCX2dchYqTCdw6jOkTyIeDl9L+VxtJU16/Hc18zBLWffeduX1F1wWYAaD4zpWdlJYv792S 6+WOZvX6ROcKhgVN3xAALW+4HXv9jiUStPtzEAY50r38EspFhKdqENE4VchPYo/g59Ysnc A/bhKFxzmj4Rfo7uMk8+1QQfAnyTq+6EDBy6LXahd/fzcfU2WXuZYpo25z0VV+dgViMyfB n2hr8z4LV+pj3KpQKBQXZOeG49g4b4vKE+fCpR7gsdje6dGEnaDzN6+79EtcZsrGRd92as awBsxgftUaT0flxpAEXkIqY9Dq+5JadyardEUHaBt6nkWmroavCMil8bHB2KwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730843135; a=rsa-sha256; cv=none; b=alqcz9oLTVPrnA0dnLqhw7J0JC2GPP6jD/ejtQ+WpzF+klHgt9TgszzheFxoXe9Bc1wSRg RCQGey2Emap8QHCD2pQS/YciJbwln9eU4aFfMyak4O98/xkLIatZ8dwpAdVx1QAEg1d/qR SZhe/mFZQbsT9VwqYJPfcdJgDz4eOPE63XhBSjIQRnRyhefdGmV62Z1AM70re1sI6xnOZC r2g2KSHiaFWtZfaMxJ7MlK44JLJskiCuuVbTw6OJbCWLnRN6cnupTn5tHUvQZv8nW/fwhP w+dWMx8BnemFtFT6jlpVoUv2ooK4285B4bAaZN6rmwWU2rDnviDl662JMSayXw== 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 4Xjhhv3XczzZcF; Tue, 5 Nov 2024 21:45:35 +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 4A5LjZE6095548; Tue, 5 Nov 2024 21:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5LjZ4R095545; Tue, 5 Nov 2024 21:45:35 GMT (envelope-from git) Date: Tue, 5 Nov 2024 21:45:35 GMT Message-Id: <202411052145.4A5LjZ4R095545@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: c874fcc4ca62 - stable/14 - sound: Remove early SD_F_SIMPLEX and SD_F_AUTOVCHAN assignments 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c874fcc4ca629548ded7ad7bdb71d92856759969 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c874fcc4ca629548ded7ad7bdb71d92856759969 commit c874fcc4ca629548ded7ad7bdb71d92856759969 Author: Christos Margiolis AuthorDate: 2024-11-03 19:02:43 +0000 Commit: Christos Margiolis CommitDate: 2024-11-05 21:44:41 +0000 sound: Remove early SD_F_SIMPLEX and SD_F_AUTOVCHAN assignments These flags are properly set in pcm_setstatus(), once the primary channels have been created. The existing comment already states that this is wrong. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47324 (cherry picked from commit 3a7d40c692622cc614a3839491c345d945f474fe) --- sys/dev/sound/pcm/sound.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 3c4fb38fa4f5..e03bcab6d8fc 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -465,7 +465,8 @@ pcm_sysinit(device_t dev) } int -pcm_register(device_t dev, void *devinfo, int numplay, int numrec) +pcm_register(device_t dev, void *devinfo, int numplay __unused, + int numrec __unused) { struct snddev_info *d; int i; @@ -503,13 +504,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) CHN_INIT(d, channels.pcm.busy); CHN_INIT(d, channels.pcm.opened); - /* XXX This is incorrect, but lets play along for now. */ - if ((numplay == 0 || numrec == 0) && numplay != numrec) - d->flags |= SD_F_SIMPLEX; - - if (numplay > 0 || numrec > 0) - d->flags |= SD_F_AUTOVCHAN; - return (0); }