diff --git a/sound/usb/midi.c b/sound/usb/midi.c index c183d34..34b9bb7 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -2181,10 +2181,6 @@ int snd_usbmidi_create(struct snd_card *card, umidi->usb_protocol_ops = &snd_usbmidi_novation_ops; err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints); break; - case QUIRK_MIDI_MBOX2: - umidi->usb_protocol_ops = &snd_usbmidi_midiman_ops; - err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints); - break; case QUIRK_MIDI_RAW_BYTES: umidi->usb_protocol_ops = &snd_usbmidi_raw_ops; /* diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index cdcf6b4..95e3326 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2993,7 +2993,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), }, { .ifnum = 6, - .type = QUIRK_MIDI_MBOX2, + .type = QUIRK_MIDI_MIDIMAN, .data = &(const struct snd_usb_midi_endpoint_info) { .out_ep = 0x02, .out_cables = 0x0001, diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 8f23af5..dc96696 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -306,7 +306,6 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip, [QUIRK_MIDI_YAMAHA] = create_any_midi_quirk, [QUIRK_MIDI_MIDIMAN] = create_any_midi_quirk, [QUIRK_MIDI_NOVATION] = create_any_midi_quirk, - [QUIRK_MIDI_MBOX2] = create_any_midi_quirk, [QUIRK_MIDI_RAW_BYTES] = create_any_midi_quirk, [QUIRK_MIDI_EMAGIC] = create_any_midi_quirk, [QUIRK_MIDI_CME] = create_any_midi_quirk, @@ -498,6 +497,92 @@ static int snd_usb_nativeinstruments_boot_quirk(struct usb_device *dev) return -EAGAIN; } +static void mbox2_setup_48_24_magic(struct usb_device *dev) +{ + u8 srate[3]; + u8 temp[12]; + + /* Choose 48000Hz permanently */ + srate[0] = 0x80; + srate[1] = 0xbb; + srate[2] = 0x00; + + /* Send the magic! */ + snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), + 0x01, 0x22, 0x0100, 0x0085, &temp, 0x0003); + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 0x81, 0xa2, 0x0100, 0x0085, &srate, 0x0003); + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 0x81, 0xa2, 0x0100, 0x0086, &srate, 0x0003); + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 0x81, 0xa2, 0x0100, 0x0003, &srate, 0x0003); + return; +} + +/* Digidesign Mbox 2 needs to load firmware onboard + * and driver must wait a few seconds for initialisation. + */ + +#define MBOX2_FIRMWARE_SIZE 646 +#define MBOX2_BOOT_LOADING 0x01 /* Hard coded into the device */ +#define MBOX2_BOOT_READY 0x02 /* Hard coded into the device */ + +static int snd_usb_mbox2_boot_quirk(struct usb_device *dev) +{ + struct usb_host_config *config = dev->actconfig; + int err; + u8 bootresponse[12]; + int fwsize; + int count; + + fwsize = le16_to_cpu(get_cfg_desc(config)->wTotalLength); + + if (fwsize != MBOX2_FIRMWARE_SIZE) { + snd_printk(KERN_ERR "usb-audio: Invalid firmware size=%d.\n", fwsize); + return -ENODEV; + } + + snd_printd("usb-audio: Sending Digidesign Mbox 2 boot sequence...\n"); + + count = 0; + bootresponse[0] = MBOX2_BOOT_LOADING; + while ((bootresponse[0] == MBOX2_BOOT_LOADING) && (count < 10)) { + msleep(500); /* 0.5 second delay */ + snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), + /* Control magic - load onboard firmware */ + 0x85, 0xc0, 0x0001, 0x0000, &bootresponse, 0x0012); + if (bootresponse[0] == MBOX2_BOOT_READY) + break; + snd_printd("usb-audio: device not ready, resending boot sequence...\n"); + count++; + } + + if (bootresponse[0] != MBOX2_BOOT_READY) { + snd_printk(KERN_ERR "usb-audio: Unknown bootresponse=%d, or timed out, ignoring device.\n", bootresponse[0]); + return -ENODEV; + } + + snd_printdd("usb-audio: device initialised!\n"); + + err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, + &dev->descriptor, sizeof(dev->descriptor)); + config = dev->actconfig; + if (err < 0) + snd_printd("error usb_get_descriptor: %d\n", err); + + err = usb_reset_configuration(dev); + if (err < 0) + snd_printd("error usb_reset_configuration: %d\n", err); + snd_printdd("mbox2_boot: new boot length = %d\n", + le16_to_cpu(get_cfg_desc(config)->wTotalLength)); + + mbox2_setup_48_24_magic(dev); + + snd_printk(KERN_INFO "usb-audio: Digidesign Mbox 2: 24bit 48kHz"); + + return 0; /* Successful boot */ +} + /* * Setup quirks */ @@ -574,7 +659,6 @@ static int audiophile_skip_setting_quirk(struct snd_usb_audio *chip, return 0; /* keep this altsetting */ } - static int fasttrackpro_skip_setting_quirk(struct snd_usb_audio *chip, int iface, int altno) { @@ -766,92 +850,6 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, } } -static void mbox2_setup_48_24_magic(struct usb_device *dev) -{ - u8 srate[3]; - u8 temp[12]; - - /* Choose 48000Hz permanently */ - srate[0] = 0x80; - srate[1] = 0xbb; - srate[2] = 0x00; - - /* Send the magic! */ - snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), - 0x01, 0x22, 0x0100, 0x0085, &temp, 0x0003); - snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), - 0x81, 0xa2, 0x0100, 0x0085, &srate, 0x0003); - snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), - 0x81, 0xa2, 0x0100, 0x0086, &srate, 0x0003); - snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), - 0x81, 0xa2, 0x0100, 0x0003, &srate, 0x0003); - return; -} - -/* Digidesign Mbox 2 needs to load firmware onboard - * and driver must wait a few seconds for initialisation. - */ - -#define MBOX2_FIRMWARE_SIZE 646 -#define MBOX2_BOOT_LOADING 0x01 /* Hard coded into the device */ -#define MBOX2_BOOT_READY 0x02 /* Hard coded into the device */ - -int snd_usb_mbox2_boot_quirk(struct usb_device *dev) -{ - struct usb_host_config *config = dev->actconfig; - int err; - u8 bootresponse; - int fwsize; - int count; - - fwsize = le16_to_cpu(get_cfg_desc(config)->wTotalLength); - - if (fwsize != MBOX2_FIRMWARE_SIZE) { - snd_printk(KERN_ERR "usb-audio: Invalid firmware size=%d.\n", fwsize); - return -ENODEV; - } - - snd_printd("usb-audio: Sending Digidesign Mbox 2 boot sequence...\n"); - - count = 0; - bootresponse = MBOX2_BOOT_LOADING; - while ((bootresponse == MBOX2_BOOT_LOADING) && (count < 10)) { - msleep(500); /* 0.5 second delay */ - snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), - /* Control magic - load onboard firmware */ - 0x85, 0xc0, 0x0001, 0x0000, &bootresponse, 0x0012); - if (bootresponse == MBOX2_BOOT_READY) - break; - snd_printd("usb-audio: device not ready, resending boot sequence...\n"); - count++; - } - - if (bootresponse != MBOX2_BOOT_READY) { - snd_printk(KERN_ERR "usb-audio: Unknown bootresponse=%d, or timed out, ignoring device.\n", bootresponse); - return -ENODEV; - } - - snd_printdd("usb-audio: device initialised!\n"); - - err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, - &dev->descriptor, sizeof(dev->descriptor)); - config = dev->actconfig; - if (err < 0) - snd_printd("error usb_get_descriptor: %d\n", err); - - err = usb_reset_configuration(dev); - if (err < 0) - snd_printd("error usb_reset_configuration: %d\n", err); - snd_printdd("mbox2_boot: new boot length = %d\n", - le16_to_cpu(get_cfg_desc(config)->wTotalLength)); - - mbox2_setup_48_24_magic(dev); - - snd_printk(KERN_INFO "usb-audio: Digidesign Mbox 2: 24bit 48kHz"); - - return 0; /* Successful boot */ -} - void snd_usb_endpoint_start_quirk(struct snd_usb_endpoint *ep) { /* diff --git a/sound/usb/quirks.h b/sound/usb/quirks.h index e7e9530..0ca9e91 100644 --- a/sound/usb/quirks.h +++ b/sound/usb/quirks.h @@ -24,8 +24,6 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, int snd_usb_is_big_endian_format(struct snd_usb_audio *chip, struct audioformat *fp); -int snd_usb_mbox2_boot_quirk(struct usb_device *dev); - void snd_usb_endpoint_start_quirk(struct snd_usb_endpoint *ep); void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,