[ALSA] usbaudio - Add support for Edirol UA-101
Added support for the Edirol UA-101 (only in high-speed mode) by taking the quirks for the UA-1000 and change them accordingly. Changes were made in 'usbaudio.c', 'usbaudio.h', and 'usbquirks.h' MIDI and recording seem to work perfectly (with JACK), but playback gives some few glitches. I think that's the mentioned synchronizing-problem in the UA-1000 quirk ('FIXME: playback must be synchronized to capture'), so I didn't change that. ToDo: Adding Mixer-Support for the built-in control-panel/patch-bay/router. Signed-off-by: Bjoern Fay <mail@bfay.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
parent
f32610edab
commit
d0b0fac14e
|
@ -3077,6 +3077,58 @@ static int create_ua1000_quirk(struct snd_usb_audio *chip,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Create a stream for an Edirol UA-101 interface.
|
||||||
|
* Copy, paste and modify from Edirol UA-1000
|
||||||
|
*/
|
||||||
|
static int create_ua101_quirk(struct snd_usb_audio *chip,
|
||||||
|
struct usb_interface *iface,
|
||||||
|
const struct snd_usb_audio_quirk *quirk)
|
||||||
|
{
|
||||||
|
static const struct audioformat ua101_format = {
|
||||||
|
.format = SNDRV_PCM_FORMAT_S32_LE,
|
||||||
|
.fmt_type = USB_FORMAT_TYPE_I,
|
||||||
|
.altsetting = 1,
|
||||||
|
.altset_idx = 1,
|
||||||
|
.attributes = 0,
|
||||||
|
.rates = SNDRV_PCM_RATE_CONTINUOUS,
|
||||||
|
};
|
||||||
|
struct usb_host_interface *alts;
|
||||||
|
struct usb_interface_descriptor *altsd;
|
||||||
|
struct audioformat *fp;
|
||||||
|
int stream, err;
|
||||||
|
|
||||||
|
if (iface->num_altsetting != 2)
|
||||||
|
return -ENXIO;
|
||||||
|
alts = &iface->altsetting[1];
|
||||||
|
altsd = get_iface_desc(alts);
|
||||||
|
if (alts->extralen != 18 || alts->extra[1] != USB_DT_CS_INTERFACE ||
|
||||||
|
altsd->bNumEndpoints != 1)
|
||||||
|
return -ENXIO;
|
||||||
|
|
||||||
|
fp = kmemdup(&ua101_format, sizeof(*fp), GFP_KERNEL);
|
||||||
|
if (!fp)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
fp->channels = alts->extra[11];
|
||||||
|
fp->iface = altsd->bInterfaceNumber;
|
||||||
|
fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;
|
||||||
|
fp->ep_attr = get_endpoint(alts, 0)->bmAttributes;
|
||||||
|
fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
|
||||||
|
fp->rate_max = fp->rate_min = combine_triple(&alts->extra[15]);
|
||||||
|
|
||||||
|
stream = (fp->endpoint & USB_DIR_IN)
|
||||||
|
? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
|
||||||
|
err = add_audio_endpoint(chip, stream, fp);
|
||||||
|
if (err < 0) {
|
||||||
|
kfree(fp);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
/* FIXME: playback must be synchronized to capture */
|
||||||
|
usb_set_interface(chip->dev, fp->iface, 0);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int snd_usb_create_quirk(struct snd_usb_audio *chip,
|
static int snd_usb_create_quirk(struct snd_usb_audio *chip,
|
||||||
struct usb_interface *iface,
|
struct usb_interface *iface,
|
||||||
const struct snd_usb_audio_quirk *quirk);
|
const struct snd_usb_audio_quirk *quirk);
|
||||||
|
@ -3258,6 +3310,7 @@ static int snd_usb_create_quirk(struct snd_usb_audio *chip,
|
||||||
[QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk,
|
[QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk,
|
||||||
[QUIRK_AUDIO_EDIROL_UA700_UA25] = create_ua700_ua25_quirk,
|
[QUIRK_AUDIO_EDIROL_UA700_UA25] = create_ua700_ua25_quirk,
|
||||||
[QUIRK_AUDIO_EDIROL_UA1000] = create_ua1000_quirk,
|
[QUIRK_AUDIO_EDIROL_UA1000] = create_ua1000_quirk,
|
||||||
|
[QUIRK_AUDIO_EDIROL_UA101] = create_ua101_quirk,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (quirk->type < QUIRK_TYPE_COUNT) {
|
if (quirk->type < QUIRK_TYPE_COUNT) {
|
||||||
|
|
|
@ -159,6 +159,7 @@ enum quirk_type {
|
||||||
QUIRK_AUDIO_FIXED_ENDPOINT,
|
QUIRK_AUDIO_FIXED_ENDPOINT,
|
||||||
QUIRK_AUDIO_EDIROL_UA700_UA25,
|
QUIRK_AUDIO_EDIROL_UA700_UA25,
|
||||||
QUIRK_AUDIO_EDIROL_UA1000,
|
QUIRK_AUDIO_EDIROL_UA1000,
|
||||||
|
QUIRK_AUDIO_EDIROL_UA101,
|
||||||
|
|
||||||
QUIRK_TYPE_COUNT
|
QUIRK_TYPE_COUNT
|
||||||
};
|
};
|
||||||
|
|
|
@ -1098,7 +1098,37 @@ YAMAHA_DEVICE(0x7010, "UB99"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/* TODO: add Edirol UA-101 support */
|
/* Roland UA-101 in High-Speed Mode only */
|
||||||
|
{
|
||||||
|
USB_DEVICE(0x0582, 0x007d),
|
||||||
|
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
|
||||||
|
.vendor_name = "Roland",
|
||||||
|
.product_name = "UA-101",
|
||||||
|
.ifnum = QUIRK_ANY_INTERFACE,
|
||||||
|
.type = QUIRK_COMPOSITE,
|
||||||
|
.data = (const struct snd_usb_audio_quirk[]) {
|
||||||
|
{
|
||||||
|
.ifnum = 0,
|
||||||
|
.type = QUIRK_AUDIO_EDIROL_UA101
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ifnum = 1,
|
||||||
|
.type = QUIRK_AUDIO_EDIROL_UA101
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ifnum = 2,
|
||||||
|
.type = QUIRK_MIDI_FIXED_ENDPOINT,
|
||||||
|
.data = & (const struct snd_usb_midi_endpoint_info) {
|
||||||
|
.out_cables = 0x0001,
|
||||||
|
.in_cables = 0x0001
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ifnum = -1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
/* has ID 0x0081 when not in "Advanced Driver" mode */
|
/* has ID 0x0081 when not in "Advanced Driver" mode */
|
||||||
USB_DEVICE(0x0582, 0x0080),
|
USB_DEVICE(0x0582, 0x0080),
|
||||||
|
|
Loading…
Reference in New Issue