From nobody Wed Jun 3 08:23:33 2026 X-Original-To: dev-commits-src-branches@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 4gVgh60g1xz6gJX0 for ; Wed, 03 Jun 2026 08:23:34 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gVgh55wX7z3gFB for ; Wed, 03 Jun 2026 08:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780475013; 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=PPDtnna0fS5Mq1a7rq7/4fFDOEHesYxtLMKipZPICXY=; b=Ok/J9O99u7Ef7DWXWrUYhlQyjaIBVEqKdFckovUQ/GlOf183csP76Sbww37J3lyIdDl+pV ctsn5XjCYq33PMSj8N5Ae8RqWOOBySBRLJXYJU/Ku6/r84YcsuqEvT0S4apbUBRYt2Adkk eERghuGUlJFXLemUIRKdE5K6Yt3MV4Qn3gAuV1r1L1UowO6h/xy+UCw54IXGwD3OpFLw7f upkzOZY3rvceVd43Ki0+i+DVSIuVNUji0msy6hz3fULp3g+SJz4njzzZoYwC8mMnKdbFV5 XFGwUZjnKoVgq6LMKRC+FGaGE6z4zeLqLDUeHq5/u7COJ4Hfp9UKBMSl4tExmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780475013; a=rsa-sha256; cv=none; b=s5CYVde+TUk24Xyo7jNweJAYr9t7XajUAAwai1B3DEyTkzk1o+L+/Z3Xhwf+utinVnzODv vZyRAAeX90OzuvoZNO32295Jooe46gkfDpqXFfejhb7rK6l/0fjhel48jjAxhAiR7LJzBC GAMYe0WZxSdU9+VNAf5xaHyr4Kvz1DE+joevwQQgVPfJZi/71AeTpqXcQso+o2ne0772oY 4IhOgK1TTdizD0i/Bx/seeTEdB+Fo75OPM+qO9CIfMDyw3XRtL5viJQWfCH+kA1KjAy+oB t/AgpCb5Y9embX5/13itQt514QEBRQGHwukEgHLfpWILPxwzkC5IAll6ZujirA== 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=1780475013; 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=PPDtnna0fS5Mq1a7rq7/4fFDOEHesYxtLMKipZPICXY=; b=J7lP0BuZp1P3X4zOFfGo76bvqmTMMZzi6of7T9SbTrFUUFiLfS8xmSSYYXS8UAk0vqCN1q 9faZz39UbMfc6sxbNV/0cNv/8C552L7dW4Fb8HH4l6jpYe8TiYkmEwU+/CKEvTduSCPti8 izp5sr1ZgdASIvz30m4loLTS/wZn+ctZ+f6S+1eru0BMRwAumE9QxIA7FCp4o+slFYnvzj yW0SNQXVpfMcvUpZJLW+xKxTWll82sbodjSGlllysRVCU09RPdm5eb//aA9otpnVALuHsM JCMl4nokn5NXkfcpg8sY+xxoSw2yIFErrynvbVHGnItjRixCj/BgwGx3mrEbDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVgh55KT7z13p5 for ; Wed, 03 Jun 2026 08:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39f4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Jun 2026 08:23:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 323e28ed4cac - stable/15 - sound: Retire MIXER_SIZE and use correct size in DEFINE_CLASS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 323e28ed4cacbbf6184f0d0b780066cb23ef217c Auto-Submitted: auto-generated Date: Wed, 03 Jun 2026 08:23:33 +0000 Message-Id: <6a1fe485.39f4f.4ef83810@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=323e28ed4cacbbf6184f0d0b780066cb23ef217c commit 323e28ed4cacbbf6184f0d0b780066cb23ef217c Author: Christos Margiolis AuthorDate: 2026-04-18 10:29:39 +0000 Commit: Christos Margiolis CommitDate: 2026-06-03 08:23:03 +0000 sound: Retire MIXER_SIZE and use correct size in DEFINE_CLASS I am not sure why this hack was needed, but the size should be sizeof(struct snd_mixer). Unfortunately, we have to expose snd_mixer, but it should be better than relying on a hack. Sponsored by: The FreeBSD Foundation MFC after: 1 week Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/18 (cherry picked from commit 64ebbb1d74415cb93445cc625da63449f01ac8c5) --- sys/dev/sound/pcm/mixer.c | 22 ---------------------- sys/dev/sound/pcm/mixer.h | 32 ++++++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index e61371d13610..8d96486c862b 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -37,28 +37,6 @@ #include "feeder_if.h" #include "mixer_if.h" -#define MIXER_NAMELEN 16 -struct snd_mixer { - KOBJ_FIELDS; - void *devinfo; - int hwvol_mixer; - int hwvol_step; - int type; - device_t dev; - u_int32_t devs; - u_int32_t mutedevs; - u_int32_t recdevs; - u_int32_t recsrc; - u_int16_t level[32]; - u_int16_t level_muted[32]; - u_int8_t parent[32]; - u_int32_t child[32]; - u_int8_t realdev[32]; - char name[MIXER_NAMELEN]; - struct mtx lock; - int modify_counter; -}; - static u_int16_t snd_mixerdefaults[SOUND_MIXER_NRDEVICES] = { [SOUND_MIXER_VOLUME] = 75, [SOUND_MIXER_BASS] = 50, diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h index b16256862b4f..34f0514c6271 100644 --- a/sys/dev/sound/pcm/mixer.h +++ b/sys/dev/sound/pcm/mixer.h @@ -30,6 +30,28 @@ #ifndef _PCM_MIXER_H_ #define _PCM_MIXER_H_ +#define MIXER_NAMELEN 16 +struct snd_mixer { + KOBJ_FIELDS; + void *devinfo; + int hwvol_mixer; + int hwvol_step; + int type; + device_t dev; + u_int32_t devs; + u_int32_t mutedevs; + u_int32_t recdevs; + u_int32_t recsrc; + u_int16_t level[32]; + u_int16_t level_muted[32]; + u_int8_t parent[32]; + u_int32_t child[32]; + u_int8_t realdev[32]; + char name[MIXER_NAMELEN]; + struct mtx lock; + int modify_counter; +}; + struct snd_mixer *mixer_create(device_t dev, kobj_class_t cls, void *devinfo, const char *desc); int mixer_delete(struct snd_mixer *m); @@ -65,13 +87,7 @@ void *mix_getdevinfo(struct snd_mixer *m); #define MIXER_TYPE_PRIMARY 0 /* mixer_init() */ #define MIXER_TYPE_SECONDARY 1 /* mixer_create() */ -/* - * this is a kludge to allow hiding of the struct snd_mixer definition - * 512 should be enough for all architectures - */ -#define MIXER_SIZE (512 + sizeof(struct kobj) + \ - sizeof(oss_mixer_enuminfo)) - -#define MIXER_DECLARE(name) static DEFINE_CLASS(name, name ## _methods, MIXER_SIZE) +#define MIXER_DECLARE(name) static DEFINE_CLASS(name, name ## _methods, \ + sizeof(struct snd_mixer)) #endif /* _PCM_MIXER_H_ */