From nobody Thu May 09 19:08:45 2024 X-Original-To: dev-commits-src-main@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 4Vb1l16tmMz5KJtF; Thu, 09 May 2024 19:08:45 +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 4Vb1l157hDz4g6t; Thu, 9 May 2024 19:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715281725; 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=Mb/OxwdftvzQFWmi9dPlFpDrIv21wKwLHZ/3GcJnw58=; b=Ra4JGLJo6o0YWl+rLjkyqk6dFuM2G6PD4jfIsX8WykIDMYZSF2CnLJ9nJjFnuFOa3WJsHr S9M4fBtcs2/Derk/Hg1/5z9Jai0byC99S46DoxyiEkVW+0VyI9DBOD2UeSdSVSkHEtryxC tkyCzoQUCTPWKrDvhYIG2OqP/Id0dRj6sj5ZoJNEAC2pYo6TDMmxWzW+7pRHDh8C23MOyc KCPYzZ9iL+d8jxLp9qF/IELw/VDOsObPtvrw7/er5EAwzK/izZKUBFZ9HonY0RhjPo/pbT MuazIKLocpDt+ignYmH7VfXCEEdD4YurTZJIRGIv9z/+RAu3B0XLHy7P0eayeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715281725; a=rsa-sha256; cv=none; b=VwdW5KtZCfDQiJlnmFrthONSWh5y/tQDLeDdOpe+9VX6sbewrAMTUEtdc2LonYlmyjwC0w FkpziXN7YPe58ESrAqTlxTnnMBi4He8UF7ksBNJ1nJe4cpqzBLWSZcvVl/5GHJt+7zJCAD Ye34e0Ua5ZGlvV0T0Cw04gFjn3/0xPMUvyspXV7xBwAE9B0/AZVLJCc4pvUbIDn8Tr1IDi t2D+6JlbgW7LG7g+UKWA0TrGfqWZ4UY1765cgSQSbmoRRA6fcpF3NlyWqbQeEjsl0AKgaG SG9+5UO2UruC3uazADMvJF3kbRp6elspx8NYBrCr4Bw+j+Yh7ybUWY7Kzw6axw== 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=1715281725; 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=Mb/OxwdftvzQFWmi9dPlFpDrIv21wKwLHZ/3GcJnw58=; b=E11hTyI6A3HBZXhgXcOzsKeDgMX47e4ZHTmLaPpSn+wmW7tMArS1IdxIivJFda5zRIZ4R7 6Pi0sxeqdkM0XdL7oPGFwr7odbZBCJTqcN4hhGNuYo3JRrNVYd8JJC62mAoPhlsxdVcEfx eXPHjKEvshP1MS/Mk48ijp255/2UG3T7AMPBsvi+wg3KhJyMZa5ctihDSEpSZyf7gnLYbH ooSw8XFcc13uYz0m4jOsjiP7T+29bRjjKsXYklO0lxnfA7BRMZO3ACI1hnmpRRJLMhEL+o kATUthASToopnn1hGX2GTvR1fFE4DhL1G8lCYQfc8U0GAYVWrS4u4btrnfhSEQ== 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 4Vb1l14k2Dz1Kch; Thu, 9 May 2024 19:08:45 +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 449J8jhK025777; Thu, 9 May 2024 19:08:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 449J8j2b025774; Thu, 9 May 2024 19:08:45 GMT (envelope-from git) Date: Thu, 9 May 2024 19:08:45 GMT Message-Id: <202405091908.449J8j2b025774@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: e6df8c379b0c - main - sound: Add missing oss_mixerinfo devnode and legacy_device fields List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: e6df8c379b0cf2f6d715d4903fcb1f279e38173e Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e6df8c379b0cf2f6d715d4903fcb1f279e38173e commit e6df8c379b0cf2f6d715d4903fcb1f279e38173e Author: Christos Margiolis AuthorDate: 2024-05-09 19:08:11 +0000 Commit: Christos Margiolis CommitDate: 2024-05-09 19:08:28 +0000 sound: Add missing oss_mixerinfo devnode and legacy_device fields They are missing from soundcard.h and are in fact used by some applications, such as OSS' ossinfo(1): http://manuals.opensound.com/developer/ossinfo.c.html The new size for filler is chosen according to the most recent official version of soundcard.h, which includes those 2 fields. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D45137 --- sys/dev/sound/pcm/mixer.c | 11 +++++------ sys/sys/soundcard.h | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index a37b94dce43a..9811496853c8 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1516,6 +1516,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) * Mixer extensions currently aren't supported, so * leave @sa oss_mixerinfo::nrext blank for now. */ + /** * @todo Fill in @sa oss_mixerinfo::priority (requires * touching drivers?) @@ -1529,13 +1530,11 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) * default mixer. Other devices use values 1 to 9 * depending on the estimated probability of being the * default device. - * - * XXX Described by Hannu@4Front, but not found in - * soundcard.h. - strlcpy(mi->devnode, devtoname(d->mixer_dev), - sizeof(mi->devnode)); - mi->legacy_device = i; */ + + snprintf(mi->devnode, sizeof(mi->devnode), "/dev/mixer%d", i); + mi->legacy_device = i; + mtx_unlock(m->lock); } diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h index ddd8a51d29a5..64f57742a52b 100644 --- a/sys/sys/soundcard.h +++ b/sys/sys/soundcard.h @@ -1925,7 +1925,9 @@ typedef struct oss_mixerinfo * as the default mixer. */ int priority; - int filler[254]; /* Reserved */ + oss_devnode_t devnode; + int legacy_device; + int filler[245]; /* Reserved */ } oss_mixerinfo; typedef struct oss_midi_info