From nobody Fri Jan 9 23:27:52 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 4dnycT3Lgtz6MY8c for ; Fri, 09 Jan 2026 23:27:53 +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 4dnycS1rX9z3n8C for ; Fri, 09 Jan 2026 23:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001272; 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=FG64DitR6Fz7zx2uiGKWKOzWWnPk4negEWohBwZGN5Y=; b=imjjhnmD5y7sVk8zJ1LJAmpxVFfneFSYxzQAusqaiRbTIvarwxOxhh6sHzvLaKLxMdvkj0 fcJdGoWRvjK26zWeJoAVYWm0XkGcHEzcbGAh1hww4CRUwvmrMUdcSapZHOoXztxY1bzNSl 9hfLBMnyYR6paiXYugRzO6PrjtPzOmi5Kc9YnVZGQMkqKnwWzaxVhxB5iKCkraNYkyPrCb iIpLtv39TCdBnCuvra30T+9JN0yzy12NPFCvWltdQOZBw3C2PpV6csd05XQzO+dRsUIMHh EeNYmOft+T4rDLXB3DlIREO3rvEcals+4lFTd2ODFPs3RfBZtn6gzczYD+QHHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001272; 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=FG64DitR6Fz7zx2uiGKWKOzWWnPk4negEWohBwZGN5Y=; b=vB/SlDygr26M4kxAMLcERgxpIQ9WJ9H51sFqzBqIpjytDKrImV0xN3uzP2o57YMj7pL/1V 8ba62Ub53pH8LPltgDdyo3xo9baBf/HCKP5Np4xbkOyEoj+dkthR+M8dS7qRByYj/6ygM8 gnSI6nG15TeHu7v84Nv0yAwbuR4UWN9e6LeqBZxI0oUEPhBaJpIYk/YhuwFhPw7BvdZ0B3 PqP+0r0cgPEDm1Eoaxtc/YfYBld/lmakeS1hSuHwZsR7ivCnd+BrDuYkbwioozKUhrmtvO qjYWuDzMdzgnjR0NM/jeYnBy/rarHmS5eMmEbIhFoNjHBkCc70jaO9bJzXJn1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768001272; a=rsa-sha256; cv=none; b=mkeWE8NtUMNyZ4XG+brcVn31Y2IsnNh5+8Uz8W9yHr87S4Hlor9o8S0Bb7xvtIZfaBRNln FNE9yvRiuTMqxXuxdTIrcSloTn4APJv35wBZKTbmIPmf4VxD2x2WVQXXUzMikMto9roWN8 eAC7orKf67zdoZIzpVUx4OsWoeNVxy1/GdGzbpa/CZ+npvJyNYmG7/3ki38LvZ8850KK4X D8fA92X6Hemmt2bTwy+L5LQ/axwQKW5uxzgWc69GWmHlrnMdhYq8kU/q2XRDMh82yi/6zQ FhqSoOletZiLOqm4OctTFTRz9CzTDqk8ZUM2vqeX/i7pYToS3iCFJB7fVxatwg== 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 4dnycS1JlKzDZD for ; Fri, 09 Jan 2026 23:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32f71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 23:27:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b11224d935a3 - stable/15 - sound: Retire MIDI_DEBUG 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: b11224d935a39b4d4ebf78c2b6659f949c1cbb06 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 23:27:52 +0000 Message-Id: <69618ef8.32f71.21281152@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b11224d935a39b4d4ebf78c2b6659f949c1cbb06 commit b11224d935a39b4d4ebf78c2b6659f949c1cbb06 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:29 +0000 Commit: Christos Margiolis CommitDate: 2026-01-09 23:27:23 +0000 sound: Retire MIDI_DEBUG Better logging will be implemented. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit c288595c4eac14616f94c5b7eb84aad2eeeffc1f) --- sys/dev/sound/midi/midi.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index c658c8001b94..9b61e972fab9 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #ifdef HAVE_KERNEL_OPTION_HEADERS @@ -99,15 +98,6 @@ static struct cdevsw midi_cdevsw = { struct unrhdr *dev_unr = NULL; struct unrhdr *chn_unr = NULL; -SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, - "Midi driver"); - -int midi_debug; -/* XXX: should this be moved into debug.midi? */ -SYSCTL_INT(_hw_midi, OID_AUTO, debug, CTLFLAG_RW, &midi_debug, 0, ""); - -#define MIDI_DEBUG(l,a) if(midi_debug>=l) a - /* * Register a new midi device. * @@ -126,7 +116,6 @@ midi_init(kobj_class_t cls, void *cookie) inqsize = MPU_INQSIZE(m, cookie); outqsize = MPU_OUTQSIZE(m, cookie); - MIDI_DEBUG(1, printf("midiinit queues %d/%d.\n", inqsize, outqsize)); if (!inqsize && !outqsize) goto err1; @@ -178,7 +167,6 @@ err2: free(MIDIQ_BUF(m->outq), M_MIDI); err1: free(m, M_MIDI); - MIDI_DEBUG(1, printf("midi_init ended in error\n")); return NULL; } @@ -233,8 +221,6 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) mtx_lock(&m->lock); - MIDI_DEBUG(5, printf("midi_in: m=%p size=%d\n", m, size)); - if (!(m->flags & M_RX)) { /* We should return 0 but this may stop receiving/sending. */ mtx_unlock(&m->lock); @@ -243,14 +229,10 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) used = 0; - MIDI_DEBUG(6, printf("midi_in: len %jd avail %jd\n", - (intmax_t)MIDIQ_LEN(m->inq), - (intmax_t)MIDIQ_AVAIL(m->inq))); if (MIDIQ_AVAIL(m->inq) > size) { used = size; MIDIQ_ENQ(m->inq, buf, size); } else { - MIDI_DEBUG(4, printf("midi_in: Discarding data qu\n")); mtx_unlock(&m->lock); return 0; } @@ -273,14 +255,12 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) mtx_lock(&m->lock); - MIDI_DEBUG(2, printf("midi_out: %p\n", m)); if (!(m->flags & M_TXEN)) { mtx_unlock(&m->lock); return (0); } used = MIN(size, MIDIQ_LEN(m->outq)); - MIDI_DEBUG(3, printf("midi_out: used %d\n", used)); if (used) MIDIQ_DEQ(m->outq, buf, used); if (MIDIQ_EMPTY(m->outq)) { @@ -304,8 +284,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) struct snd_midi *m = i_dev->si_drv1; int retval; - MIDI_DEBUG(1, printf("midiopen %p %s %s\n", td, - flags & FREAD ? "M_RX" : "", flags & FWRITE ? "M_TX" : "")); if (m == NULL) return ENXIO; @@ -347,8 +325,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) MPU_CALLBACK(m, m->cookie, m->flags); - MIDI_DEBUG(2, printf("midi_open: opened.\n")); - err: mtx_unlock(&m->lock); return retval; @@ -361,9 +337,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) int retval; int oldflags; - MIDI_DEBUG(1, printf("midi_close %p %s %s\n", td, - flags & FREAD ? "M_RX" : "", flags & FWRITE ? "M_TX" : "")); - if (m == NULL) return ENXIO; @@ -403,9 +376,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) int used; char buf[MIDI_RSIZE]; - MIDI_DEBUG(5, printf("midiread: count=%lu\n", - (unsigned long)uio->uio_resid)); - retval = EIO; if (m == NULL) @@ -437,7 +407,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) mtx_lock(&m->lock); m->rchan = 0; } - MIDI_DEBUG(6, printf("midi_read start\n")); /* * At this point, it is certain that m->inq has data */ @@ -445,7 +414,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) used = MIN(MIDIQ_LEN(m->inq), uio->uio_resid); used = MIN(used, MIDI_RSIZE); - MIDI_DEBUG(6, printf("midiread: uiomove cc=%d\n", used)); MIDIQ_DEQ(m->inq, buf, used); retval = uiomove(buf, used, uio); if (retval) @@ -458,7 +426,7 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) retval = 0; err1: mtx_unlock(&m->lock); -err0: MIDI_DEBUG(4, printf("midi_read: ret %d\n", retval)); +err0: return retval; } @@ -475,7 +443,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) int used; char buf[MIDI_WSIZE]; - MIDI_DEBUG(4, printf("midi_write\n")); retval = 0; if (m == NULL) goto err0; @@ -491,7 +458,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) if (ioflag & O_NONBLOCK) goto err1; m->wchan = 1; - MIDI_DEBUG(3, printf("midi_write msleep\n")); retval = msleep(&m->wchan, &m->lock, PCATCH | PDROP, "midi TX", 0); /* @@ -514,11 +480,7 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) used = MIN(MIDIQ_AVAIL(m->outq), uio->uio_resid); used = MIN(used, MIDI_WSIZE); - MIDI_DEBUG(5, printf("midiout: resid %zd len %jd avail %jd\n", - uio->uio_resid, (intmax_t)MIDIQ_LEN(m->outq), - (intmax_t)MIDIQ_AVAIL(m->outq))); - MIDI_DEBUG(5, printf("midi_write: uiomove cc=%d\n", used)); retval = uiomove(buf, used, uio); if (retval) goto err1;