From nobody Fri May 17 19:31:16 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 4VgxsJ3JKfz5LgB6; Fri, 17 May 2024 19:31:16 +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 4VgxsJ1mXZz4vsH; Fri, 17 May 2024 19:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974276; 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=QQTNP5lHXqg+Fk6ui45lbveM7+CebE4TmCi/6jJh7/o=; b=uXuWSUC0UQJ/z352OeBgK2kz5OdoLnIMsihplHsW1cw0X8OskBBb7JKIh7D1wZIaP9vFja i1KkjMZC15wqa+RqNiekkprCBBdR4RRmF2N/WKHu3HrYVb7VYrgVu06p2nqQ43If1CKZ60 MJyP/yG/3SohyGByK8XKVb1PcsYouMcTiJq7ujChqbg8I2zkGBU/VqtsJWwOCtMdjUjrzp UphqXMN84eKoHk6tF2xgw0Ls1EGDeGMRzQuD0OYNXHCfWCGQIca1D2qXnY/JmKugP2I9Kh pi5yJLESMeDVL7TrjF+6ZM+wIcifJfVTgN6Jyhx/10yBeo44vBKvYJTHRHDnsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974276; a=rsa-sha256; cv=none; b=BD1xAEZyVfRz8ByhnxHHnu+aWLc8/AlKFPXGJEd+T1L0praDQHx5vlNG/u5M+97iKHLiCg IZxZQ+InNtGjAVVMiiTgwrC2mfx/BoxQWKwEFFbF5rifR2mHtaIRDCTjYnSQ5IqzoDawKs 0VDurlltmF74kHmI2zW21oA43AlmKYZaB6fTudKlNHqof5Sfvfeojbt1qzNSBIDoLQNIvO hPD/fIBrqOp1xGn1T1Lg8/2Xnt9p8dZtkHwTRjUn823zBxAx2DqRjoiCER+YS6JDtlSFZN gSGg0K3K+rgj4r2lmX5WH0r843FEW6Ie2LMZTpleGFlW+9jGXYRXj0TEU9/ANA== 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=1715974276; 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=QQTNP5lHXqg+Fk6ui45lbveM7+CebE4TmCi/6jJh7/o=; b=GGpAi7d15NV54Bnz5M19V004g+xSHdjYvlxZi1uSj9vNAtGqXe9G2meN1kAdjYQpOPIhVd WdC1rtbkpV26wezi6uOmATPUzsdg5zpOS/a353KGGEO9Aqpsq8UZdD2plMIBA0/fRTdeMQ lYoR2fdnG9gqEmacIrECgxbqJLENtsfHpMekGnmofTPnnpPcLbEV2rzUTkdrFDoJryQurX d1yHrn25I9Ly1lD2qtOo+dhq+GhyPC79GkX7KI977zLpQpjyB0G0TURiNZRFFDY8sz0HWZ Es2LUJVOiApP9T4iY+grwxVvB7cRSOg77aw661APV2zNhCoYX0nqTrajW6j+Kw== 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 4VgxsJ1NYYzvgl; Fri, 17 May 2024 19:31:16 +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 44HJVGbZ000260; Fri, 17 May 2024 19:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVGhF000257; Fri, 17 May 2024 19:31:16 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:16 GMT Message-Id: <202405171931.44HJVGhF000257@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: 8bd14f511efa - stable/14 - sound: Add missing oss_mixerinfo devnode and legacy_device fields 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: 8bd14f511efa8c2d40c538cff915bb3a822d724f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd14f511efa8c2d40c538cff915bb3a822d724f commit 8bd14f511efa8c2d40c538cff915bb3a822d724f Author: Christos Margiolis AuthorDate: 2024-05-09 19:08:11 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:36 +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 (cherry picked from commit e6df8c379b0cf2f6d715d4903fcb1f279e38173e) --- 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