The branch stable/14 has been updated by christos:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2baf2b2f104235118d065a2bffba41d3f7bf54af
commit 2baf2b2f104235118d065a2bffba41d3f7bf54af
Author: Christos Margiolis <chris...@freebsd.org>
AuthorDate: 2024-07-06 18:22:31 +0000
Commit: Christos Margiolis <chris...@freebsd.org>
CommitDate: 2024-07-10 16:48:12 +0000
sound: Remove MIDI_TYPE
No good reason to have this. It only makes things harder to read.
Sponsored by: The FreeBSD Foundation
MFC after: 2 days
Reviewed by: dev_submerge.ch, markj
Differential Revision: https://reviews.freebsd.org/D45773
(cherry picked from commit 526bd1d87ec997e1c090262da6f2d9b6da0e8f89)
---
sys/dev/sound/midi/midi.c | 12 ++++++------
sys/dev/sound/midi/midi.h | 6 ++----
sys/dev/sound/midi/mpu401.c | 2 +-
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index dab8fe559a0d..21b319a5f18f 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -282,7 +282,7 @@ midi_init(kobj_class_t cls, int unit, int channel, void
*cookie)
struct snd_midi *m;
int i;
int inqsize, outqsize;
- MIDI_TYPE *buf;
+ uint8_t *buf;
MIDI_DEBUG(1, printf("midiinit: unit %d/%d.\n", unit, channel));
sx_xlock(&midistat_lock);
@@ -331,14 +331,14 @@ midi_init(kobj_class_t cls, int unit, int channel, void
*cookie)
mtx_lock(&m->qlock);
if (inqsize)
- buf = malloc(sizeof(MIDI_TYPE) * inqsize, M_MIDI, M_NOWAIT);
+ buf = malloc(sizeof(uint8_t) * inqsize, M_MIDI, M_NOWAIT);
else
buf = NULL;
MIDIQ_INIT(m->inq, buf, inqsize);
if (outqsize)
- buf = malloc(sizeof(MIDI_TYPE) * outqsize, M_MIDI, M_NOWAIT);
+ buf = malloc(sizeof(uint8_t) * outqsize, M_MIDI, M_NOWAIT);
else
buf = NULL;
m->hiwat = outqsize / 2;
@@ -449,12 +449,12 @@ static int midi_lengths[] = {2, 2, 2, 2, 1, 1, 2, 0};
#define MIDI_SYSEX_END 0xF7
int
-midi_in(struct snd_midi *m, MIDI_TYPE *buf, int size)
+midi_in(struct snd_midi *m, uint8_t *buf, int size)
{
/* int i, sig, enq; */
int used;
- /* MIDI_TYPE data; */
+ /* uint8_t data; */
MIDI_DEBUG(5, printf("midi_in: m=%p size=%d\n", m, size));
/*
@@ -579,7 +579,7 @@ midi_in(struct snd_midi *m, MIDI_TYPE *buf, int size)
* midi_out: The only clearer of the M_TXEN flag.
*/
int
-midi_out(struct snd_midi *m, MIDI_TYPE *buf, int size)
+midi_out(struct snd_midi *m, uint8_t *buf, int size)
{
int used;
diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h
index b200eed9bc74..afbfdfa6abbc 100644
--- a/sys/dev/sound/midi/midi.h
+++ b/sys/dev/sound/midi/midi.h
@@ -39,8 +39,6 @@ MALLOC_DECLARE(M_MIDI);
#define M_RXEN 0x04
#define M_TXEN 0x08
-#define MIDI_TYPE unsigned char
-
extern struct sx midistat_lock;
struct snd_midi;
@@ -48,8 +46,8 @@ struct snd_midi;
struct snd_midi *
midi_init(kobj_class_t _mpu_cls, int _unit, int _channel, void *cookie);
int midi_uninit(struct snd_midi *_m);
-int midi_out(struct snd_midi *_m, MIDI_TYPE *_buf, int _size);
-int midi_in(struct snd_midi *_m, MIDI_TYPE *_buf, int _size);
+int midi_out(struct snd_midi *_m, uint8_t *_buf, int _size);
+int midi_in(struct snd_midi *_m, uint8_t *_buf, int _size);
kobj_t midimapper_addseq(void *arg1, int *unit, void **cookie);
int midimapper_open_locked(void *arg1, void **cookie);
diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c
index 1152c117f7f6..8a97016b27c7 100644
--- a/sys/dev/sound/midi/mpu401.c
+++ b/sys/dev/sound/midi/mpu401.c
@@ -119,7 +119,7 @@ static int
mpu401_intr(struct mpu401 *m)
{
#define MPU_INTR_BUF 16
- MIDI_TYPE b[MPU_INTR_BUF];
+ uint8_t b[MPU_INTR_BUF];
int i;
int s;
