summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/sndiod/dev.c8
-rw-r--r--usr.bin/sndiod/sysex.h7
2 files changed, 11 insertions, 4 deletions
diff --git a/usr.bin/sndiod/dev.c b/usr.bin/sndiod/dev.c
index 3f39b99191d..0fae5495c94 100644
--- a/usr.bin/sndiod/dev.c
+++ b/usr.bin/sndiod/dev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dev.c,v 1.7 2013/11/18 17:37:45 ratchov Exp $ */
+/* $OpenBSD: dev.c,v 1.8 2013/12/20 08:47:37 ratchov Exp $ */
/*
* Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
*
@@ -335,7 +335,7 @@ dev_midi_full(struct dev *d)
x.start = SYSEX_START;
x.type = SYSEX_TYPE_RT;
- x.dev = 0x7f;
+ x.dev = SYSEX_DEV_ANY;
x.id0 = SYSEX_MTC;
x.id1 = SYSEX_MTC_FULL;
x.u.full.hr = d->mtc.hr | (d->mtc.fps_id << 5);
@@ -372,6 +372,7 @@ dev_midi_master(struct dev *d)
memset(&x, 0, sizeof(struct sysex));
x.start = SYSEX_START;
x.type = SYSEX_TYPE_RT;
+ x.dev = SYSEX_DEV_ANY;
x.id0 = SYSEX_CONTROL;
x.id1 = SYSEX_MASTER;
x.u.master.fine = 0;
@@ -391,6 +392,7 @@ dev_midi_slotdesc(struct dev *d, struct slot *s)
memset(&x, 0, sizeof(struct sysex));
x.start = SYSEX_START;
x.type = SYSEX_TYPE_EDU;
+ x.dev = SYSEX_DEV_ANY;
x.id0 = SYSEX_AUCAT;
x.id1 = SYSEX_AUCAT_SLOTDESC;
if (*s->name != '\0') {
@@ -416,7 +418,7 @@ dev_midi_dump(struct dev *d)
}
x.start = SYSEX_START;
x.type = SYSEX_TYPE_EDU;
- x.dev = 0;
+ x.dev = SYSEX_DEV_ANY;
x.id0 = SYSEX_AUCAT;
x.id1 = SYSEX_AUCAT_DUMPEND;
x.u.dumpend.end = SYSEX_END;
diff --git a/usr.bin/sndiod/sysex.h b/usr.bin/sndiod/sysex.h
index 543faf4e870..06e2c5fd573 100644
--- a/usr.bin/sndiod/sysex.h
+++ b/usr.bin/sndiod/sysex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysex.h,v 1.1 2012/11/23 07:03:28 ratchov Exp $ */
+/* $OpenBSD: sysex.h,v 1.2 2013/12/20 08:47:37 ratchov Exp $ */
/*
* Copyright (c) 2011 Alexandre Ratchov <alex@caoua.org>
*
@@ -46,6 +46,11 @@
#define SYSEX_MMC_LOC_CMD 0x01
/*
+ * sepcial "any" midi device number
+ */
+#define SYSEX_DEV_ANY 0x7f
+
+/*
* aucat-specific messages, in the "edu" namespace
*/
#define SYSEX_AUCAT 0x23 /* aucat-specific */