From nobody Tue Nov 18 00:52:08 2025 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 4d9R086C5cz6HH99; Tue, 18 Nov 2025 00:52:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0844PZz3yHV; Tue, 18 Nov 2025 00:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427128; 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=9VEzjh6lgcDZe65nkoEbb8LarN/SLoU075cWs6cIyfk=; b=Cu47wPRogP2pL5CNxUBrLO0hJCI/k9VYmnweBwyOwXnv4iJFeBrpQljeScxNF3QX7niZ3e ziKjrs7gzQ0v1Rbg44/jMHVHTz4H1VbpIZAQJuKBSQ4lX0ongDzkMTnZqtWMQep3I4f/8+ d8VvnRWGLplMnrFByl+t9dmIOa7dOOCSfwqNrHFktaT6/ZoWUldatBRXpxwy5DnUfDoF8p kGi9rw9JfwYwJW7XlkEiPPMldckUoPRwyCki9ygkx/0UF0+vPbvEnksGsbR+zbvgcL9Yi3 sZIWXabG1e2ZOufwNhxNi/zjLQYIHeiQlf/orm7t77LlcnbERuEzhqsmrRg8lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427128; 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=9VEzjh6lgcDZe65nkoEbb8LarN/SLoU075cWs6cIyfk=; b=vrGXSq8IqbacDEqmxu3XzjN/NoWETaN5U72ERtuHtGcpYWcmkPfg6uqjRD1P/D2SNna/XA K3XEOWNdMWnRcgZliGkEZLsFYG7X//5qePw3MIDpqr93zWBFKG9jP1YhDx7IC9DQeEcbgu fJ82tDiG41ptYhc3/WBl4+vG5LEy1IIYM9H2St7r3KrHlr72L/XWTbE82PY/o0KhHte36t bL0ltZ3CJjXae271d4gz+c7CzxgUcfIij+YuGQdQWlMbijlOyv5jhTCBO/3VoG9NDBilc1 TbaZPm5Mn2jxgFapHEGZK9DqX4jtu0gXh0YQ2T37kCx7FrZn5XmYh84EcEl6yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427128; a=rsa-sha256; cv=none; b=aRLQ5KpoqTg80ltIRKbx8FF9m/r/AvzzBQjAYDs4SLwQmtuqFTir0cVZKvLaCno3yIF3tX oLMrIPuU5YAVXSyaanR7HyffEZmZI/r61zamZKhUq6qUr90RCKcG98srCL0AhcboXvF1F5 II42/9fi/sN9aas7v7Idk3H4qGL+oWw0p7sh1Pv7YVnPyA5sgeYYdr0CsjnHeUockLM+Sj +viS6KseNANQO1HBsvL6adyMUQV1XZocbu7hR6mTOhz9a1QgZDymYInsZj9Xy68103WlMN j/2LMxHyT6SrzicvQQHmuLQLW4oCk42yZt9kQ8+3qq378bPK8SdLl+9+7fTWhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d9R083fQkzY7v; Tue, 18 Nov 2025 00:52:08 +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 5AI0q8DP046747; Tue, 18 Nov 2025 00:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q8KH046744; Tue, 18 Nov 2025 00:52:08 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:08 GMT Message-Id: <202511180052.5AI0q8KH046744@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: ae3cd550d257 - stable/15 - sound: Retire feeder_class->desc 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 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: ae3cd550d257e38ea21dee0915677f0c6aafbb3e Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ae3cd550d257e38ea21dee0915677f0c6aafbb3e commit ae3cd550d257e38ea21dee0915677f0c6aafbb3e Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:24 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire feeder_class->desc The only field we care about is pcm_feederdesc->type, so keep that one only and do not embed the whole pcm_feederdesc. While here, make the feeder type enum into a named one and use it as feeder_class->type's type. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53556 (cherry picked from commit 91fcc0132d0b192f07f9b67626c9af2ad8759857) --- sys/dev/sound/pcm/feeder.c | 8 ++++---- sys/dev/sound/pcm/feeder.h | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index f55c3e5992e1..acc9e374e718 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -48,7 +48,7 @@ feeder_register_root(void *p) { struct feeder_class *fc = p; - KASSERT(fc->desc.type == FEEDER_ROOT, + KASSERT(fc->type == FEEDER_ROOT, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); @@ -60,7 +60,7 @@ feeder_register(void *p) { struct feeder_class *fc = p; - KASSERT(fc->desc.type != 0, ("feeder '%s' has no descriptor", fc->name)); + KASSERT(fc->type != 0, ("feeder '%s' has no descriptor", fc->name)); SLIST_INSERT_HEAD(&feedertab, fc, link); } @@ -119,7 +119,7 @@ feeder_getclass(u_int32_t type) struct feeder_class *fc; SLIST_FOREACH(fc, &feedertab, link) { - if (fc->desc.type == type) + if (fc->type == type) return (fc); } return (NULL); @@ -400,7 +400,7 @@ static struct feeder_class feeder_root_class = { .name = "feeder_root", .methods = feeder_root_methods, .size = sizeof(struct pcm_feeder), - .desc = { FEEDER_ROOT, 0, 0 }, + .type = FEEDER_ROOT, }; /* * Register the root feeder first so that pcm_addchan() and subsequent diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index f89652ab9635..171168d66e4e 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -27,6 +27,17 @@ * SUCH DAMAGE. */ +enum feeder_type { + FEEDER_ROOT, + FEEDER_FORMAT, + FEEDER_MIXER, + FEEDER_RATE, + FEEDER_EQ, + FEEDER_VOLUME, + FEEDER_MATRIX, + FEEDER_LAST, +}; + struct pcm_feederdesc { u_int32_t type; u_int32_t in, out; @@ -34,7 +45,7 @@ struct pcm_feederdesc { struct feeder_class { KOBJ_CLASS_FIELDS; - struct pcm_feederdesc desc; + enum feeder_type type; SLIST_ENTRY(feeder_class) link; }; @@ -63,27 +74,16 @@ struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type); void feeder_printchain(struct pcm_feeder *head); int feeder_chain(struct pcm_channel *); -#define FEEDER_DECLARE(feeder, type) \ +#define FEEDER_DECLARE(feeder, ctype) \ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ - .desc = { type, 0, 0 }, \ + .type = ctype, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ &feeder ## _class) -enum { - FEEDER_ROOT, - FEEDER_FORMAT, - FEEDER_MIXER, - FEEDER_RATE, - FEEDER_EQ, - FEEDER_VOLUME, - FEEDER_MATRIX, - FEEDER_LAST, -}; - /* feeder_format */ enum { FEEDFORMAT_CHANNELS