summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2006-03-26 17:58:19 +0000
committerchristos <christos@NetBSD.org>2006-03-26 17:58:19 +0000
commit4db902eee0fb591aa9ecc73e4a6006a6d10fc97d (patch)
tree171737ca11e5045e4685e1a7a7a36591d001ce02 /sys/dev/usb
parent517eb6559aa4cd3e2bc19d14058b59e570b729a5 (diff)
PR/33154: DHOYASHIKI Shinichi: umidi quirks for Roland UM-3EX
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/umidi_quirks.c20
-rw-r--r--sys/dev/usb/usbdevs4
2 files changed, 21 insertions, 3 deletions
diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c
index 739e64cd2f3..9bebbeaa536 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.9 2005/12/11 12:24:01 christos Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.10 2006/03/26 17:58:19 christos 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.9 2005/12/11 12:24:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.10 2006/03/26 17:58:19 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -436,6 +436,21 @@ UMQ_DEF(ROLAND, ROLAND_PCR, 0) = {
};
/*
+ * ROLAND UM-3EX
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UM3, 0, 1, 1) = {
+ /* out */
+ { 0, 3 },
+ /* in */
+ { 1, 3 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_UM3, 0) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_UM3, 0),
+ UMQ_TERMINATOR
+};
+
+/*
* quirk list
*/
struct umidi_quirk umidi_quirklist[] = {
@@ -463,6 +478,7 @@ struct umidi_quirk umidi_quirklist[] = {
UMQ_REG(ROLAND, ROLAND_UA101F, 2),
UMQ_REG(ROLAND, ROLAND_FANTOMX, 0),
UMQ_REG(ROLAND, ROLAND_PCR, 0),
+ UMQ_REG(ROLAND, ROLAND_UM3, 0),
UMQ_TERMINATOR
};
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 5c518720db8..40b366dc2da 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.424 2006/03/25 14:12:19 gdt Exp $
+$NetBSD: usbdevs,v 1.425 2006/03/26 17:58:19 christos Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1628,6 +1628,8 @@ product ROLAND UA3FX 0x0051 EDIROL UA-3FX USB audio I/F
product ROLAND FANTOMX 0x006d Fantom-X MIDI Synth.
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
/* Rockfire products */
product ROCKFIRE GAMEPAD 0x2033 gamepad 203USB