staging: line6: add Pod HD300 support
cover staging: line6: add Pod HD300 support
These patches add Pod HD300 support to the line6usb driver. The Pod HD family is the current generation of devices from Line6. It works along the same lines as the Pod xt but introduces new MIDI SysEx messages and is not compatible with Pod xt messages.
These patches make Pod HD300 work out-of-the-box and provide both MIDI and pcm interfaces. I have tested playback and capture successfully with Audacity and native ALSA applications going through PulseAudio. I have tested MIDI using amidi(1) to store SysEx dumps sent from the device and to adjust controller parameters.
Patch 1 sets a saner default for MIDI masks because the default value drops messages from the Pod HD300, which operates on Channel 1.
Patch 2 adds the Pod HD300 USB IDs and Pod HD functionality based on stripped down Pod xt code.
If we moved the hardcoded Pod xt MIDI messages into a userspace library then it would be possible to unify pod.c and podhd.c. I don't have a Pod xt device to test against so it's hard for me to make this change without help.
Stefan Hajnoczi (2):
staging: line6: accept all MIDI channels by default
staging: line6: add Pod HD300 support
drivers/staging/line6/Makefile | 3 +- drivers/staging/line6/driver.c | 24 ++++++- drivers/staging/line6/midi.c | 4 +- drivers/staging/line6/pcm.c | 1 + drivers/staging/line6/podhd.c | 158 +++++++++++++++++++++++++++++++++++++++ drivers/staging/line6/podhd.h | 30 ++++++++ drivers/staging/line6/usbdefs.h | 2 + 7 files changed, 218 insertions(+), 4 deletions(-) create mode 100644 drivers/staging/line6/podhd.c create mode 100644 drivers/staging/line6/podhd.h
Signature · 1 line
1.7.7
PATCH 1/2 staging: line6: accept all MIDI channels by default
MIDI messages can be filtered by channel so that multiple devices can coexist on the same MIDI bus. By default all channels should be accepted; this is important because Line6 devices seem to have different default channels.
Accept all MIDI messages by default to avoid confusing users when messages are silently filtered out. If filtering is necessary due to multiple devices on the bus, users can set the midi_mask_transmit and midi_mask_receive sysfs attributes.
--- drivers/staging/line6/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/line6/midi.c +2 -2
@@ -399,8 +399,8 @@ int line6_init_midi(struct usb_line6 *line6)return err; line6midi->line6 = line6; - line6midi->midi_mask_transmit =1 ; - line6midi->midi_mask_receive =4 ; + line6midi->midi_mask_transmit =0xffff ; + line6midi->midi_mask_receive =0xffff ; line6->line6midi = line6midi; err = snd_device_new(line6->card, SNDRV_DEV_RAWMIDI, line6midi,
Signature · 1 line
1.7.7
PATCH 2/2 staging: line6: add Pod HD300 support
In reply to Stefan HajnocziThe Pod HD device family uses new MIDI SysEx messages and therefore cannot reuse the existing Pod code. Instead of hardcoding Pod HD MIDI messages into the driver, leave MIDI up to userspace. This driver simply presents MIDI and pcm ALSA devices.
This device is similar to the Pod except that it has 48 kHz audio and does not respond to Pod SysEx messages.
--- drivers/staging/line6/Makefile | 3 +- drivers/staging/line6/driver.c | 24 ++++++- drivers/staging/line6/pcm.c | 1 + drivers/staging/line6/podhd.c | 158 +++++++++++++++++++++++++++++++++++++++ drivers/staging/line6/podhd.h | 30 ++++++++ drivers/staging/line6/usbdefs.h | 2 + 6 files changed, 216 insertions(+), 2 deletions(-) create mode 100644 drivers/staging/line6/podhd.c create mode 100644 drivers/staging/line6/podhd.h
drivers/staging/line6/Makefile +2 -1
@@ -12,4 +12,5 @@ line6usb-y := \ playback.o \ pod.o \ toneport.o \ - variax.o + variax.o \ + podhd.o
drivers/staging/line6/driver.c +23 -1
@@ -21,6 +21,7 @@#include "midi.h" #include "playback.h" #include "pod.h" +#include "podhd.h" #include "revision.h" #include "toneport.h" #include "usbdefs.h"
@@ -49,6 +50,7 @@ static const struct usb_device_id line6_id_table[] = { {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_TONEPORT_UX1)}, {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_TONEPORT_UX2)}, {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_VARIAX)}, + {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD300)}, {}, };
@@ -72,7 +74,8 @@ static struct line6_properties line6_properties_table[] = { { "TonePortGX", "TonePort GX", LINE6_BIT_TONEPORT_GX, LINE6_BIT_PCM }, { "TonePortUX1", "TonePort UX1", LINE6_BIT_TONEPORT_UX1, LINE6_BIT_PCM }, { "TonePortUX2", "TonePort UX2", LINE6_BIT_TONEPORT_UX2, LINE6_BIT_PCM }, - { "Variax", "Variax Workbench", LINE6_BIT_VARIAX, LINE6_BIT_CONTROL } + { "Variax", "Variax Workbench", LINE6_BIT_VARIAX, LINE6_BIT_CONTROL }, + { "PODHD300", "POD HD300", LINE6_BIT_PODHD300, LINE6_BIT_CONTROL_PCM_HWMON }, };/* *INDENT-ON* */
@@ -437,6 +440,9 @@ static void line6_data_received(struct urb *urb) line6);break ; +case LINE6_DEVID_PODHD300 : +break ;/* let userspace handle MIDI */ +case LINE6_DEVID_PODXTLIVE :switch (line6->interface_number) {case PODXTLIVE_INTERFACE_POD :
@@ -812,6 +818,7 @@ static int line6_probe(struct usb_interface *interface,case LINE6_DEVID_BASSPODXTPRO :case LINE6_DEVID_PODXT :case LINE6_DEVID_PODXTPRO : +case LINE6_DEVID_PODHD300 : alternate =5 ;break ;
@@ -865,6 +872,12 @@ static int line6_probe(struct usb_interface *interface, ep_write =0x03 ;break ; +case LINE6_DEVID_PODHD300 : + size =sizeof (struct usb_line6_podhd ); + ep_read =0x84 ; + ep_write =0x03 ; +break ; +case LINE6_DEVID_POCKETPOD : size =sizeof (struct usb_line6_pod ); ep_read =0x82 ;
@@ -1017,6 +1030,11 @@ static int line6_probe(struct usb_interface *interface, ret =line6_pod_init (interface, (struct usb_line6_pod *)line6);break ; +case LINE6_DEVID_PODHD300 : + ret =line6_podhd_init (interface, + (struct usb_line6_podhd *)line6); +break ; +case LINE6_DEVID_PODXTLIVE :switch (interface_number) {case PODXTLIVE_INTERFACE_POD :
@@ -1139,6 +1157,10 @@ static void line6_disconnect(struct usb_interface *interface)line6_pod_disconnect (interface);break ; +case LINE6_DEVID_PODHD300 : +line6_podhd_disconnect (interface); +break ; +case LINE6_DEVID_PODXTLIVE :switch (interface_number) {case PODXTLIVE_INTERFACE_POD :
drivers/staging/line6/pcm.c +1 -0
@@ -403,6 +403,7 @@ int line6_init_pcm(struct usb_line6 *line6,case LINE6_DEVID_PODXT :case LINE6_DEVID_PODXTLIVE :case LINE6_DEVID_PODXTPRO : +case LINE6_DEVID_PODHD300 : ep_read =0x82 ; ep_write =0x01 ;break ;
drivers/staging/line6/podhd.c new file +158 -0
158 lines not on this page · raw message
drivers/staging/line6/podhd.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Line6 Pod HD +* +* Copyright (C) 2011 Stefan Hajnoczi <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, version 2. +* +*/ + +#ifndef PODHD_H +#define PODHD_H + +#include <linux/usb.h> + +#include "driver.h" + +struct usb_line6_podhd { +/** +Generic Line6 USB data. +*/ +struct usb_line6 line6; +}; + +extern void line6_podhd_disconnect (struct usb_interface *interface); +extern int line6_podhd_init (struct usb_interface *interface, +struct usb_line6_podhd *podhd); + +#endif /* PODHD_H */
drivers/staging/line6/usbdefs.h +2 -0
@@ -36,6 +36,7 @@#define LINE6_DEVID_TONEPORT_UX1 0x4141#define LINE6_DEVID_TONEPORT_UX2 0x4142#define LINE6_DEVID_VARIAX 0x534d +#define LINE6_DEVID_PODHD300 0x5057#define LINE6_BIT_BASSPODXT (1 << 0)#define LINE6_BIT_BASSPODXTLIVE (1 << 1)
@@ -54,6 +55,7 @@#define LINE6_BIT_TONEPORT_UX1 (1 << 14)#define LINE6_BIT_TONEPORT_UX2 (1 << 15)#define LINE6_BIT_VARIAX (1 << 16) +#define LINE6_BIT_PODHD300 (1 << 17)#define LINE6_BITS_PRO (LINE6_BIT_BASSPODXTPRO | \ LINE6_BIT_PODXTPRO)
Signature · 1 line
1.7.7