Module Name: src
Committed By: plunky
Date: Sat Feb 11 05:28:30 UTC 2012
Modified Files:
src/sys/dev/usb: umidi_quirks.c
Log Message:
add Roland UM-ONE (essentially, same as Roland UM-1)
from PR/45908 by Tom Ivar Helbekkmo
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/umidi_quirks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/umidi_quirks.c
diff -u src/sys/dev/usb/umidi_quirks.c:1.16 src/sys/dev/usb/umidi_quirks.c:1.17
--- src/sys/dev/usb/umidi_quirks.c:1.16 Tue Jul 8 11:34:43 2008
+++ src/sys/dev/usb/umidi_quirks.c Sat Feb 11 05:28:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.c,v 1.16 2008/07/08 11:34:43 gmcgarry Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.17 2012/02/11 05:28:30 plunky Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.16 2008/07/08 11:34:43 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.17 2012/02/11 05:28:30 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -515,6 +515,22 @@ UMQ_DEF(ROLAND, ROLAND_SONICCELL, 2) = {
};
/*
+ * ROLAND UM-ONE
+ */
+UMQ_FIXED_EP_DATA_DEF(ROLAND, ROLAND_UMONE, ANYIFACE, 1, 1) = {
+ /* out */
+ { 0, 1 },
+ /* in */
+ { 1, 1 }
+};
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UMONE, ANYIFACE, 1, 1);
+
+UMQ_DEF(ROLAND, ROLAND_UMONE, ANYIFACE) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_UMONE, ANYIFACE),
+ UMQ_TERMINATOR
+};
+
+/*
* Midiman Midisport 2x4. This has 2 physical MIDI IN jacks that are read
* on endpoint 0x81 (descriptor index 0). It has 4 physical MIDI OUT jacks
* that can be written on endpoints 2 or 4 (at descriptor index 2 or 4,
@@ -587,6 +603,7 @@ static struct umidi_quirk umidi_quirklis
UMQ_REG(ROLAND, ROLAND_UA25, 2),
UMQ_REG(ROLAND, ROLAND_UA4FX, 2),
UMQ_REG(ROLAND, ROLAND_SONICCELL, 2),
+ UMQ_REG(ROLAND, ROLAND_UMONE, ANYIFACE),
UMQ_REG(MIDIMAN, MIDIMAN_MIDISPORT2X4, ANYIFACE),
{ .vendor = 0 },
};