Commit bb1bf4fa authored by Takashi Iwai's avatar Takashi Iwai

ALSA: usb-audio: Manage number of rawmidis globally

We're going to create rawmidi objects for MIDI 2.0 in a different code
from the current code for USB-MIDI 1.0.  As a preliminary work, this
patch adds the number of rawmidi objects to keep globally in a
USB-audio card instance, so that it can be referred from both MIDI 1.0
and 2.0 code.
Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20230523075358.9672-8-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fa030f66
...@@ -180,7 +180,8 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int ...@@ -180,7 +180,8 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int
altsd->bInterfaceSubClass == USB_SUBCLASS_MIDISTREAMING) { altsd->bInterfaceSubClass == USB_SUBCLASS_MIDISTREAMING) {
int err = __snd_usbmidi_create(chip->card, iface, int err = __snd_usbmidi_create(chip->card, iface,
&chip->midi_list, NULL, &chip->midi_list, NULL,
chip->usb_id); chip->usb_id,
&chip->num_rawmidis);
if (err < 0) { if (err < 0) {
dev_err(&dev->dev, dev_err(&dev->dev,
"%u:%d: cannot create sequencer device\n", "%u:%d: cannot create sequencer device\n",
......
...@@ -2461,7 +2461,8 @@ int __snd_usbmidi_create(struct snd_card *card, ...@@ -2461,7 +2461,8 @@ int __snd_usbmidi_create(struct snd_card *card,
struct usb_interface *iface, struct usb_interface *iface,
struct list_head *midi_list, struct list_head *midi_list,
const struct snd_usb_audio_quirk *quirk, const struct snd_usb_audio_quirk *quirk,
unsigned int usb_id) unsigned int usb_id,
unsigned int *num_rawmidis)
{ {
struct snd_usb_midi *umidi; struct snd_usb_midi *umidi;
struct snd_usb_midi_endpoint_info endpoints[MIDI_MAX_ENDPOINTS]; struct snd_usb_midi_endpoint_info endpoints[MIDI_MAX_ENDPOINTS];
...@@ -2476,6 +2477,8 @@ int __snd_usbmidi_create(struct snd_card *card, ...@@ -2476,6 +2477,8 @@ int __snd_usbmidi_create(struct snd_card *card,
umidi->iface = iface; umidi->iface = iface;
umidi->quirk = quirk; umidi->quirk = quirk;
umidi->usb_protocol_ops = &snd_usbmidi_standard_ops; umidi->usb_protocol_ops = &snd_usbmidi_standard_ops;
if (num_rawmidis)
umidi->next_midi_device = *num_rawmidis;
spin_lock_init(&umidi->disc_lock); spin_lock_init(&umidi->disc_lock);
init_rwsem(&umidi->disc_rwsem); init_rwsem(&umidi->disc_rwsem);
mutex_init(&umidi->mutex); mutex_init(&umidi->mutex);
...@@ -2595,6 +2598,8 @@ int __snd_usbmidi_create(struct snd_card *card, ...@@ -2595,6 +2598,8 @@ int __snd_usbmidi_create(struct snd_card *card,
usb_autopm_get_interface_no_resume(umidi->iface); usb_autopm_get_interface_no_resume(umidi->iface);
list_add_tail(&umidi->list, midi_list); list_add_tail(&umidi->list, midi_list);
if (num_rawmidis)
*num_rawmidis = umidi->next_midi_device;
return 0; return 0;
free_midi: free_midi:
......
...@@ -46,14 +46,15 @@ int __snd_usbmidi_create(struct snd_card *card, ...@@ -46,14 +46,15 @@ int __snd_usbmidi_create(struct snd_card *card,
struct usb_interface *iface, struct usb_interface *iface,
struct list_head *midi_list, struct list_head *midi_list,
const struct snd_usb_audio_quirk *quirk, const struct snd_usb_audio_quirk *quirk,
unsigned int usb_id); unsigned int usb_id,
unsigned int *num_rawmidis);
static inline int snd_usbmidi_create(struct snd_card *card, static inline int snd_usbmidi_create(struct snd_card *card,
struct usb_interface *iface, struct usb_interface *iface,
struct list_head *midi_list, struct list_head *midi_list,
const struct snd_usb_audio_quirk *quirk) const struct snd_usb_audio_quirk *quirk)
{ {
return __snd_usbmidi_create(card, iface, midi_list, quirk, 0); return __snd_usbmidi_create(card, iface, midi_list, quirk, 0, NULL);
} }
void snd_usbmidi_input_stop(struct list_head *p); void snd_usbmidi_input_stop(struct list_head *p);
......
...@@ -437,7 +437,8 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip, ...@@ -437,7 +437,8 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,
? &ua700_quirk : &uaxx_quirk; ? &ua700_quirk : &uaxx_quirk;
return __snd_usbmidi_create(chip->card, iface, return __snd_usbmidi_create(chip->card, iface,
&chip->midi_list, quirk, &chip->midi_list, quirk,
chip->usb_id); chip->usb_id,
&chip->num_rawmidis);
} }
if (altsd->bNumEndpoints != 1) if (altsd->bNumEndpoints != 1)
......
...@@ -49,6 +49,7 @@ struct snd_usb_audio { ...@@ -49,6 +49,7 @@ struct snd_usb_audio {
struct list_head clock_ref_list; /* list of clock refcounts */ struct list_head clock_ref_list; /* list of clock refcounts */
int pcm_devs; int pcm_devs;
unsigned int num_rawmidis; /* number of created rawmidi devices */
struct list_head midi_list; /* list of midi interfaces */ struct list_head midi_list; /* list of midi interfaces */
struct list_head mixer_list; /* list of mixer interfaces */ struct list_head mixer_list; /* list of mixer interfaces */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment