Update of /cvsroot/alsa/alsa-kernel/usb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11593/alsa-kernel/usb
Modified Files:
usbaudio.c usbaudio.h
Log Message:
add usb_device->speed wrapper for compiling with 2.2.x kernels
Index: usbaudio.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- usbaudio.c 23 Mar 2004 12:47:15 -0000 1.94
+++ usbaudio.c 29 Mar 2004 12:33:37 -0000 1.95
@@ -938,7 +938,7 @@
unsigned int npacks[MAX_URBS], urb_packs, total_packs;
/* calculate the frequency in 16.16 format */
- if (subs->dev->speed == USB_SPEED_FULL)
+ if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL)
subs->freqn = get_usb_full_speed_rate(rate);
else
subs->freqn = get_usb_high_speed_rate(rate);
@@ -959,7 +959,7 @@
else
subs->curpacksize = maxsize;
- if (subs->dev->speed == USB_SPEED_FULL)
+ if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL)
urb_packs = nrpacks;
else
urb_packs = nrpacks * 8;
@@ -1058,7 +1058,10 @@
u->urb->pipe = subs->syncpipe;
u->urb->transfer_flags = URB_ISO_ASAP;
u->urb->number_of_packets = u->packets;
- u->urb->interval = subs->dev->speed == USB_SPEED_HIGH ? 8 : 1;
+ if (snd_usb_get_speed(subs->dev) == USB_SPEED_HIGH)
+ u->urb->interval = 8;
+ else
+ u->urb->interval = 1;
u->urb->context = u;
u->urb->complete =
snd_usb_complete_callback(snd_complete_sync_urb);
}
@@ -1961,7 +1964,7 @@
snd_iprintf(buffer, "]\n");
snd_iprintf(buffer, " Packet Size = %d\n", subs->curpacksize);
snd_iprintf(buffer, " Momentary freq = %u Hz\n",
- subs->dev->speed == USB_SPEED_FULL
+ snd_usb_get_speed(subs->dev) == USB_SPEED_FULL
? get_full_speed_hz(subs->freqm)
: get_high_speed_hz(subs->freqm));
} else {
@@ -2013,7 +2016,7 @@
subs->stream = as;
subs->direction = stream;
subs->dev = as->chip->dev;
- if (subs->dev->speed == USB_SPEED_FULL)
+ if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL)
subs->ops = audio_urb_ops[stream];
else
subs->ops = audio_urb_ops_high_speed[stream];
@@ -2854,9 +2857,9 @@
*rchip = NULL;
- if (dev->speed != USB_SPEED_FULL &&
- dev->speed != USB_SPEED_HIGH) {
- snd_printk(KERN_ERR "unknown device speed %d\n", dev->speed);
+ if (snd_usb_get_speed(dev) != USB_SPEED_FULL &&
+ snd_usb_get_speed(dev) != USB_SPEED_HIGH) {
+ snd_printk(KERN_ERR "unknown device speed %d\n",
snd_usb_get_speed(dev));
return -ENXIO;
}
@@ -2924,7 +2927,7 @@
usb_make_path(dev, card->longname + len, sizeof(card->longname) - len);
strlcat(card->longname,
- dev->speed == USB_SPEED_FULL ? ", full speed" : ", high speed",
+ snd_usb_get_speed(dev) == USB_SPEED_FULL ? ", full speed" : ", high
speed",
sizeof(card->longname));
snd_usb_audio_create_proc(chip);
Index: usbaudio.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- usbaudio.h 19 Mar 2004 07:23:20 -0000 1.28
+++ usbaudio.h 29 Mar 2004 12:33:37 -0000 1.29
@@ -221,4 +221,8 @@
#define snd_usb_complete_callback(x) (x)
#endif
+#ifndef snd_usb_get_speed
+#define snd_usb_get_speed(dev) ((dev)->speed)
+#endif
+
#endif /* __USBAUDIO_H */
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
