summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorxtraeme <xtraeme@NetBSD.org>2007-10-14 01:08:35 +0000
committerxtraeme <xtraeme@NetBSD.org>2007-10-14 01:08:35 +0000
commitfe47e4a5cff698c975d1025cb792c4506e586f3b (patch)
tree4312dc5ae29a28e992161608641cbd01a0e40683 /sys/dev
parent048deba5252059e5026af28561eaa5af88af12c6 (diff)
umidi(4) entries plus quirks for Roland UA25, UA4FX and SonicCell.
Submitted by DHOYASHIKI Shinichi via PR kern/36834.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/umidi_quirks.c52
-rw-r--r--sys/dev/usb/usbdevs5
2 files changed, 54 insertions, 3 deletions
diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c
index 6a3a127b1b3..2ba3ac988f9 100644
--- a/sys/dev/usb/umidi_quirks.c
+++ b/sys/dev/usb/umidi_quirks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.c,v 1.12 2006/09/03 21:28:03 christos Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.13 2007/10/14 01:08:36 xtraeme Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.12 2006/09/03 21:28:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.13 2007/10/14 01:08:36 xtraeme Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -451,6 +451,51 @@ UMQ_DEF(ROLAND, ROLAND_UM3, 0) = {
};
/*
+ * ROLAND UA-25
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UA25, 2, 1, 1) = {
+ /* out */
+ { 0, 1 },
+ /* in */
+ { 1, 1 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_UA25, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_UA25, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND UA-4FX
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UA4FX, 2, 1, 1) = {
+ /* out */
+ { 0, 1 },
+ /* in */
+ { 1, 1 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_UA4FX, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_UA4FX, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND SonicCell
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_SONICCELL, 2, 1, 1) = {
+ /* out */
+ { 0, 1 },
+ /* in */
+ { 1, 1 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_SONICCELL, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_SONICCELL, 2),
+ 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,
@@ -513,6 +558,9 @@ struct umidi_quirk umidi_quirklist[] = {
UMQ_REG(ROLAND, ROLAND_FANTOMX, 0),
UMQ_REG(ROLAND, ROLAND_PCR, 0),
UMQ_REG(ROLAND, ROLAND_UM3, 0),
+ UMQ_REG(ROLAND, ROLAND_UA25, 2),
+ UMQ_REG(ROLAND, ROLAND_UA4FX, 2),
+ UMQ_REG(ROLAND, ROLAND_SONICCELL, 2),
UMQ_REG(MIDIMAN, MIDIMAN_MIDISPORT2X4, ANYIFACE),
{ .vendor = 0 },
};
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index ea9486cbf22..5a39ecc9a1d 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.485 2007/09/22 08:37:01 mlelstv Exp $
+$NetBSD: usbdevs,v 1.486 2007/10/14 01:08:35 xtraeme Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1884,10 +1884,13 @@ product ROLAND UA1000 0x0044 EDIROL UA-1000 USB audio I/F
product ROLAND UA3FXA 0x0050 EDIROL UA-3FX USB audio I/F (advanced)
product ROLAND UA3FX 0x0051 EDIROL UA-3FX USB audio I/F
product ROLAND FANTOMX 0x006d Fantom-X MIDI Synth.
+product ROLAND UA25 0x0074 EDIROL UA-25
product ROLAND UA101 0x007d EDIROL UA-101
product ROLAND UA101F 0x008d EDIROL UA-101 USB1
product ROLAND UA1EX 0x0096 EDIROL UA-1EX
product ROLAND UM3 0x009A EDIROL UM-3
+product ROLAND UA4FX 0x00A3 EDIROL UA-4FX
+product ROLAND SONICCELL 0x00C2 SonicCell
/* Sagem products */
product SAGEM XG760A 0x004a XG-760A