Update of /cvsroot/alsa/alsa-kernel/usb
In directory sc8-pr-cvs1:/tmp/cvs-serv16367
Modified Files:
usbaudio.c usbaudio.h usbmidi.c
Log Message:
Moved more 2.4 code out of alsa-kernel
Index: usbaudio.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- usbaudio.c 17 Dec 2002 19:19:16 -0000 1.30
+++ usbaudio.c 19 Dec 2002 12:15:23 -0000 1.31
@@ -526,11 +526,7 @@
/*
* complete callback from data urb
*/
-#ifndef OLD_USB
static void snd_complete_urb(struct urb *urb, struct pt_regs *regs)
-#else
-static void snd_complete_urb(struct urb *urb)
-#endif
{
snd_urb_ctx_t *ctx = (snd_urb_ctx_t *)urb->context;
snd_usb_substream_t *subs = ctx->subs;
@@ -555,11 +551,7 @@
/*
* complete callback from sync urb
*/
-#ifndef OLD_USB
static void snd_complete_sync_urb(struct urb *urb, struct pt_regs *regs)
-#else
-static void snd_complete_sync_urb(struct urb *urb)
-#endif
{
snd_urb_ctx_t *ctx = (snd_urb_ctx_t *)urb->context;
snd_usb_substream_t *subs = ctx->subs;
@@ -881,7 +873,7 @@
u->urb->transfer_flags = URB_ISO_ASAP | UNLINK_FLAGS;
u->urb->number_of_packets = u->packets;
u->urb->context = u;
- u->urb->complete = (usb_complete_t)snd_complete_urb;
+ u->urb->complete = snd_usb_complete_callback(snd_complete_urb);
}
if (subs->syncpipe) {
@@ -903,7 +895,7 @@
u->urb->transfer_flags = URB_ISO_ASAP | UNLINK_FLAGS;
u->urb->number_of_packets = u->packets;
u->urb->context = u;
- u->urb->complete = (usb_complete_t)snd_complete_sync_urb;
+ u->urb->complete =
+snd_usb_complete_callback(snd_complete_sync_urb);
}
}
return 0;
@@ -1325,11 +1317,7 @@
* entry point for linux usb interface
*/
-#ifdef OLD_USB
-static void * usb_audio_probe(struct usb_device *dev, unsigned int ifnum,
- const struct usb_device_id *id);
-static void usb_audio_disconnect(struct usb_device *dev, void *ptr);
-#else
+#ifndef OLD_USB
static int usb_audio_probe(struct usb_interface *intf,
const struct usb_device_id *id);
static void usb_audio_disconnect(struct usb_interface *intf);
@@ -2295,25 +2283,7 @@
}
}
-
-#ifdef OLD_USB
-
-/*
- * 2.4 USB kernel API
- */
-static void *usb_audio_probe(struct usb_device *dev, unsigned int ifnum,
- const struct usb_device_id *id)
-{
- return snd_usb_audio_probe(dev, usb_ifnum_to_if(dev, ifnum), id);
-}
-
-static void usb_audio_disconnect(struct usb_device *dev, void *ptr)
-{
- snd_usb_audio_disconnect(dev, ptr);
-}
-
-#else
-
+#ifndef OLD_USB
/*
* new 2.5 USB kernel API
*/
Index: usbaudio.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- usbaudio.h 5 Dec 2002 19:54:16 -0000 1.10
+++ usbaudio.h 19 Dec 2002 12:15:23 -0000 1.11
@@ -208,4 +208,8 @@
#define usb_pipe_needs_resubmit(pipe) 1
#endif
+#ifndef snd_usb_complete_callback
+#define snd_usb_complete_callback(x) (x)
+#endif
+
#endif /* __USBAUDIO_H */
Index: usbmidi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbmidi.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- usbmidi.c 17 Dec 2002 19:19:18 -0000 1.15
+++ usbmidi.c 19 Dec 2002 12:15:23 -0000 1.16
@@ -172,11 +172,7 @@
/*
* Processes the data read from the device.
*/
-#ifndef OLD_USB
static void snd_usbmidi_in_urb_complete(struct urb* urb, struct pt_regs *regs)
-#else
-static void snd_usbmidi_in_urb_complete(struct urb* urb)
-#endif
{
snd_usb_midi_in_endpoint_t* ep = snd_magic_cast(snd_usb_midi_in_endpoint_t,
urb->context, return);
@@ -201,11 +197,7 @@
/*
* Converts the data read from a Midiman device to standard USB MIDI packets.
*/
-#ifndef OLD_USB
static void snd_usbmidi_in_midiman_complete(struct urb* urb, struct pt_regs *regs)
-#else
-static void snd_usbmidi_in_midiman_complete(struct urb* urb)
-#endif
{
if (urb->status == 0) {
uint8_t* buffer = (uint8_t*)urb->transfer_buffer;
@@ -231,18 +223,10 @@
}
}
}
-#ifndef OLD_USB
snd_usbmidi_in_urb_complete(urb, regs);
-#else
- snd_usbmidi_in_urb_complete(urb);
-#endif
}
-#ifndef OLD_USB
static void snd_usbmidi_out_urb_complete(struct urb* urb, struct pt_regs *regs)
-#else
-static void snd_usbmidi_out_urb_complete(struct urb* urb)
-#endif
{
snd_usb_midi_out_endpoint_t* ep = snd_magic_cast(snd_usb_midi_out_endpoint_t,
urb->context, return);
@@ -606,11 +590,11 @@
}
if (int_epd)
usb_fill_int_urb(ep->urb, umidi->chip->dev, pipe, buffer, length,
- (usb_complete_t)snd_usbmidi_in_urb_complete,
+
+snd_usb_complete_callback(snd_usbmidi_in_urb_complete),
ep, int_epd->bInterval);
else
usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer, length,
- (usb_complete_t)snd_usbmidi_in_urb_complete,
+
+snd_usb_complete_callback(snd_usbmidi_in_urb_complete),
ep);
rep->in = ep;
@@ -677,7 +661,7 @@
}
usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer,
ep->max_transfer,
- (usb_complete_t)snd_usbmidi_out_urb_complete, ep);
+ snd_usb_complete_callback(snd_usbmidi_out_urb_complete), ep);
spin_lock_init(&ep->buffer_lock);
tasklet_init(&ep->tasklet, snd_usbmidi_out_tasklet, (unsigned long)ep);
@@ -967,7 +951,7 @@
err = snd_usbmidi_in_endpoint_create(umidi, &ep_info, &umidi->endpoints[0]);
if (err < 0)
return err;
- umidi->endpoints[0].in->urb->complete =
(usb_complete_t)snd_usbmidi_in_midiman_complete;
+ umidi->endpoints[0].in->urb->complete =
+snd_usb_complete_callback(snd_usbmidi_in_midiman_complete);
if (endpoint->out_cables > 0x0001) {
ep_info.epnum = get_endpoint(hostif, 4)->bEndpointAddress &
USB_ENDPOINT_NUMBER_MASK;
-------------------------------------------------------
This SF.NET email is sponsored by: Geek Gift Procrastinating?
Get the perfect geek gift now! Before the Holidays pass you by.
T H I N K G E E K . C O M http://www.thinkgeek.com/sf/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
