diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h --- a/sys/dev/sound/midi/midi.h +++ b/sys/dev/sound/midi/midi.h @@ -34,9 +34,6 @@ #define MIDI_H #include -#include - -MALLOC_DECLARE(M_MIDI); #define M_RX 0x01 #define M_TX 0x02 diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -58,8 +59,6 @@ #include "mpu_if.h" -MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); - #define MIDI_NAMELEN 16 struct snd_midi { KOBJ_FIELDS; @@ -114,7 +113,7 @@ uint8_t *ibuf = NULL; uint8_t *obuf = NULL; - m = malloc(sizeof(*m), M_MIDI, M_WAITOK | M_ZERO); + m = malloc(sizeof(*m), M_DEVBUF, M_WAITOK | M_ZERO); kobj_init((kobj_t)m, cls); inqsize = MPU_INQSIZE(m, cookie); outqsize = MPU_OUTQSIZE(m, cookie); @@ -125,11 +124,11 @@ mtx_init(&m->lock, "raw midi", NULL, 0); if (inqsize) { - ibuf = malloc(sizeof(uint8_t) * inqsize, M_MIDI, + ibuf = malloc(sizeof(uint8_t) * inqsize, M_DEVBUF, M_WAITOK | M_ZERO); } if (outqsize) { - obuf = malloc(sizeof(uint8_t) * outqsize, M_MIDI, + obuf = malloc(sizeof(uint8_t) * outqsize, M_DEVBUF, M_WAITOK | M_ZERO); } @@ -160,11 +159,11 @@ mtx_destroy(&m->lock); if (MIDIQ_BUF(m->inq)) - free(MIDIQ_BUF(m->inq), M_MIDI); + free(MIDIQ_BUF(m->inq), M_DEVBUF); if (MIDIQ_BUF(m->outq)) - free(MIDIQ_BUF(m->outq), M_MIDI); + free(MIDIQ_BUF(m->outq), M_DEVBUF); err1: - free(m, M_MIDI); + free(m, M_DEVBUF); return NULL; } @@ -184,10 +183,10 @@ MPU_UNINIT(m, m->cookie); destroy_dev(m->dev); free_unr(midi_unr, m->unit); - free(MIDIQ_BUF(m->inq), M_MIDI); - free(MIDIQ_BUF(m->outq), M_MIDI); + free(MIDIQ_BUF(m->inq), M_DEVBUF); + free(MIDIQ_BUF(m->outq), M_DEVBUF); mtx_destroy(&m->lock); - free(m, M_MIDI); + free(m, M_DEVBUF); return (0); } diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -31,6 +31,7 @@ #include #include #include +#include #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_snd.h" @@ -144,7 +145,7 @@ struct mpu401 *m; *cb = NULL; - m = malloc(sizeof(*m), M_MIDI, M_NOWAIT | M_ZERO); + m = malloc(sizeof(*m), M_DEVBUF, M_NOWAIT | M_ZERO); if (!m) return NULL; @@ -164,7 +165,7 @@ return m; err: printf("mpu401_init error\n"); - free(m, M_MIDI); + free(m, M_DEVBUF); return NULL; } @@ -177,7 +178,7 @@ retval = midi_uninit(m->mid); if (retval) return retval; - free(m, M_MIDI); + free(m, M_DEVBUF); return 0; }