Update of /cvsroot/alsa/alsa-kernel/usb
In directory sc8-pr-cvs1:/tmp/cvs-serv32342/alsa-kernel/usb
Modified Files:
usbaudio.c usbaudio.h usbmixer.c
Log Message:
Synced USB audio driver with the latest 2.6 code
Index: usbaudio.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- usbaudio.c 24 Jul 2003 12:57:22 -0000 1.62
+++ usbaudio.c 20 Aug 2003 09:59:59 -0000 1.63
@@ -1057,7 +1057,7 @@
int is_playback = subs->direction == SNDRV_PCM_STREAM_PLAYBACK;
int err;
- iface = &config->interface[fmt->iface];
+ iface = get_iface(config, fmt->iface);
alts = &iface->altsetting[fmt->altset_idx];
altsd = get_iface_desc(alts);
snd_assert(altsd->bAlternateSetting == fmt->altsetting, return -EINVAL);
@@ -1182,7 +1182,7 @@
struct usb_host_config *config = subs->dev->actconfig;
struct usb_host_interface *alts;
struct usb_interface *iface;
- iface = &config->interface[fmt->iface];
+ iface = get_iface(config, fmt->iface);
alts = &iface->altsetting[fmt->altset_idx];
ret = init_usb_sample_rate(subs->dev, subs->interface, alts, fmt,
rate);
if (ret < 0)
@@ -2215,7 +2215,7 @@
config = dev->actconfig;
/* parse the interface's altsettings */
- iface = &config->interface[iface_no];
+ iface = get_iface(config, iface_no);
for (i = 0; i < iface->num_altsetting; i++) {
alts = &iface->altsetting[i];
altsd = get_iface_desc(alts);
@@ -2386,7 +2386,7 @@
/* find audiocontrol interface */
config = dev->actconfig;
- host_iface = &config->interface[ctrlif].altsetting[0];
+ host_iface = &get_iface(config, ctrlif)->altsetting[0];
if (!(p1 = snd_usb_find_csint_desc(host_iface->extra, host_iface->extralen,
NULL, HEADER))) {
snd_printk(KERN_ERR "cannot find HEADER\n");
return -EINVAL;
@@ -2408,7 +2408,7 @@
dev->devnum, ctrlif, j);
continue;
}
- iface = &config->interface[j];
+ iface = get_iface(config, j);
if (usb_interface_claimed(iface)) {
snd_printdd(KERN_INFO "%d:%d:%d: skipping, already claimed\n",
dev->devnum, ctrlif, j);
continue;
@@ -2524,7 +2524,7 @@
for (quirk = quirk->data; quirk->ifnum >= 0; ++quirk) {
if (quirk->ifnum >= get_cfg_desc(config)->bNumInterfaces)
continue;
- iface = &config->interface[quirk->ifnum];
+ iface = get_iface(config, quirk->ifnum);
if (quirk->ifnum != probed_ifnum &&
usb_interface_claimed(iface))
continue;
@@ -2560,8 +2560,8 @@
err = usb_get_device_descriptor(dev);
config = dev->actconfig;
if (err < 0) snd_printdd("error usb_get_device_descriptor: %d\n", err);
- err = usb_set_configuration(dev,
get_cfg_desc(config)->bConfigurationValue);
- if (err < 0) snd_printdd("error usb_set_configuration: %d\n", err);
+ err = usb_reset_configuration(dev);
+ if (err < 0) snd_printdd("error usb_reset_configuration: %d\n", err);
snd_printdd("extigy_boot: new boot length = %d\n",
get_cfg_desc(config)->wTotalLength);
return -ENODEV; /* quit this anyway */
}
@@ -2761,8 +2761,8 @@
* now look for an empty slot and create a new card instance
*/
/* first, set the current configuration for this device */
- if (usb_set_configuration(dev,
get_cfg_desc(config)->bConfigurationValue) < 0) {
- snd_printk(KERN_ERR "cannot set configuration (value 0x%x)\n",
get_cfg_desc(config)->bConfigurationValue);
+ if (usb_reset_configuration(dev) < 0) {
+ snd_printk(KERN_ERR "cannot reset configuration (value
0x%x)\n", get_cfg_desc(config)->bConfigurationValue);
goto __error;
}
for (i = 0; i < SNDRV_CARDS; i++)
Index: usbaudio.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- usbaudio.h 17 Jul 2003 17:42:25 -0000 1.20
+++ usbaudio.h 20 Aug 2003 09:59:59 -0000 1.21
@@ -210,6 +210,7 @@
* (conditional for compatibility with the older API)
*/
#ifndef get_iface_desc
+#define get_iface(cfg, num) ((cfg)->interface[(num)])
#define get_iface_desc(iface) (&iface->desc)
#define get_endpoint(alt,ep) (&(alt)->endpoint[ep].desc)
#define get_ep_desc(ep) (&(ep)->desc)
Index: usbmixer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbmixer.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- usbmixer.c 25 Jun 2003 15:13:52 -0000 1.21
+++ usbmixer.c 20 Aug 2003 09:59:59 -0000 1.22
@@ -1490,7 +1490,7 @@
int err;
const struct usbmix_ctl_map *map;
struct usb_device_descriptor *dev = &chip->dev->descriptor;
- struct usb_host_interface *hostif =
&chip->dev->actconfig->interface[ctrlif].altsetting[0];
+ struct usb_host_interface *hostif = &get_iface(chip->dev->actconfig,
ctrlif)->altsetting[0];
strcpy(chip->card->mixername, "USB Mixer");
-------------------------------------------------------
This SF.net email is sponsored by Dice.com.
Did you know that Dice has over 25,000 tech jobs available today? From
careers in IT to Engineering to Tech Sales, Dice has tech jobs from the
best hiring companies. http://www.dice.com/index.epl?rel_code=104
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
