From nobody Fri Jan 9 23:27:44 2026 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 4dnycK2NSvz6MYPr for ; Fri, 09 Jan 2026 23:27: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dnycJ6zqtz3mjk for ; Fri, 09 Jan 2026 23:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001265; 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=emMKT9o+I4s7GPyoEZCywKtFTkMkOzE4vUCnjcjcyVQ=; b=vq4ZUpx74VxlzxDRSY0rJG4tnFEq/5dj3ecnQ9czgJV5yFcePKK1me0VyXvQVtamj1578q 5GjrswN+/cq/Po5pV+YY6io6F01IQP9dUnJzwIpdG0+qMhniB55a621HLZOxLWkLcHhPLy ODFkqNtah/WYs7wnsn4H3fj4bowECAp5DQFmLFLpaAPE3Z6GpOVOR2kxHrdf/SfSvzeGXk HBvBZRjmwkY0Nq0zNf7PDPdSxeE1J7Me71cCUwK6s42CQjKfecxu0jq0aLbV9HC1kmFgS0 Xh5THnBR44YKY36ulh8HuFmyyOvt/6NuBykErJk/kT4vdpmCNjsPEosoMPv1SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001265; 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=emMKT9o+I4s7GPyoEZCywKtFTkMkOzE4vUCnjcjcyVQ=; b=vBao1MshrFv9jFvW8LzfVcWI4aqBkI9QXOBmD82lxU3l98r4T4svYf8B2hBJkY6FzJCKPq kdtLF+BfpSipVJ6YC3+PTLvYtKAkd0Y12x8OVncTQfJggmB/0BARqH2+yZPP0RhYKrYX0d IxBwUJjhgvS/TS1rf6BHZlzurr5BCZWqDZORisadSnl0lvVxM7/mR/PeC2AukdxBbeU4Ft XRepZnqkF9CFfIEIOAawI88IOjCK7JJJZT/VXZvfTBqwr5BKS5Xy0BS4aM6RyHavbpCY+U lYJpDyE6sOAzw8fU2UNOgVZk6qnLmigvjedD64eNDjm9eucpb6xP+2/jGJNy7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768001265; a=rsa-sha256; cv=none; b=Loj67eAUXzlMTOiKKUS4MsON8qGYqqJRcjt3pP3m6WXoAi+W4vVDPCnwYbuK74cRh+2HVC cn2eBGQZXc9dQBXK2kov76txEmgVtJchDMVoYT+Buij3olc056qCLTUL5f8cCbXg6ZWsyT BmjVvR+FXZWFuC1sJyxMJtn+BFxAJ8M2GyyqleTKW4hhEiUpsaCIUaQ51BVhMNxNbpYcKV 1N0WboY5VK2vLS/l4MRf+rtzNyEeQ5FOLEXcbOIlphHFrOHRR13wO21dQQ9pF7L0K4rWGb 2nxquSSuGjSp1Qmi98MTAL8rh68D956tYfKqV5dGPXGqzNNC/ugffWJYMIzHjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dnycJ3VntzDW9 for ; Fri, 09 Jan 2026 23:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 23:27:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 9ad643ff2e50 - stable/15 - snd_dummy: Initial MIDI support 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/15 X-Git-Reftype: branch X-Git-Commit: 9ad643ff2e50dd241b5176f8261287a18d492890 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 23:27:44 +0000 Message-Id: <69618ef0.31b42.c9f6e14@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9ad643ff2e50dd241b5176f8261287a18d492890 commit 9ad643ff2e50dd241b5176f8261287a18d492890 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:07 +0000 Commit: Christos Margiolis CommitDate: 2026-01-09 23:27:23 +0000 snd_dummy: Initial MIDI support Because testing the midi/ code of sound(4) requires a physical MIDI device, add some basic MIDI support to snd_dummy(4) so that we can test patches to midi/ easier. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54127 (cherry picked from commit e963472ef8533fb39b581e746cdc2ddc7447dca2) --- sys/dev/sound/dummy.c | 47 +++++++++++++++++++++++++++++++++ sys/modules/sound/driver/dummy/Makefile | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 74ca1d0c924c..aec76339ae17 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -40,7 +40,10 @@ #endif #include +#include + #include +#include #define DUMMY_NPCHAN 1 #define DUMMY_NRCHAN 1 @@ -66,6 +69,8 @@ struct dummy_softc { struct callout callout; struct mtx lock; bool stopped; + struct mpu401 *mpu; + mpu401_intr_t *mpu_intr; }; static bool @@ -93,6 +98,9 @@ dummy_chan_io(void *arg) struct dummy_chan *ch; int i = 0; + if (sc->mpu_intr) + (sc->mpu_intr)(sc->mpu); + if (sc->stopped) return; @@ -294,6 +302,39 @@ static kobj_method_t dummy_mixer_methods[] = { MIXER_DECLARE(dummy_mixer); +static uint8_t +dummy_mpu_read(struct mpu401 *arg, void *sc, int reg) +{ + return (0); +} + +static void +dummy_mpu_write(struct mpu401 *arg, void *sc, int reg, unsigned char b) +{ +} + +static int +dummy_mpu_uninit(struct mpu401 *arg, void *cookie) +{ + struct dummy_softc *sc = cookie; + + mtx_lock(&sc->lock); + sc->mpu_intr = NULL; + sc->mpu = NULL; + mtx_unlock(&sc->lock); + + return (0); +} + +static kobj_method_t dummy_mpu_methods[] = { + KOBJMETHOD(mpufoi_read, dummy_mpu_read), + KOBJMETHOD(mpufoi_write, dummy_mpu_write), + KOBJMETHOD(mpufoi_uninit, dummy_mpu_uninit), + KOBJMETHOD_END +}; + +static DEFINE_CLASS(dummy_mpu, dummy_mpu_methods, 0); + static void dummy_identify(driver_t *driver, device_t parent) { @@ -354,6 +395,11 @@ dummy_attach(device_t dev) */ make_dev_alias(sc->info.dsp_dev, "dsp.dummy"); + sc->mpu = mpu401_init(&dummy_mpu_class, sc, dummy_chan_io, + &sc->mpu_intr); + if (sc->mpu == NULL) + return (ENXIO); + return (0); } @@ -368,6 +414,7 @@ dummy_detach(device_t dev) mtx_unlock(&sc->lock); callout_drain(&sc->callout); err = pcm_unregister(dev); + mpu401_uninit(sc->mpu); mtx_destroy(&sc->lock); return (err); diff --git a/sys/modules/sound/driver/dummy/Makefile b/sys/modules/sound/driver/dummy/Makefile index fb4127d35073..41dec7c83b4d 100644 --- a/sys/modules/sound/driver/dummy/Makefile +++ b/sys/modules/sound/driver/dummy/Makefile @@ -1,7 +1,7 @@ .PATH: ${SRCTOP}/sys/dev/sound KMOD= snd_dummy -SRCS= bus_if.h device_if.h +SRCS= bus_if.h device_if.h mpufoi_if.h SRCS+= dummy.c .include