ALSA: usb-audio: add support for UAC2 pitch control

This request is again handled differently in comparison to UAC1. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>

ALSA: usb-audio: add support for UAC2 pitch control
This request is again handled differently in comparison to UAC1. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Daniel Mack · Takashi Iwai
1 parent 43b8e3bc4a
Showing 1 changed file with 30 additions and 7 deletions Side-by-side Diff
sound/usb/pcm.c
@@ -120,10 +120,6 @@
  
 	ep = get_endpoint(alts, 0)->bEndpointAddress;
  
-	/* if endpoint doesn't have pitch control, bail out */
-	if (!(fmt->attributes & UAC_EP_CS_ATTR_PITCH_CONTROL))
-		return 0;
-
 	data[0] = 1;
 	if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR,
 				   USB_TYPE_CLASS|USB_RECIP_ENDPOINT|USB_DIR_OUT,
  
@@ -137,8 +133,32 @@
 	return 0;
 }
  
+static int init_pitch_v2(struct snd_usb_audio *chip, int iface,
+			 struct usb_host_interface *alts,
+			 struct audioformat *fmt)
+{
+	struct usb_device *dev = chip->dev;
+	unsigned char data[1];
+	unsigned int ep;
+	int err;
+
+	ep = get_endpoint(alts, 0)->bEndpointAddress;
+
+	data[0] = 1;
+	if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR,
+				   USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_OUT,
+				   UAC2_EP_CS_PITCH << 8, 0,
+				   data, sizeof(data), 1000)) < 0) {
+		snd_printk(KERN_ERR "%d:%d:%d: cannot set enable PITCH (v2)\n",
+			   dev->devnum, iface, fmt->altsetting);
+		return err;
+	}
+
+	return 0;
+}
+
 /*
- * initialize the picth control and sample rate
+ * initialize the pitch control and sample rate
  */
 int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface,
 		       struct usb_host_interface *alts,
  
@@ -146,13 +166,16 @@
 {
 	struct usb_interface_descriptor *altsd = get_iface_desc(alts);
  
+	/* if endpoint doesn't have pitch control, bail out */
+	if (!(fmt->attributes & UAC_EP_CS_ATTR_PITCH_CONTROL))
+		return 0;
+
 	switch (altsd->bInterfaceProtocol) {
 	case UAC_VERSION_1:
 		return init_pitch_v1(chip, iface, alts, fmt);
  
 	case UAC_VERSION_2:
-		/* not implemented yet */
-		return 0;
+		return init_pitch_v2(chip, iface, alts, fmt);
 	}
  
 	return -EINVAL;
...	...	@@ -120,10 +120,6 @@
120	120
121	121	ep = get_endpoint(alts, 0)->bEndpointAddress;
122	122
123		- /* if endpoint doesn't have pitch control, bail out */
124		- if (!(fmt->attributes & UAC_EP_CS_ATTR_PITCH_CONTROL))
125		- return 0;
126		-
127	123	data[0] = 1;
128	124	if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR,
129	125	USB_TYPE_CLASS\|USB_RECIP_ENDPOINT\|USB_DIR_OUT,
130	126
...	...	@@ -137,8 +133,32 @@
137	133	return 0;
138	134	}
139	135
	136	+static int init_pitch_v2(struct snd_usb_audio *chip, int iface,
	137	+ struct usb_host_interface *alts,
	138	+ struct audioformat *fmt)
	139	+{
	140	+ struct usb_device *dev = chip->dev;
	141	+ unsigned char data[1];
	142	+ unsigned int ep;
	143	+ int err;
	144	+
	145	+ ep = get_endpoint(alts, 0)->bEndpointAddress;
	146	+
	147	+ data[0] = 1;
	148	+ if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR,
	149	+ USB_TYPE_CLASS \| USB_RECIP_ENDPOINT \| USB_DIR_OUT,
	150	+ UAC2_EP_CS_PITCH << 8, 0,
	151	+ data, sizeof(data), 1000)) < 0) {
	152	+ snd_printk(KERN_ERR "%d:%d:%d: cannot set enable PITCH (v2)\n",
	153	+ dev->devnum, iface, fmt->altsetting);
	154	+ return err;
	155	+ }
	156	+
	157	+ return 0;
	158	+}
	159	+
140	160	/*
141		- * initialize the picth control and sample rate
	161	+ * initialize the pitch control and sample rate
142	162	*/
143	163	int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface,
144	164	struct usb_host_interface *alts,
145	165
...	...	@@ -146,13 +166,16 @@
146	166	{
147	167	struct usb_interface_descriptor *altsd = get_iface_desc(alts);
148	168
	169	+ /* if endpoint doesn't have pitch control, bail out */
	170	+ if (!(fmt->attributes & UAC_EP_CS_ATTR_PITCH_CONTROL))
	171	+ return 0;
	172	+
149	173	switch (altsd->bInterfaceProtocol) {
150	174	case UAC_VERSION_1:
151	175	return init_pitch_v1(chip, iface, alts, fmt);
152	176
153	177	case UAC_VERSION_2:
154		- /* not implemented yet */
155		- return 0;
	178	+ return init_pitch_v2(chip, iface, alts, fmt);
156	179	}
157	180
158	181	return -EINVAL;