patch-2.4.20 linux-2.4.20/drivers/usb/audio.c
Next file: linux-2.4.20/drivers/usb/auerswald.c
Previous file: linux-2.4.20/drivers/usb/aiptek.c
Back to the patch index
Back to the overall index
- Lines: 108
- Date:
Thu Nov 28 15:53:14 2002
- Orig file:
linux-2.4.19/drivers/usb/audio.c
- Orig date:
Fri Aug 2 17:39:44 2002
diff -urN linux-2.4.19/drivers/usb/audio.c linux-2.4.20/drivers/usb/audio.c
@@ -297,13 +297,13 @@
#define FLG_CONNECTED 32
struct my_data_urb {
- urb_t urb;
- iso_packet_descriptor_t isoframe[DESCFRAMES];
+ struct urb urb;
+ struct iso_packet_descriptor isoframe[DESCFRAMES];
};
struct my_sync_urb {
- urb_t urb;
- iso_packet_descriptor_t isoframe[SYNCFRAMES];
+ struct urb urb;
+ struct iso_packet_descriptor isoframe[SYNCFRAMES];
};
@@ -833,7 +833,7 @@
}
}
-static int usbin_prepare_desc(struct usbin *u, purb_t urb)
+static int usbin_prepare_desc(struct usbin *u, struct urb *urb)
{
unsigned int i, maxsize, offs;
@@ -850,7 +850,7 @@
* return value: 0 if descriptor should be restarted, -1 otherwise
* convert sample format on the fly if necessary
*/
-static int usbin_retire_desc(struct usbin *u, purb_t urb)
+static int usbin_retire_desc(struct usbin *u, struct urb *urb)
{
unsigned int i, ufmtsh, dfmtsh, err = 0, cnt, scnt, dmafree;
unsigned char *cp;
@@ -930,7 +930,7 @@
/*
* we output sync data
*/
-static int usbin_sync_prepare_desc(struct usbin *u, purb_t urb)
+static int usbin_sync_prepare_desc(struct usbin *u, struct urb *urb)
{
unsigned char *cp = urb->transfer_buffer;
unsigned int i, offs;
@@ -948,7 +948,7 @@
/*
* return value: 0 if descriptor should be restarted, -1 otherwise
*/
-static int usbin_sync_retire_desc(struct usbin *u, purb_t urb)
+static int usbin_sync_retire_desc(struct usbin *u, struct urb *urb)
{
unsigned int i;
@@ -996,7 +996,7 @@
{
struct usb_device *dev = as->state->usbdev;
struct usbin *u = &as->usbin;
- purb_t urb;
+ struct urb *urb;
unsigned long flags;
unsigned int maxsze, bufsz;
@@ -1186,7 +1186,7 @@
}
}
-static int usbout_prepare_desc(struct usbout *u, purb_t urb)
+static int usbout_prepare_desc(struct usbout *u, struct urb *urb)
{
unsigned int i, ufmtsh, dfmtsh, err = 0, cnt, scnt, offs;
unsigned char *cp = urb->transfer_buffer;
@@ -1238,7 +1238,7 @@
/*
* return value: 0 if descriptor should be restarted, -1 otherwise
*/
-static int usbout_retire_desc(struct usbout *u, purb_t urb)
+static int usbout_retire_desc(struct usbout *u, struct urb *urb)
{
unsigned int i;
@@ -1285,7 +1285,7 @@
spin_unlock_irqrestore(&as->lock, flags);
}
-static int usbout_sync_prepare_desc(struct usbout *u, purb_t urb)
+static int usbout_sync_prepare_desc(struct usbout *u, struct urb *urb)
{
unsigned int i, offs;
@@ -1299,7 +1299,7 @@
/*
* return value: 0 if descriptor should be restarted, -1 otherwise
*/
-static int usbout_sync_retire_desc(struct usbout *u, purb_t urb)
+static int usbout_sync_retire_desc(struct usbout *u, struct urb *urb)
{
unsigned char *cp = urb->transfer_buffer;
unsigned int f, i;
@@ -1361,7 +1361,7 @@
{
struct usb_device *dev = as->state->usbdev;
struct usbout *u = &as->usbout;
- purb_t urb;
+ struct urb *urb;
unsigned long flags;
unsigned int maxsze, bufsz;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)