Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/usb add usbdevs entries and umidi quirks for Roland ...
details: https://anonhg.NetBSD.org/src/rev/fe67620accf9
branches: trunk
changeset: 552599:fe67620accf9
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Sun Sep 28 07:14:56 2003 +0000
description:
add usbdevs entries and umidi quirks for Roland USB MIDI devices
contributed in PR kern/18096 by Clemens Ladisch
diffstat:
sys/dev/usb/umidi_quirks.c | 212 ++++++++++++++++++++++++++++++++++++++++++++-
sys/dev/usb/usbdevs | 43 +++++++-
2 files changed, 244 insertions(+), 11 deletions(-)
diffs (truncated from 305 to 300 lines):
diff -r 55f9919155e8 -r fe67620accf9 sys/dev/usb/umidi_quirks.c
--- a/sys/dev/usb/umidi_quirks.c Sun Sep 28 06:55:57 2003 +0000
+++ b/sys/dev/usb/umidi_quirks.c Sun Sep 28 07:14:56 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.5 2003/09/28 07:14:56 jdolecek 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.4 2002/06/19 13:55:30 tshiozak Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.5 2003/09/28 07:14:56 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -168,6 +168,201 @@
UMQ_TERMINATOR
};
+/*
+ * ROLAND UA-100
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UA100, 2, 1, 1) = {
+ /* out */
+ { 0, 3 },
+ /* in */
+ { 1, 3 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_UA100, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_UA100, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND UM-4
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UM4, 2, 1, 1) = {
+ /* out */
+ { 0, 4 },
+ /* in */
+ { 1, 4 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_UM4, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_UM4, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND U-8
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_U8, 2, 1, 1) = {
+ /* out */
+ { 0, 2 },
+ /* in */
+ { 1, 2 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_U8, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_U8, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND UM-2
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UM2, 2, 1, 1) = {
+ /* out */
+ { 0, 2 },
+ /* in */
+ { 1, 2 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_UM2, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_UM2, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND SC-8820
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_SC8820, 2, 1, 1) = {
+ /* out */
+ { 0, 5 }, /* cables 0, 1, 4 only */
+ /* in */
+ { 1, 5 } /* do. */
+};
+
+UMQ_DEF(ROLAND, ROLAND_SC8820, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_SC8820, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND PC-300
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_PC300, 2, 1, 1) = {
+ /* out */
+ { 0, 1 },
+ /* in */
+ { 1, 1 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_PC300, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_PC300, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND SK-500
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_SK500, 2, 1, 1) = {
+ /* out */
+ { 0, 5 }, /* cables 0, 1, 4 only */
+ /* in */
+ { 1, 5 } /* do. */
+};
+
+UMQ_DEF(ROLAND, ROLAND_SK500, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_SK500, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND SC-D70
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_SCD70, 2, 1, 1) = {
+ /* out */
+ { 0, 3 },
+ /* in */
+ { 1, 3 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_SCD70, 2) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_SCD70, 2),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND XV-5050
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_XV5050, 0, 1, 1) = {
+ /* out */
+ { 0, 1 },
+ /* in */
+ { 1, 1 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_XV5050, 0) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_XV5050, 0),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND UM-550
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UM550, 0, 1, 1) = {
+ /* out */
+ { 0, 6 },
+ /* in */
+ { 1, 6 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_UM550, 0) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_UM550, 0),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND SD-20
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_SD20, 0, 1, 1) = {
+ /* out */
+ { 0, 2 },
+ /* in */
+ { 1, 3 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_SD20, 0) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_SD20, 0),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND SD-80
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_SD80, 0, 1, 1) = {
+ /* out */
+ { 0, 4 },
+ /* in */
+ { 1, 4 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_SD80, 0) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_SD80, 0),
+ UMQ_TERMINATOR
+};
+
+/*
+ * ROLAND UA-700
+ */
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UA700, 3, 1, 1) = {
+ /* out */
+ { 0, 2 },
+ /* in */
+ { 1, 2 }
+};
+
+UMQ_DEF(ROLAND, ROLAND_UA700, 3) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_UA700, 3),
+ UMQ_TERMINATOR
+};
+
/*
@@ -180,6 +375,19 @@
UMQ_REG(ROLAND, ROLAND_SC8850, 2),
UMQ_REG(ROLAND, ROLAND_SD90, 2),
UMQ_REG(ROLAND, ROLAND_UM880N, 0),
+ UMQ_REG(ROLAND, ROLAND_UA100, 2),
+ UMQ_REG(ROLAND, ROLAND_UM4, 2),
+ UMQ_REG(ROLAND, ROLAND_U8, 2),
+ UMQ_REG(ROLAND, ROLAND_UM2, 2),
+ UMQ_REG(ROLAND, ROLAND_SC8820, 2),
+ UMQ_REG(ROLAND, ROLAND_PC300, 2),
+ UMQ_REG(ROLAND, ROLAND_SK500, 2),
+ UMQ_REG(ROLAND, ROLAND_SCD70, 2),
+ UMQ_REG(ROLAND, ROLAND_XV5050, 0),
+ UMQ_REG(ROLAND, ROLAND_UM550, 0),
+ UMQ_REG(ROLAND, ROLAND_SD20, 0),
+ UMQ_REG(ROLAND, ROLAND_SD80, 0),
+ UMQ_REG(ROLAND, ROLAND_UA700, 3),
UMQ_TERMINATOR
};
diff -r 55f9919155e8 -r fe67620accf9 sys/dev/usb/usbdevs
--- a/sys/dev/usb/usbdevs Sun Sep 28 06:55:57 2003 +0000
+++ b/sys/dev/usb/usbdevs Sun Sep 28 07:14:56 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.341 2003/09/28 06:55:57 jdolecek Exp $
+$NetBSD: usbdevs,v 1.342 2003/09/28 07:14:56 jdolecek Exp $
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -1242,14 +1242,28 @@
product RAINBOW IKEY2000 0x1200 i-Key 2000
/* Roland products */
-product ROLAND SC8850 0x0003 RolandED SC-8850 SOUND Canvas MIDI Synth.
-product ROLAND UM1 0x0009 UM-1 MIDI I/F
+product ROLAND UA100 0x0000 UA-100 USB Audio I/F
+product ROLAND UM4 0x0002 UM-4 MIDI I/F
+product ROLAND SC8850 0x0003 RolandED SC-8850 SOUND Canvas MIDI Synth.
+product ROLAND U8 0x0004 U-8 USB Audio I/F
+product ROLAND UM2 0x0005 UM-2 MIDI I/F
+product ROLAND SC8820 0x0007 SoundCanvas SC-8820 MIDI Synth.
+product ROLAND PC300 0x0008 PC-300 MIDI Keyboard
+product ROLAND UM1 0x0009 UM-1 MIDI I/F
+product ROLAND SK500 0x000b SoundCanvas SK-500 MIDI Keyboard
+product ROLAND SCD70 0x000c SC-D70 MIDI Synth.
product ROLAND UA3 0x000f EDIROL UA-3 USB audio I/F
-product ROLAND UM880N 0x0014 EDIROL UM-880 MIDI I/F (native)
-product ROLAND UM880G 0x0015 EDIROL UM-880 MIDI I/F (generic)
-product ROLAND SD90 0x0016 EDIROL SD-90 STDIO Canvas MIDI Synth.
-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 XV5050 0x0012 XV-5050 MIDI Synth.
+product ROLAND UM880N 0x0014 EDIROL UM-880 MIDI I/F (native)
+product ROLAND UM880G 0x0015 EDIROL UM-880 MIDI I/F (generic)
+product ROLAND SD90 0x0016 EDIROL SD-90 STDIO Canvas MIDI Synth.
+product ROLAND UA1A 0x0018 UA-1A USB Audio I/F
+product ROLAND UM550 0x0023 UM-550 MIDI I/F
+product ROLAND SD20 0x0027 SD-20 MIDI Synth.
+product ROLAND SD80 0x0029 SD-80 MIDI Synth.
+product ROLAND UA700 0x002b UA-700 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
/* Rockfire products */
product ROCKFIRE GAMEPAD 0x2033 gamepad 203USB
@@ -1463,7 +1477,18 @@
/* Yamaha products */
product YAMAHA UX256 0x1000 UX256 MIDI I/F
-product YAMAHA UX96 0x1008 UX96 MIDI I/F
+product YAMAHA MU1000 0x1001 MU1000 MIDI Synth.
+product YAMAHA MU2000 0x1002 MU2000 MIDI Synth.
+product YAMAHA MU500 0x1003 MU500 MIDI Synth.
+product YAMAHA UW500 0x1004 UW500 USB Audio I/F
+product YAMAHA MOTIF6 0x1005 MOTIF6 MIDI Synth. Workstation
+product YAMAHA MOTIF7 0x1006 MOTIF7 MIDI Synth. Workstation
+product YAMAHA MOTIF8 0x1007 MOTIF8 MIDI Synth. Workstation
+product YAMAHA UX96 0x1008 UX96 MIDI I/F
+product YAMAHA UX16 0x1009 UX16 MIDI I/F
+product YAMAHA S08 0x100e S08 MIDI Keyboard
Home |
Main Index |
Thread Index |
Old Index