git: fd2bc75de92e - main - sound/midi: Rename M_TXEN to M_TXPEND

From: Christos Margiolis <christos_at_FreeBSD.org>
Date: Thu, 12 Nov 2026 16:38:15 UTC
The branch main has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=fd2bc75de92e19adfd7cc89fd8f166974b406f22

commit fd2bc75de92e19adfd7cc89fd8f166974b406f22
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-11-12 09:59:32 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
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;