microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[ALSA] usb-audio: simplify MIDI quirk handling 

Modules: USB generic driver

Simplify the handling of MIDI quirks by treating an interface without
quirks as a QUIRK_MIDI_STANDARD_INTERFACE.

This also fixes the bug where a MIDI_STANDARD quirk would not be
recognized.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2005-09-14 08:36:03 +02:00 коммит произвёл Jaroslav Kysela
Родитель 5747e54042
Коммит d1bda04554
2 изменённых файлов: 45 добавлений и 56 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
sound/usb/usbaudio.c
Просмотреть файл

@ -2755,9 +2755,9 @@ static int create_fixed_stream_quirk(snd_usb_audio_t *chip,
/* /*
* create a stream for an interface with proper descriptors * create a stream for an interface with proper descriptors
*/ */
static int create_standard_interface_quirk(snd_usb_audio_t *chip, static int create_standard_audio_quirk(snd_usb_audio_t *chip,
struct usb_interface *iface, struct usb_interface *iface,
const snd_usb_audio_quirk_t *quirk) const snd_usb_audio_quirk_t *quirk)
{ {
struct usb_host_interface *alts; struct usb_host_interface *alts;
struct usb_interface_descriptor *altsd; struct usb_interface_descriptor *altsd;
@ -2765,24 +2765,14 @@ static int create_standard_interface_quirk(snd_usb_audio_t *chip,
alts = &iface->altsetting[0]; alts = &iface->altsetting[0];
altsd = get_iface_desc(alts); altsd = get_iface_desc(alts);
switch (quirk->type) { err = parse_audio_endpoints(chip, altsd->bInterfaceNumber);
case QUIRK_AUDIO_STANDARD_INTERFACE:
err = parse_audio_endpoints(chip, altsd->bInterfaceNumber);
if (!err)
usb_set_interface(chip->dev, altsd->bInterfaceNumber, 0); /* reset the current interface */
break;
case QUIRK_MIDI_STANDARD_INTERFACE:
err = snd_usb_create_midi_interface(chip, iface, NULL);
break;
default:
snd_printd(KERN_ERR "invalid quirk type %d\n", quirk->type);
return -ENXIO;
}
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "cannot setup if %d: error %d\n", snd_printk(KERN_ERR "cannot setup if %d: error %d\n",
altsd->bInterfaceNumber, err); altsd->bInterfaceNumber, err);
return err; return err;
} }
/* reset the current interface */
usb_set_interface(chip->dev, altsd->bInterfaceNumber, 0);
return 0; return 0;
} }
@ -3044,7 +3034,7 @@ static int snd_usb_create_quirk(snd_usb_audio_t *chip,
[QUIRK_MIDI_RAW] = snd_usb_create_midi_interface, [QUIRK_MIDI_RAW] = snd_usb_create_midi_interface,
[QUIRK_MIDI_EMAGIC] = snd_usb_create_midi_interface, [QUIRK_MIDI_EMAGIC] = snd_usb_create_midi_interface,
[QUIRK_MIDI_MIDITECH] = snd_usb_create_midi_interface, [QUIRK_MIDI_MIDITECH] = snd_usb_create_midi_interface,
[QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_interface_quirk, [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk,
[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,

77
sound/usb/usbmidi.c
Просмотреть файл

@ -1550,46 +1550,45 @@ int snd_usb_create_midi_interface(snd_usb_audio_t* chip,
/* detect the endpoint(s) to use */ /* detect the endpoint(s) to use */
memset(endpoints, 0, sizeof(endpoints)); memset(endpoints, 0, sizeof(endpoints));
if (!quirk) { switch (quirk ? quirk->type : QUIRK_MIDI_STANDARD_INTERFACE) {
case QUIRK_MIDI_STANDARD_INTERFACE:
err = snd_usbmidi_get_ms_info(umidi, endpoints); err = snd_usbmidi_get_ms_info(umidi, endpoints);
} else { break;
switch (quirk->type) { case QUIRK_MIDI_FIXED_ENDPOINT:
case QUIRK_MIDI_FIXED_ENDPOINT: memcpy(&endpoints[0], quirk->data,
memcpy(&endpoints[0], quirk->data, sizeof(snd_usb_midi_endpoint_info_t));
sizeof(snd_usb_midi_endpoint_info_t)); err = snd_usbmidi_detect_endpoints(umidi, &endpoints[0], 1);
err = snd_usbmidi_detect_endpoints(umidi, &endpoints[0], 1); break;
break; case QUIRK_MIDI_YAMAHA:
case QUIRK_MIDI_YAMAHA: err = snd_usbmidi_detect_yamaha(umidi, &endpoints[0]);
err = snd_usbmidi_detect_yamaha(umidi, &endpoints[0]); break;
break; case QUIRK_MIDI_MIDIMAN:
case QUIRK_MIDI_MIDIMAN: umidi->usb_protocol_ops = &snd_usbmidi_midiman_ops;
umidi->usb_protocol_ops = &snd_usbmidi_midiman_ops; memcpy(&endpoints[0], quirk->data,
memcpy(&endpoints[0], quirk->data, sizeof(snd_usb_midi_endpoint_info_t));
sizeof(snd_usb_midi_endpoint_info_t)); err = 0;
err = 0; break;
break; case QUIRK_MIDI_NOVATION:
case QUIRK_MIDI_NOVATION: umidi->usb_protocol_ops = &snd_usbmidi_novation_ops;
umidi->usb_protocol_ops = &snd_usbmidi_novation_ops; err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints); break;
break; case QUIRK_MIDI_RAW:
case QUIRK_MIDI_RAW: umidi->usb_protocol_ops = &snd_usbmidi_raw_ops;
umidi->usb_protocol_ops = &snd_usbmidi_raw_ops; err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints); break;
break; case QUIRK_MIDI_EMAGIC:
case QUIRK_MIDI_EMAGIC: umidi->usb_protocol_ops = &snd_usbmidi_emagic_ops;
umidi->usb_protocol_ops = &snd_usbmidi_emagic_ops; memcpy(&endpoints[0], quirk->data,
memcpy(&endpoints[0], quirk->data, sizeof(snd_usb_midi_endpoint_info_t));
sizeof(snd_usb_midi_endpoint_info_t)); err = snd_usbmidi_detect_endpoints(umidi, &endpoints[0], 1);
err = snd_usbmidi_detect_endpoints(umidi, &endpoints[0], 1); break;
break; case QUIRK_MIDI_MIDITECH:
case QUIRK_MIDI_MIDITECH: err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints); break;
break; default:
default: snd_printd(KERN_ERR "invalid quirk type %d\n", quirk->type);
snd_printd(KERN_ERR "invalid quirk type %d\n", quirk->type); err = -ENXIO;
err = -ENXIO; break;
break;
}
} }
if (err < 0) { if (err < 0) {
kfree(umidi); kfree(umidi);