Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df23a246 authored Oct 06, 2013 by Eldad Zack Committed by Takashi Iwai Oct 07, 2013

ALSA: usb-audio: rename alt_idx to altsetting



As Clemens Ladisch kindly explained:
 "Please note that there are two methods to identify alternate settings:
  the number, which is the value in bAlternateSetting, and the index,
  which is the index in the descriptor array.  There might be some wording
  in the USB spec that these two values must be the same, but in reality,
  [insert standard rant about firmware writers], bAlternateSetting
  must be treated as a random ID value."

This patch changes the name to express the correct usage semantics.
No functional change.

Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 06613f54

sound/usb/card.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -96,7 +96,7 @@ struct snd_usb_endpoint {
	unsigned int syncinterval; /* P for adaptive mode, 0 otherwise */		unsigned int syncinterval; /* P for adaptive mode, 0 otherwise */
	unsigned char silence_value;		unsigned char silence_value;
	unsigned int stride;		unsigned int stride;
	int iface, alt_idx;		int iface, altsetting;
	int skip_packets; /* quirks for devices to ignore the first n packets		int skip_packets; /* quirks for devices to ignore the first n packets
	in a stream */		in a stream */

sound/usb/endpoint.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -426,9 +426,9 @@ struct snd_usb_endpoint snd_usb_add_endpoint(struct snd_usb_audio chip,
	list_for_each_entry(ep, &chip->ep_list, list) {		list_for_each_entry(ep, &chip->ep_list, list) {
	if (ep->ep_num == ep_num &&		if (ep->ep_num == ep_num &&
	ep->iface == alts->desc.bInterfaceNumber &&		ep->iface == alts->desc.bInterfaceNumber &&
	ep->alt_idx == alts->desc.bAlternateSetting) {		ep->altsetting == alts->desc.bAlternateSetting) {
	snd_printdd(KERN_DEBUG "Re-using EP %x in iface %d,%d @%p\n",		snd_printdd(KERN_DEBUG "Re-using EP %x in iface %d,%d @%p\n",
	ep_num, ep->iface, ep->alt_idx, ep);		ep_num, ep->iface, ep->altsetting, ep);
	goto __exit_unlock;		goto __exit_unlock;
	}		}
	}		}
	@@ -447,7 +447,7 @@ struct snd_usb_endpoint snd_usb_add_endpoint(struct snd_usb_audio chip,
	ep->type = type;		ep->type = type;
	ep->ep_num = ep_num;		ep->ep_num = ep_num;
	ep->iface = alts->desc.bInterfaceNumber;		ep->iface = alts->desc.bInterfaceNumber;
	ep->alt_idx = alts->desc.bAlternateSetting;		ep->altsetting = alts->desc.bAlternateSetting;
	INIT_LIST_HEAD(&ep->ready_playback_urbs);		INIT_LIST_HEAD(&ep->ready_playback_urbs);
	ep_num &= USB_ENDPOINT_NUMBER_MASK;		ep_num &= USB_ENDPOINT_NUMBER_MASK;

sound/usb/pcm.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -241,17 +241,17 @@ static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep)
	struct snd_usb_endpoint *ep = subs->sync_endpoint;		struct snd_usb_endpoint *ep = subs->sync_endpoint;

	if (subs->data_endpoint->iface != subs->sync_endpoint->iface \|\|		if (subs->data_endpoint->iface != subs->sync_endpoint->iface \|\|
	subs->data_endpoint->alt_idx != subs->sync_endpoint->alt_idx) {		subs->data_endpoint->altsetting != subs->sync_endpoint->altsetting) {
	err = usb_set_interface(subs->dev,		err = usb_set_interface(subs->dev,
	subs->sync_endpoint->iface,		subs->sync_endpoint->iface,
	subs->sync_endpoint->alt_idx);		subs->sync_endpoint->altsetting);
	if (err < 0) {		if (err < 0) {
	clear_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags);		clear_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags);
	snd_printk(KERN_ERR		snd_printk(KERN_ERR
	"%d:%d:%d: cannot set interface (%d)\n",		"%d:%d:%d: cannot set interface (%d)\n",
	subs->dev->devnum,		subs->dev->devnum,
	subs->sync_endpoint->iface,		subs->sync_endpoint->iface,
	subs->sync_endpoint->alt_idx, err);		subs->sync_endpoint->altsetting, err);
	return -EIO;		return -EIO;
	}		}
	}		}