Page MenuHomeFreeBSD
Files F137954094

D45772.diff
No OneTemporary
Actions

D45772.diff
View Options

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
@@ -73,10 +73,6 @@
#define KOBJMETHOD_END { NULL, NULL }
#endif
-#define PCMMKMINOR(u, d, c) ((((c) & 0xff) << 16) | (((u) & 0x0f) << 4) | ((d) & 0x0f))
-#define MIDIMKMINOR(u, d, c) PCMMKMINOR(u, d, c)
-
-#define MIDI_DEV_RAW 2
#define MIDI_DEV_MIDICTL 12
enum midi_states {
@@ -364,9 +360,8 @@
sx_xunlock(&midistat_lock);
- m->dev = make_dev(&midi_cdevsw,
- MIDIMKMINOR(unit, MIDI_DEV_RAW, channel),
- UID_ROOT, GID_WHEEL, 0666, "midi%d.%d", unit, channel);
+ m->dev = make_dev(&midi_cdevsw, unit, UID_ROOT, GID_WHEEL, 0666,
+ "midi%d.%d", unit, channel);
m->dev->si_drv1 = m;
return m;
@@ -1387,9 +1382,8 @@
sx_init(&midistat_lock, "midistat lock");
TAILQ_INIT(&midi_devs);
- midistat_dev = make_dev(&midistat_cdevsw,
- MIDIMKMINOR(0, MIDI_DEV_MIDICTL, 0),
- UID_ROOT, GID_WHEEL, 0666, "midistat");
+ midistat_dev = make_dev(&midistat_cdevsw, MIDI_DEV_MIDICTL, UID_ROOT,
+ GID_WHEEL, 0666, "midistat");
return 0;
}
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -91,10 +91,6 @@
#define LOOKUP_OPEN (1)
#define LOOKUP_CLOSE (2)
-#define PCMMKMINOR(u, d, c) \
- ((((c) & 0xff) << 16) | (((u) & 0x0f) << 4) | ((d) & 0x0f))
-#define MIDIMKMINOR(u, d, c) PCMMKMINOR(u, d, c)
-#define MIDIUNIT(y) ((dev2unit(y) >> 4) & 0x0f)
#define MIDIDEV(y) (dev2unit(y) & 0x0f)
/* These are the entries to the sequencer driver. */
@@ -567,12 +563,10 @@
if (scp->mapper == NULL)
goto err;
- scp->seqdev = make_dev(&seq_cdevsw,
- MIDIMKMINOR(scp->unit, SND_DEV_SEQ, 0), UID_ROOT,
- GID_WHEEL, 0666, "sequencer%d", scp->unit);
+ scp->seqdev = make_dev(&seq_cdevsw, SND_DEV_SEQ, UID_ROOT, GID_WHEEL,
+ 0666, "sequencer%d", scp->unit);
- scp->musicdev = make_dev(&seq_cdevsw,
- MIDIMKMINOR(scp->unit, SND_DEV_MUSIC, 0), UID_ROOT,
+ scp->musicdev = make_dev(&seq_cdevsw, SND_DEV_MUSIC, UID_ROOT,
GID_WHEEL, 0666, "music%d", scp->unit);
if (scp->seqdev == NULL || scp->musicdev == NULL)

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 3:54 PM (13 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26287581
Default Alt Text
D45772.diff (2 KB)

Event Timeline