From nobody Thu Nov 12 16:38:15 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 4jQR076hw6z70sfl for ; Thu, 12 Nov 2026 16:38:15 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQR075JYQz4JLH for ; Thu, 12 Nov 2026 16:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794501495; 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=FlEOzYhkBpj9FsPHGXgQX2OIaAP3jLORUeufytz7ziQ=; b=MOn+W+2iu9JiGCzlOXTrmg63rnYw/Xs8BaR5xeFzQWoOQTBBwjM9xo3IYPQzTWAy8TIRrc A1bR9mFKoAphDeeoHhHKR5WgSvwFdAi6MV0jrb3IUXaUmnb9rqqlasWL0fJ4oIUy1oHrBO PwVXO6Lc7Fufqp7AXKxgA+p01zq2N1yQBoSFtl/0fuL10sNmvK5EHGpBb8aQF3Uc4K4lhL 4wQSJbyeNHNpd3qUl2LEeNe4Ns88CQAvknekq7aGeYnl2+79nCBMBXD6oFfmYwdc3TQWQe jBJf67kIDjQHx/hLVOVEgPm6oy4uXBqxC0ltrSLGCE99rB+2YNfblbXtNIAiRw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794501495; b=sOXw7uLGLwTQQSI7l6MNSvayZwrK6n0gjXYe7eKn8SEJgmG0b6YGW5Kx7l/3p9lpPw7LwV XUQNl/4kuwV0GxxlFJuRvxNS9mxOUfWLACxdmTggWulLUv7R9YaqP/uH+tZiwGGtl7y4fr BIdv42Il+AupDyVboLr8iZhoOB4y3C+N2GskbiyDuD6LTd+DyXKNxi8ztafmfcRwQEkbcg TxFQ/QxpA/dPzbqDnUTPvuU75NjN2NgD1syiPoEAu79bKPiEg6IiZJvVuUPrJUDX0NKf6U IvJ6KQ04hshnbetlXP5gr4Lavgao3x8v7MOeOzuv0zcToUuLg4QKH9cbf0fNmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794501495; 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=FlEOzYhkBpj9FsPHGXgQX2OIaAP3jLORUeufytz7ziQ=; b=IwaJZaAvhAQR/XYHiZXV8G1eOQt4gWDtpjapKbfa/2cLppDlDIrDfxQIGW0PJOmfSWDMT5 cMgN9KcZC6pX9gf08oQxffnprNmLRs2rWLv+EHOnDCGExU9nXNT1PIFeMaJDBx0xyYF0RU YSu1E+eACK9mmjOmwbuAWLR6NR1wM0d0EMIo+a/6rbnfCm3b1ffWF/ZVBdDenV4TL27iyD Uh4luDe6f1xqkaCPOlv/B2BkzaSrbuk2j8NjM4R2hF8cy6+eQ+KmeWv5y39Dy136SzygQd BdF+cYIvN80716I0BJh4Kvqs8jMNoAe/cwo3b1yVgULT8agd/AlL0KOzmqOqOg== 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 4jQR074RKQz19CL for ; Thu, 12 Nov 2026 16:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3611 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 16:38:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: fd2bc75de92e - main - sound/midi: Rename M_TXEN to M_TXPEND List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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/main X-Git-Reftype: branch X-Git-Commit: fd2bc75de92e19adfd7cc89fd8f166974b406f22 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 16:38:15 +0000 Message-Id: <6af5eb77.3611.37842f03@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fd2bc75de92e19adfd7cc89fd8f166974b406f22 commit fd2bc75de92e19adfd7cc89fd8f166974b406f22 Author: Christos Margiolis AuthorDate: 2026-11-12 09:59:32 +0000 Commit: Christos Margiolis CommitDate: 2026-11-12 16:35:49 +0000 sound/midi: Rename M_TXEN to M_TXPEND The flag means that there is data queued to transmit, not that transmission is enabled. No functional change intended. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/dev/sound/midi/midi.c | 12 ++++++------ sys/dev/sound/midi/midi.h | 2 +- sys/dev/sound/midi/mpu401.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 678695349765..be555b8bc027 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -252,7 +252,7 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) } /* - * midi_out: The only clearer of the M_TXEN flag. + * midi_out: The only clearer of the M_TXPEND flag. */ int midi_out(struct snd_midi *m, uint8_t *buf, int size) @@ -261,7 +261,7 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) mtx_lock(&m->lock); - if (!(m->flags & M_TXEN)) { + if (!(m->flags & M_TXPEND)) { mtx_unlock(&m->lock); return (0); } @@ -270,7 +270,7 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) if (used) midi_queue_deq(&m->outq, buf, used); if (m->outq.used == 0) { - m->flags &= ~M_TXEN; + m->flags &= ~M_TXPEND; MPU_CALLBACK(m, m->cookie, m->flags); } if (used && midi_queue_avail(&m->outq) > m->hiwat) { @@ -434,7 +434,7 @@ err0: } /* - * midi_write: The only setter of M_TXEN + * midi_write: The only setter of M_TXPEND */ int @@ -493,8 +493,8 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) /* * Inform the bottom half that data can be written */ - if (!(m->flags & M_TXEN)) { - m->flags |= M_TXEN; + if (!(m->flags & M_TXPEND)) { + m->flags |= M_TXPEND; MPU_CALLBACK(m, m->cookie, m->flags); } } diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h index 10e2b4382ccd..db9af2d2eb0f 100644 --- a/sys/dev/sound/midi/midi.h +++ b/sys/dev/sound/midi/midi.h @@ -40,7 +40,7 @@ MALLOC_DECLARE(M_MIDI); #define M_RX 0x01 #define M_TX 0x02 -#define M_TXEN 0x04 +#define M_TXPEND 0x04 struct snd_midi; diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 003a0d581973..17d9f132880f 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -119,10 +119,10 @@ mpu401_intr(struct mpu401 *m) s = STATUS(m); } - if ((m->flags & M_TXEN) && (m->si)) { + if ((m->flags & M_TXPEND) && (m->si)) { callout_reset(&m->timer, 1, mpu401_timeout, m); } - return (m->flags & M_TXEN) == M_TXEN; + return (m->flags & M_TXPEND) == M_TXPEND; } struct mpu401 * @@ -197,7 +197,7 @@ mpu401_mcallback(struct snd_midi *sm __unused, void *arg, int flags) { struct mpu401 *m = arg; - if (flags & M_TXEN && m->si) { + if (flags & M_TXPEND && m->si) { callout_reset(&m->timer, 1, mpu401_timeout, m); } m->flags = flags;