Hi,
Here's a patch against 2.5.2-pre5 that removes the
piso_packet_descriptor_t and purb_t typedefs from the usb.h file and
fixes all of the code that referenced these typedefs. It also makes the
FILL_*_URB macros use the usb_fill_*_urb inline functions.
thanks,
greg k-h
diff -Nru a/include/linux/usb.h b/include/linux/usb.h
--- a/include/linux/usb.h Mon Dec 31 10:37:52 2001
+++ b/include/linux/usb.h Mon Dec 31 10:37:52 2001
@@ -567,7 +567,7 @@
unsigned int length; /* expected length */
unsigned int actual_length;
unsigned int status;
-} iso_packet_descriptor_t, *piso_packet_descriptor_t;
+} iso_packet_descriptor_t;
struct urb;
@@ -629,7 +629,7 @@
*
* This structure identifies USB transfer requests. URBs may be allocated
* in any way, although usb_alloc_urb() is often convenient. Initialization
- * may be done using various FILL_*_URB() macros. URBs are submitted
+ * may be done using various usb_fill_*_urb() functions. URBs are submitted
* using usb_submit_urb(), and pending requests may be canceled using
* usb_unlink_urb().
*
@@ -729,87 +729,7 @@
iso_packet_descriptor_t iso_frame_desc[0]; /* (in) ISO ONLY */
};
-typedef struct urb urb_t, *purb_t;
-
-/**
- * FILL_CONTROL_URB - macro to help initialize a control urb
- * @URB: pointer to the urb to initialize.
- * @DEV: pointer to the struct usb_device for this urb.
- * @PIPE: the endpoint pipe
- * @SETUP_PACKET: pointer to the setup_packet buffer
- * @TRANSFER_BUFFER: pointer to the transfer buffer
- * @BUFFER_LENGTH: length of the transfer buffer
- * @COMPLETE: pointer to the usb_complete_t function
- * @CONTEXT: what to set the urb context to.
- *
- * Initializes a control urb with the proper information needed to submit
- * it to a device. This macro is depreciated, the usb_fill_control_urb()
- * function should be used instead.
- */
-#define
FILL_CONTROL_URB(URB,DEV,PIPE,SETUP_PACKET,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT)
\
- do {\
- spin_lock_init(&(URB)->lock);\
- (URB)->dev=DEV;\
- (URB)->pipe=PIPE;\
- (URB)->setup_packet=SETUP_PACKET;\
- (URB)->transfer_buffer=TRANSFER_BUFFER;\
- (URB)->transfer_buffer_length=BUFFER_LENGTH;\
- (URB)->complete=COMPLETE;\
- (URB)->context=CONTEXT;\
- } while (0)
-
-/**
- * FILL_BULK_URB - macro to help initialize a bulk urb
- * @URB: pointer to the urb to initialize.
- * @DEV: pointer to the struct usb_device for this urb.
- * @PIPE: the endpoint pipe
- * @TRANSFER_BUFFER: pointer to the transfer buffer
- * @BUFFER_LENGTH: length of the transfer buffer
- * @COMPLETE: pointer to the usb_complete_t function
- * @CONTEXT: what to set the urb context to.
- *
- * Initializes a bulk urb with the proper information needed to submit it
- * to a device. This macro is depreciated, the usb_fill_bulk_urb()
- * function should be used instead.
- */
-#define FILL_BULK_URB(URB,DEV,PIPE,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT) \
- do {\
- spin_lock_init(&(URB)->lock);\
- (URB)->dev=DEV;\
- (URB)->pipe=PIPE;\
- (URB)->transfer_buffer=TRANSFER_BUFFER;\
- (URB)->transfer_buffer_length=BUFFER_LENGTH;\
- (URB)->complete=COMPLETE;\
- (URB)->context=CONTEXT;\
- } while (0)
-
-/**
- * FILL_INT_URB - macro to help initialize a interrupt urb
- * @URB: pointer to the urb to initialize.
- * @DEV: pointer to the struct usb_device for this urb.
- * @PIPE: the endpoint pipe
- * @TRANSFER_BUFFER: pointer to the transfer buffer
- * @BUFFER_LENGTH: length of the transfer buffer
- * @COMPLETE: pointer to the usb_complete_t function
- * @CONTEXT: what to set the urb context to.
- * @INTERVAL: what to set the urb interval to.
- *
- * Initializes a interrupt urb with the proper information needed to submit
- * it to a device. This macro is depreciated, the usb_fill_int_urb()
- * function should be used instead.
- */
-#define
FILL_INT_URB(URB,DEV,PIPE,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT,INTERVAL) \
- do {\
- spin_lock_init(&(URB)->lock);\
- (URB)->dev=DEV;\
- (URB)->pipe=PIPE;\
- (URB)->transfer_buffer=TRANSFER_BUFFER;\
- (URB)->transfer_buffer_length=BUFFER_LENGTH;\
- (URB)->complete=COMPLETE;\
- (URB)->context=CONTEXT;\
- (URB)->interval=INTERVAL;\
- (URB)->start_frame=-1;\
- } while (0)
+typedef struct urb urb_t;
/**
* usb_fill_control_urb - initializes a control urb
@@ -908,11 +828,22 @@
urb->interval = interval;
urb->start_frame = -1;
}
-
+
+/*
+ * old style macros to enable 2.4 and 2.2 drivers to build
+ * properly. Please do not use these for new USB drivers.
+ */
+#define
+FILL_CONTROL_URB(URB,DEV,PIPE,SETUP_PACKET,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT)
+ \
+
+usb_fill_control_urb(URB,DEV,PIPE,SETUP_PACKET,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT)
+#define FILL_BULK_URB(URB,DEV,PIPE,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT) \
+ usb_fill_bulk_urb(URB,DEV,PIPE,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT)
+#define
+FILL_INT_URB(URB,DEV,PIPE,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT,INTERVAL) \
+
+usb_fill_int_urb(URB,DEV,PIPE,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT,INTERVAL)
+
extern struct urb *usb_alloc_urb(int iso_packets);
-extern void usb_free_urb(struct urb *purb);
-extern int usb_submit_urb(struct urb *purb);
-extern int usb_unlink_urb(struct urb *purb);
+extern void usb_free_urb(struct urb *urb);
+extern int usb_submit_urb(struct urb *urb);
+extern int usb_unlink_urb(struct urb *urb);
/*-------------------------------------------------------------------*
* SYNCHRONOUS CALL SUPPORT *
@@ -959,8 +890,8 @@
int (*allocate)(struct usb_device *);
int (*deallocate)(struct usb_device *);
int (*get_frame_number) (struct usb_device *usb_dev);
- int (*submit_urb) (struct urb* purb);
- int (*unlink_urb) (struct urb* purb);
+ int (*submit_urb) (struct urb *urb);
+ int (*unlink_urb) (struct urb *urb);
};
#define DEVNUM_ROUND_ROBIN /***** OPTION *****/
diff -Nru a/arch/cris/drivers/usb-host.c b/arch/cris/drivers/usb-host.c
--- a/arch/cris/drivers/usb-host.c Mon Dec 31 10:37:52 2001
+++ b/arch/cris/drivers/usb-host.c Mon Dec 31 10:37:52 2001
@@ -196,7 +196,7 @@
static kmem_cache_t *usb_desc_cache;
static struct usb_bus *etrax_usb_bus;
-static void dump_urb (purb_t purb);
+static void dump_urb (struct urb *urb);
static void init_rx_buffers(void);
static int etrax_rh_unlink_urb (urb_t *urb);
static void etrax_rh_send_irq(urb_t *urb);
@@ -240,24 +240,24 @@
};
#ifdef USB_DEBUG_DESC
-static void dump_urb(purb_t purb)
+static void dump_urb(struct urb *urb)
{
- printk("\nurb :0x%08X\n", purb);
- printk("next :0x%08X\n", purb->next);
- printk("dev :0x%08X\n", purb->dev);
- printk("pipe :0x%08X\n", purb->pipe);
- printk("status :%d\n", purb->status);
- printk("transfer_flags :0x%08X\n", purb->transfer_flags);
- printk("transfer_buffer :0x%08X\n", purb->transfer_buffer);
- printk("transfer_buffer_length:%d\n", purb->transfer_buffer_length);
- printk("actual_length :%d\n", purb->actual_length);
- printk("setup_packet :0x%08X\n", purb->setup_packet);
- printk("start_frame :%d\n", purb->start_frame);
- printk("number_of_packets :%d\n", purb->number_of_packets);
- printk("interval :%d\n", purb->interval);
- printk("error_count :%d\n", purb->error_count);
- printk("context :0x%08X\n", purb->context);
- printk("complete :0x%08X\n\n", purb->complete);
+ printk("\nurb :0x%08X\n", urb);
+ printk("next :0x%08X\n", urb->next);
+ printk("dev :0x%08X\n", urb->dev);
+ printk("pipe :0x%08X\n", urb->pipe);
+ printk("status :%d\n", urb->status);
+ printk("transfer_flags :0x%08X\n", urb->transfer_flags);
+ printk("transfer_buffer :0x%08X\n", urb->transfer_buffer);
+ printk("transfer_buffer_length:%d\n", urb->transfer_buffer_length);
+ printk("actual_length :%d\n", urb->actual_length);
+ printk("setup_packet :0x%08X\n", urb->setup_packet);
+ printk("start_frame :%d\n", urb->start_frame);
+ printk("number_of_packets :%d\n", urb->number_of_packets);
+ printk("interval :%d\n", urb->interval);
+ printk("error_count :%d\n", urb->error_count);
+ printk("context :0x%08X\n", urb->context);
+ printk("complete :0x%08X\n\n", urb->complete);
}
static void dump_in_desc(USB_IN_Desc_t *in)
diff -Nru a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
--- a/drivers/net/irda/irda-usb.c Mon Dec 31 10:37:52 2001
+++ b/drivers/net/irda/irda-usb.c Mon Dec 31 10:37:52 2001
@@ -112,9 +112,9 @@
static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *dev);
static int irda_usb_open(struct irda_usb_cb *self);
static int irda_usb_close(struct irda_usb_cb *self);
-static void speed_bulk_callback(purb_t purb);
-static void write_bulk_callback(purb_t purb);
-static void irda_usb_receive(purb_t purb);
+static void speed_bulk_callback(struct urb *urb);
+static void write_bulk_callback(struct urb *urb);
+static void irda_usb_receive(struct urb *urb);
static int irda_usb_net_init(struct net_device *dev);
static int irda_usb_net_open(struct net_device *dev);
static int irda_usb_net_close(struct net_device *dev);
@@ -248,15 +248,15 @@
{
unsigned long flags;
__u8 *frame;
- purb_t purb;
+ struct urb *urb;
int ret;
IRDA_DEBUG(2, __FUNCTION__ "(), speed=%d, xbofs=%d\n",
self->new_speed, self->new_xbofs);
/* Grab the speed URB */
- purb = &self->speed_urb;
- if (purb->status != 0) {
+ urb = &self->speed_urb;
+ if (urb->status != 0) {
WARNING(__FUNCTION__ "(), URB still in use!\n");
return;
}
@@ -270,15 +270,15 @@
irda_usb_build_header(self, frame, 1);
/* Submit the 0 length IrDA frame to trigger new speed settings */
- FILL_BULK_URB(purb, self->usbdev,
+ FILL_BULK_URB(urb, self->usbdev,
usb_sndbulkpipe(self->usbdev, self->bulk_out_ep),
frame, IRDA_USB_SPEED_MTU,
speed_bulk_callback, self);
- purb->transfer_buffer_length = USB_IRDA_HEADER;
- purb->transfer_flags = USB_QUEUE_BULK | USB_ASYNC_UNLINK;
- purb->timeout = MSECS_TO_JIFFIES(100);
+ urb->transfer_buffer_length = USB_IRDA_HEADER;
+ urb->transfer_flags = USB_QUEUE_BULK | USB_ASYNC_UNLINK;
+ urb->timeout = MSECS_TO_JIFFIES(100);
- if ((ret = usb_submit_urb(purb))) {
+ if ((ret = usb_submit_urb(urb))) {
WARNING(__FUNCTION__ "(), failed Speed URB\n");
}
spin_unlock_irqrestore(&self->lock, flags);
@@ -288,9 +288,9 @@
/*
* Note : this function will be called with both speed_urb and empty_urb...
*/
-static void speed_bulk_callback(purb_t purb)
+static void speed_bulk_callback(struct urb *urb)
{
- struct irda_usb_cb *self = purb->context;
+ struct irda_usb_cb *self = urb->context;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
@@ -301,9 +301,9 @@
}
/* Check for timeout and other USB nasties */
- if (purb->status != 0) {
+ if (urb->status != 0) {
/* I get a lot of -ECONNABORTED = -103 here - Jean II */
- IRDA_DEBUG(0, __FUNCTION__ "(), URB complete status %d, transfer_flags
0x%04X\n", purb->status, purb->transfer_flags);
+ IRDA_DEBUG(0, __FUNCTION__ "(), URB complete status %d, transfer_flags
+0x%04X\n", urb->status, urb->transfer_flags);
/* Don't do anything here, that might confuse the USB layer.
* Instead, we will wait for irda_usb_net_timeout(), the
@@ -314,10 +314,10 @@
}
/* urb is now available */
- purb->status = 0;
+ urb->status = 0;
/* If it was the speed URB, allow the stack to send more packets */
- if(purb == &self->speed_urb) {
+ if(urb == &self->speed_urb) {
netif_wake_queue(self->netdev);
}
}
@@ -329,7 +329,7 @@
static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
{
struct irda_usb_cb *self = netdev->priv;
- purb_t purb = &self->tx_urb;
+ struct urb *urb = &self->tx_urb;
unsigned long flags;
s32 speed;
s16 xbofs;
@@ -372,7 +372,7 @@
}
}
- if (purb->status != 0) {
+ if (urb->status != 0) {
WARNING(__FUNCTION__ "(), URB still in use!\n");
dev_kfree_skb(skb);
return 0;
@@ -392,22 +392,22 @@
/* FIXME: Make macro out of this one */
((struct irda_skb_cb *)skb->cb)->context = self;
- FILL_BULK_URB(purb, self->usbdev,
+ FILL_BULK_URB(urb, self->usbdev,
usb_sndbulkpipe(self->usbdev, self->bulk_out_ep),
skb->data, IRDA_USB_MAX_MTU,
write_bulk_callback, skb);
- purb->transfer_buffer_length = skb->len;
+ urb->transfer_buffer_length = skb->len;
/* Note : unlink *must* be Asynchronous because of the code in
* irda_usb_net_timeout() -> call in irq - Jean II */
- purb->transfer_flags = USB_QUEUE_BULK | USB_ASYNC_UNLINK;
+ urb->transfer_flags = USB_QUEUE_BULK | USB_ASYNC_UNLINK;
/* This flag (USB_ZERO_PACKET) indicates that what we send is not
* a continuous stream of data but separate packets.
* In this case, the USB layer will insert an empty USB frame (TD)
* after each of our packets that is exact multiple of the frame size.
* This is how the dongle will detect the end of packet - Jean II */
- purb->transfer_flags |= USB_ZERO_PACKET;
+ urb->transfer_flags |= USB_ZERO_PACKET;
/* Timeout need to be shorter than NET watchdog timer */
- purb->timeout = MSECS_TO_JIFFIES(200);
+ urb->timeout = MSECS_TO_JIFFIES(200);
/* Generate min turn time. FIXME: can we do better than this? */
/* Trying to a turnaround time at this level is trying to measure
@@ -451,7 +451,7 @@
}
/* Ask USB to send the packet */
- if ((res = usb_submit_urb(purb))) {
+ if ((res = usb_submit_urb(urb))) {
WARNING(__FUNCTION__ "(), failed Tx URB\n");
self->stats.tx_errors++;
/* Let USB recover : We will catch that in the watchdog */
@@ -472,9 +472,9 @@
/*
* Note : this function will be called only for tx_urb...
*/
-static void write_bulk_callback(purb_t purb)
+static void write_bulk_callback(struct urb *urb)
{
- struct sk_buff *skb = purb->context;
+ struct sk_buff *skb = urb->context;
struct irda_usb_cb *self = ((struct irda_skb_cb *) skb->cb)->context;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
@@ -487,12 +487,12 @@
/* Free up the skb */
dev_kfree_skb_any(skb);
- purb->context = NULL;
+ urb->context = NULL;
/* Check for timeout and other USB nasties */
- if (purb->status != 0) {
+ if (urb->status != 0) {
/* I get a lot of -ECONNABORTED = -103 here - Jean II */
- IRDA_DEBUG(0, __FUNCTION__ "(), URB complete status %d, transfer_flags
0x%04X\n", purb->status, purb->transfer_flags);
+ IRDA_DEBUG(0, __FUNCTION__ "(), URB complete status %d, transfer_flags
+0x%04X\n", urb->status, urb->transfer_flags);
/* Don't do anything here, that might confuse the USB layer,
* and we could go in recursion and blow the kernel stack...
@@ -504,7 +504,7 @@
}
/* urb is now available */
- purb->status = 0;
+ urb->status = 0;
/* If the network is closed, stop everything */
if ((!self->netopen) || (!self->present)) {
@@ -534,7 +534,7 @@
static void irda_usb_net_timeout(struct net_device *netdev)
{
struct irda_usb_cb *self = netdev->priv;
- purb_t purb;
+ struct urb *urb;
int done = 0; /* If we have made any progress */
IRDA_DEBUG(0, __FUNCTION__ "(), Network layer thinks we timed out!\n");
@@ -546,13 +546,13 @@
}
/* Check speed URB */
- purb = &(self->speed_urb);
- if (purb->status != 0) {
- IRDA_DEBUG(0, "%s: Speed change timed out, urb->status=%d,
urb->transfer_flags=0x%04X\n", netdev->name, purb->status, purb->transfer_flags);
+ urb = &(self->speed_urb);
+ if (urb->status != 0) {
+ IRDA_DEBUG(0, "%s: Speed change timed out, urb->status=%d,
+urb->transfer_flags=0x%04X\n", netdev->name, urb->status, urb->transfer_flags);
- switch (purb->status) {
+ switch (urb->status) {
case -EINPROGRESS:
- usb_unlink_urb(purb);
+ usb_unlink_urb(urb);
/* Note : above will *NOT* call netif_wake_queue()
* in completion handler, we will come back here.
* Jean II */
@@ -563,7 +563,7 @@
case -ETIMEDOUT: /* -110 */
case -ENOENT: /* -2 (urb unlinked by us) */
default: /* ??? - Play safe */
- purb->status = 0;
+ urb->status = 0;
netif_wake_queue(self->netdev);
done = 1;
break;
@@ -571,11 +571,11 @@
}
/* Check Tx URB */
- purb = &(self->tx_urb);
- if (purb->status != 0) {
- struct sk_buff *skb = purb->context;
+ urb = &(self->tx_urb);
+ if (urb->status != 0) {
+ struct sk_buff *skb = urb->context;
- IRDA_DEBUG(0, "%s: Tx timed out, urb->status=%d,
urb->transfer_flags=0x%04X\n", netdev->name, purb->status, purb->transfer_flags);
+ IRDA_DEBUG(0, "%s: Tx timed out, urb->status=%d,
+urb->transfer_flags=0x%04X\n", netdev->name, urb->status, urb->transfer_flags);
/* Increase error count */
self->stats.tx_errors++;
@@ -589,11 +589,11 @@
irda_usb_change_speed_xbofs(self);
#endif /* IU_BUG_KICK_TIMEOUT */
- switch (purb->status) {
+ switch (urb->status) {
case -EINPROGRESS:
- usb_unlink_urb(purb);
+ usb_unlink_urb(urb);
/* Note : above will *NOT* call netif_wake_queue()
- * in completion handler, because purb->status will
+ * in completion handler, because urb->status will
* be -ENOENT. We will fix that at the next watchdog,
* leaving more time to USB to recover...
* Also, we are in interrupt, so we need to have
@@ -608,9 +608,9 @@
default: /* ??? - Play safe */
if(skb != NULL) {
dev_kfree_skb_any(skb);
- purb->context = NULL;
+ urb->context = NULL;
}
- purb->status = 0;
+ urb->status = 0;
netif_wake_queue(self->netdev);
done = 1;
break;
@@ -685,7 +685,7 @@
*
* Jean II
*/
-static void irda_usb_submit(struct irda_usb_cb *self, struct sk_buff *skb, purb_t
purb)
+static void irda_usb_submit(struct irda_usb_cb *self, struct sk_buff *skb, struct urb
+*urb)
{
struct irda_skb_cb *cb;
int ret;
@@ -693,8 +693,8 @@
IRDA_DEBUG(2, __FUNCTION__ "()\n");
/* Check that we have an urb */
- if (!purb) {
- WARNING(__FUNCTION__ "(), Bug : purb == NULL\n");
+ if (!urb) {
+ WARNING(__FUNCTION__ "(), Bug : urb == NULL\n");
return;
}
@@ -720,17 +720,17 @@
cb->context = self;
/* Reinitialize URB */
- FILL_BULK_URB(purb, self->usbdev,
+ FILL_BULK_URB(urb, self->usbdev,
usb_rcvbulkpipe(self->usbdev, self->bulk_in_ep),
skb->data, skb->truesize,
irda_usb_receive, skb);
- purb->transfer_flags = USB_QUEUE_BULK;
+ urb->transfer_flags = USB_QUEUE_BULK;
/* Note : unlink *must* be synchronous because of the code in
* irda_usb_net_close() -> free the skb - Jean II */
- purb->status = 0;
- purb->next = NULL; /* Don't auto resubmit URBs */
+ urb->status = 0;
+ urb->next = NULL; /* Don't auto resubmit URBs */
- ret = usb_submit_urb(purb);
+ ret = usb_submit_urb(urb);
if (ret) {
/* If this ever happen, we are in deep s***.
* Basically, the Rx path will stop... */
@@ -740,19 +740,19 @@
/*------------------------------------------------------------------*/
/*
- * Function irda_usb_receive(purb)
+ * Function irda_usb_receive(urb)
*
* Called by the USB subsystem when a frame has been received
*
*/
-static void irda_usb_receive(purb_t purb)
+static void irda_usb_receive(struct urb *urb)
{
- struct sk_buff *skb = (struct sk_buff *) purb->context;
+ struct sk_buff *skb = (struct sk_buff *) urb->context;
struct irda_usb_cb *self;
struct irda_skb_cb *cb;
struct sk_buff *new;
- IRDA_DEBUG(2, __FUNCTION__ "(), len=%d\n", purb->actual_length);
+ IRDA_DEBUG(2, __FUNCTION__ "(), len=%d\n", urb->actual_length);
/* Find ourselves */
cb = (struct irda_skb_cb *) skb->cb;
@@ -768,27 +768,27 @@
}
/* Check the status */
- if (purb->status != 0) {
- switch (purb->status) {
+ if (urb->status != 0) {
+ switch (urb->status) {
case -EILSEQ:
self->stats.rx_errors++;
self->stats.rx_crc_errors++;
break;
case -ECONNRESET: /* -104 */
- IRDA_DEBUG(0, __FUNCTION__ "(), Connection Reset (-104),
transfer_flags 0x%04X \n", purb->transfer_flags);
+ IRDA_DEBUG(0, __FUNCTION__ "(), Connection Reset (-104),
+transfer_flags 0x%04X \n", urb->transfer_flags);
/* uhci_cleanup_unlink() is going to kill the Rx
* URB just after we return. No problem, at this
* point the URB will be idle ;-) - Jean II */
break;
default:
- IRDA_DEBUG(0, __FUNCTION__ "(), RX status %d,transfer_flags
0x%04X \n", purb->status, purb->transfer_flags);
+ IRDA_DEBUG(0, __FUNCTION__ "(), RX status %d,transfer_flags
+0x%04X \n", urb->status, urb->transfer_flags);
break;
}
goto done;
}
/* Check for empty frames */
- if (purb->actual_length <= USB_IRDA_HEADER) {
+ if (urb->actual_length <= USB_IRDA_HEADER) {
WARNING(__FUNCTION__ "(), empty frame!\n");
goto done;
}
@@ -801,7 +801,7 @@
get_fast_time(&self->stamp);
/* Fix skb, and remove USB-IrDA header */
- skb_put(skb, purb->actual_length);
+ skb_put(skb, urb->actual_length);
skb_pull(skb, USB_IRDA_HEADER);
/* Don't waste a lot of memory on small IrDA frames */
@@ -834,7 +834,7 @@
netif_rx(new);
done:
- /* Note : at this point, the URB we've just received (purb)
+ /* Note : at this point, the URB we've just received (urb)
* is still referenced by the USB layer. For example, if we
* have received a -ECONNRESET, uhci_cleanup_unlink() will
* continue to process it (in fact, cleaning it up).
@@ -848,8 +848,8 @@
/* Submit the idle URB to replace the URB we've just received */
irda_usb_submit(self, skb, self->idle_rx_urb);
/* Recycle Rx URB : Now, the idle URB is the present one */
- self->idle_rx_urb = purb;
- purb->context = NULL;
+ self->idle_rx_urb = urb;
+ urb->context = NULL;
}
/*------------------------------------------------------------------*/
@@ -992,14 +992,14 @@
/* Deallocate all the Rx path buffers (URBs and skb) */
for (i = 0; i < IU_MAX_RX_URBS; i++) {
- purb_t purb = &(self->rx_urb[i]);
- struct sk_buff *skb = (struct sk_buff *) purb->context;
+ struct urb *urb = &(self->rx_urb[i]);
+ struct sk_buff *skb = (struct sk_buff *) urb->context;
/* Cancel the receive command */
- usb_unlink_urb(purb);
+ usb_unlink_urb(urb);
/* The skb is ours, free it */
if(skb) {
dev_kfree_skb(skb);
- purb->context = NULL;
+ urb->context = NULL;
}
}
/* Cancel Tx and speed URB */
diff -Nru a/drivers/usb/audio.c b/drivers/usb/audio.c
--- a/drivers/usb/audio.c Mon Dec 31 10:37:52 2001
+++ b/drivers/usb/audio.c Mon Dec 31 10:37:52 2001
@@ -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;
diff -Nru a/drivers/usb/dabusb.c b/drivers/usb/dabusb.c
--- a/drivers/usb/dabusb.c Mon Dec 31 10:37:52 2001
+++ b/drivers/usb/dabusb.c Mon Dec 31 10:37:52 2001
@@ -83,24 +83,24 @@
}
/*-------------------------------------------------------------------*/
#ifdef DEBUG
-static void dump_urb (purb_t purb)
+static void dump_urb (struct urb *urb)
{
- dbg("urb :%p", purb);
- dbg("next :%p", purb->next);
- dbg("dev :%p", purb->dev);
- dbg("pipe :%08X", purb->pipe);
- dbg("status :%d", purb->status);
- dbg("transfer_flags :%08X", purb->transfer_flags);
- dbg("transfer_buffer :%p", purb->transfer_buffer);
- dbg("transfer_buffer_length:%d", purb->transfer_buffer_length);
- dbg("actual_length :%d", purb->actual_length);
- dbg("setup_packet :%p", purb->setup_packet);
- dbg("start_frame :%d", purb->start_frame);
- dbg("number_of_packets :%d", purb->number_of_packets);
- dbg("interval :%d", purb->interval);
- dbg("error_count :%d", purb->error_count);
- dbg("context :%p", purb->context);
- dbg("complete :%p", purb->complete);
+ dbg("urb :%p", urb);
+ dbg("next :%p", urb->next);
+ dbg("dev :%p", urb->dev);
+ dbg("pipe :%08X", urb->pipe);
+ dbg("status :%d", urb->status);
+ dbg("transfer_flags :%08X", urb->transfer_flags);
+ dbg("transfer_buffer :%p", urb->transfer_buffer);
+ dbg("transfer_buffer_length:%d", urb->transfer_buffer_length);
+ dbg("actual_length :%d", urb->actual_length);
+ dbg("setup_packet :%p", urb->setup_packet);
+ dbg("start_frame :%d", urb->start_frame);
+ dbg("number_of_packets :%d", urb->number_of_packets);
+ dbg("interval :%d", urb->interval);
+ dbg("error_count :%d", urb->error_count);
+ dbg("context :%p", urb->context);
+ dbg("complete :%p", urb->complete);
}
#endif
/*-------------------------------------------------------------------*/
@@ -167,7 +167,7 @@
return 0;
}
/*-------------------------------------------------------------------*/
-static void dabusb_iso_complete (purb_t purb)
+static void dabusb_iso_complete (struct urb *purb)
{
pbuff_t b = purb->context;
pdabusb_t s = b->s;
@@ -482,7 +482,7 @@
int rem;
int cnt;
pbuff_t b;
- purb_t purb = NULL;
+ struct urb *purb = NULL;
dbg("dabusb_read");
diff -Nru a/drivers/usb/dabusb.h b/drivers/usb/dabusb.h
--- a/drivers/usb/dabusb.h Mon Dec 31 10:37:52 2001
+++ b/drivers/usb/dabusb.h Mon Dec 31 10:37:52 2001
@@ -38,7 +38,7 @@
typedef struct
{
pdabusb_t s;
- purb_t purb;
+ struct urb *purb;
struct list_head buff_list;
} buff_t,*pbuff_t;
diff -Nru a/drivers/usb/devio.c b/drivers/usb/devio.c
--- a/drivers/usb/devio.c Mon Dec 31 10:37:51 2001
+++ b/drivers/usb/devio.c Mon Dec 31 10:37:51 2001
@@ -245,7 +245,7 @@
return NULL;
}
-static void async_completed(purb_t urb)
+static void async_completed(struct urb *urb)
{
struct async *as = (struct async *)urb->context;
struct dev_state *ps = as->ps;
diff -Nru a/drivers/usb/mdc800.c b/drivers/usb/mdc800.c
--- a/drivers/usb/mdc800.c Mon Dec 31 10:37:52 2001
+++ b/drivers/usb/mdc800.c Mon Dec 31 10:37:52 2001
@@ -140,7 +140,7 @@
unsigned int endpoint [4];
- purb_t irq_urb;
+ struct urb * irq_urb;
wait_queue_head_t irq_wait;
int irq_woken;
char* irq_urb_buffer;
@@ -149,13 +149,13 @@
int camera_request_ready; // Status to synchronize with irq
char camera_response [8]; // last Bytes send after busy
- purb_t write_urb;
+ struct urb * write_urb;
char* write_urb_buffer;
wait_queue_head_t write_wait;
int written;
- purb_t download_urb;
+ struct urb * download_urb;
char* download_urb_buffer;
wait_queue_head_t download_wait;
int downloaded;
diff -Nru a/drivers/usb/pwc-if.c b/drivers/usb/pwc-if.c
--- a/drivers/usb/pwc-if.c Mon Dec 31 10:37:52 2001
+++ b/drivers/usb/pwc-if.c Mon Dec 31 10:37:52 2001
@@ -624,7 +624,7 @@
/* This gets called for the Isochronous pipe (video). This is done in
* interrupt time, so it has to be fast, not crash, and not stall. Neat.
*/
-static void pwc_isoc_handler(purb_t urb)
+static void pwc_isoc_handler(struct urb *urb)
{
struct pwc_device *pdev;
int i, fst, flen;
@@ -786,7 +786,7 @@
static int pwc_isoc_init(struct pwc_device *pdev)
{
struct usb_device *udev;
- purb_t urb;
+ struct urb *urb;
int i, j, ret;
struct usb_interface_descriptor *idesc;
diff -Nru a/drivers/usb/pwc.h b/drivers/usb/pwc.h
--- a/drivers/usb/pwc.h Mon Dec 31 10:37:52 2001
+++ b/drivers/usb/pwc.h Mon Dec 31 10:37:52 2001
@@ -96,7 +96,7 @@
void *data;
int length;
int read;
- purb_t urb;
+ struct urb *urb;
};
/* intermediate buffers with raw data from the USB cam */
diff -Nru a/drivers/usb/usb-debug.c b/drivers/usb/usb-debug.c
--- a/drivers/usb/usb-debug.c Mon Dec 31 10:37:52 2001
+++ b/drivers/usb/usb-debug.c Mon Dec 31 10:37:52 2001
@@ -181,23 +181,23 @@
kfree(buf);
}
-void usb_dump_urb (purb_t purb)
+void usb_dump_urb (struct urb *urb)
{
- printk ("urb :%p\n", purb);
- printk ("next :%p\n", purb->next);
- printk ("dev :%p\n", purb->dev);
- printk ("pipe :%08X\n", purb->pipe);
- printk ("status :%d\n", purb->status);
- printk ("transfer_flags :%08X\n", purb->transfer_flags);
- printk ("transfer_buffer :%p\n", purb->transfer_buffer);
- printk ("transfer_buffer_length:%d\n", purb->transfer_buffer_length);
- printk ("actual_length :%d\n", purb->actual_length);
- printk ("setup_packet :%p\n", purb->setup_packet);
- printk ("start_frame :%d\n", purb->start_frame);
- printk ("number_of_packets :%d\n", purb->number_of_packets);
- printk ("interval :%d\n", purb->interval);
- printk ("error_count :%d\n", purb->error_count);
- printk ("context :%p\n", purb->context);
- printk ("complete :%p\n", purb->complete);
+ printk ("urb :%p\n", urb);
+ printk ("next :%p\n", urb->next);
+ printk ("dev :%p\n", urb->dev);
+ printk ("pipe :%08X\n", urb->pipe);
+ printk ("status :%d\n", urb->status);
+ printk ("transfer_flags :%08X\n", urb->transfer_flags);
+ printk ("transfer_buffer :%p\n", urb->transfer_buffer);
+ printk ("transfer_buffer_length:%d\n", urb->transfer_buffer_length);
+ printk ("actual_length :%d\n", urb->actual_length);
+ printk ("setup_packet :%p\n", urb->setup_packet);
+ printk ("start_frame :%d\n", urb->start_frame);
+ printk ("number_of_packets :%d\n", urb->number_of_packets);
+ printk ("interval :%d\n", urb->interval);
+ printk ("error_count :%d\n", urb->error_count);
+ printk ("context :%p\n", urb->context);
+ printk ("complete :%p\n", urb->complete);
}
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
