# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.597 -> 1.598
# drivers/usb/hcd/ehci-sched.c 1.3 -> 1.4
# include/linux/usb.h 1.12 -> 1.13
# drivers/usb/audio.c 1.9 -> 1.10
# drivers/isdn/hisax/st5481_d.c 1.4 -> 1.5
# drivers/usb/devio.c 1.9 -> 1.10
# drivers/usb/usb.c 1.19 -> 1.20
# drivers/isdn/hisax/st5481_usb.c 1.4 -> 1.5
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/08/05 greg@kroah.com 1.598
# USB: usb.h cleanups, typedef removed for iso packets, and whitespace changes.
#
# removed iso_packet_descriptor_t and piso_packet_descriptor_t typedef, use
# the "struct iso_packet_descriptor" now.
# --------------------------------------------
#
diff -Nru a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
--- a/drivers/isdn/hisax/st5481_d.c Mon Aug 5 14:47:02 2002
+++ b/drivers/isdn/hisax/st5481_d.c Mon Aug 5 14:47:02 2002
@@ -297,7 +297,7 @@
unsigned int num_packets, packet_offset;
int len, buf_size, bytes_sent;
struct sk_buff *skb;
- iso_packet_descriptor_t *desc;
+ struct iso_packet_descriptor *desc;
if (d_out->fsm.state != ST_DOUT_NORMAL)
return;
diff -Nru a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
--- a/drivers/isdn/hisax/st5481_usb.c Mon Aug 5 14:47:02 2002
+++ b/drivers/isdn/hisax/st5481_usb.c Mon Aug 5 14:47:02 2002
@@ -560,7 +560,8 @@
*/
int st5481_isoc_flatten(struct urb *urb)
{
- piso_packet_descriptor_t pipd,pend;
+ struct iso_packet_descriptor *pipd;
+ struct iso_packet_descriptor *pend;
unsigned char *src,*dst;
unsigned int len;
diff -Nru a/drivers/usb/audio.c b/drivers/usb/audio.c
--- a/drivers/usb/audio.c Mon Aug 5 14:47:02 2002
+++ b/drivers/usb/audio.c Mon Aug 5 14:47:02 2002
@@ -298,12 +298,12 @@
struct my_data_urb {
urb_t urb;
- iso_packet_descriptor_t isoframe[DESCFRAMES];
+ struct iso_packet_descriptor isoframe[DESCFRAMES];
};
struct my_sync_urb {
urb_t urb;
- iso_packet_descriptor_t isoframe[SYNCFRAMES];
+ struct iso_packet_descriptor isoframe[SYNCFRAMES];
};
diff -Nru a/drivers/usb/devio.c b/drivers/usb/devio.c
--- a/drivers/usb/devio.c Mon Aug 5 14:47:02 2002
+++ b/drivers/usb/devio.c Mon Aug 5 14:47:02 2002
@@ -169,7 +169,7 @@
static struct async *alloc_async(unsigned int numisoframes)
{
- unsigned int assize = sizeof(struct async) + numisoframes * sizeof(iso_packet_descriptor_t);
+ unsigned int assize = sizeof(struct async) + numisoframes * sizeof(struct iso_packet_descriptor);
struct async *as = kmalloc(assize, GFP_KERNEL);
if (!as)
return NULL;
diff -Nru a/drivers/usb/hcd/ehci-sched.c b/drivers/usb/hcd/ehci-sched.c
--- a/drivers/usb/hcd/ehci-sched.c Mon Aug 5 14:47:02 2002
+++ b/drivers/usb/hcd/ehci-sched.c Mon Aug 5 14:47:02 2002
@@ -881,7 +881,7 @@
unsigned long flags
) {
struct urb *urb = itd->urb;
- iso_packet_descriptor_t *desc;
+ struct iso_packet_descriptor *desc;
u32 t;
/* update status for this uframe's transfers */
diff -Nru a/drivers/usb/usb.c b/drivers/usb/usb.c
--- a/drivers/usb/usb.c Mon Aug 5 14:47:02 2002
+++ b/drivers/usb/usb.c Mon Aug 5 14:47:02 2002
@@ -989,7 +989,7 @@
{
urb_t *urb;
- urb = (urb_t *)kmalloc(sizeof(urb_t) + iso_packets * sizeof(iso_packet_descriptor_t),
+ urb = (urb_t *)kmalloc(sizeof(urb_t) + iso_packets * sizeof(struct iso_packet_descriptor),
in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
if (!urb) {
err("alloc_urb: kmalloc failed");
diff -Nru a/include/linux/usb.h b/include/linux/usb.h
--- a/include/linux/usb.h Mon Aug 5 14:47:02 2002
+++ b/include/linux/usb.h Mon Aug 5 14:47:02 2002
@@ -16,8 +16,8 @@
#define USB_CLASS_MASS_STORAGE 8
#define USB_CLASS_HUB 9
#define USB_CLASS_CDC_DATA 0x0a
-#define USB_CLASS_CSCID 0x0b /* chip+ smart card */
-#define USB_CLASS_CONTENT_SEC 0x0d /* content security */
+#define USB_CLASS_CSCID 0x0b /* chip+ smart card */
+#define USB_CLASS_CONTENT_SEC 0x0d /* content security */
#define USB_CLASS_APP_SPEC 0xfe
#define USB_CLASS_VENDOR_SPEC 0xff
@@ -42,8 +42,8 @@
/*
* USB directions
*/
-#define USB_DIR_OUT 0
-#define USB_DIR_IN 0x80
+#define USB_DIR_OUT 0 /* to device */
+#define USB_DIR_IN 0x80 /* to host */
/*
* Descriptor types
@@ -85,23 +85,23 @@
/*
* USB Packet IDs (PIDs)
*/
-#define USB_PID_UNDEF_0 0xf0
-#define USB_PID_OUT 0xe1
-#define USB_PID_ACK 0xd2
-#define USB_PID_DATA0 0xc3
-#define USB_PID_PING 0xb4 /* USB 2.0 */
-#define USB_PID_SOF 0xa5
-#define USB_PID_NYET 0x96 /* USB 2.0 */
-#define USB_PID_DATA2 0x87 /* USB 2.0 */
-#define USB_PID_SPLIT 0x78 /* USB 2.0 */
-#define USB_PID_IN 0x69
-#define USB_PID_NAK 0x5a
-#define USB_PID_DATA1 0x4b
-#define USB_PID_PREAMBLE 0x3c /* Token mode */
-#define USB_PID_ERR 0x3c /* USB 2.0: handshake mode */
-#define USB_PID_SETUP 0x2d
-#define USB_PID_STALL 0x1e
-#define USB_PID_MDATA 0x0f /* USB 2.0 */
+#define USB_PID_UNDEF_0 0xf0
+#define USB_PID_OUT 0xe1
+#define USB_PID_ACK 0xd2
+#define USB_PID_DATA0 0xc3
+#define USB_PID_PING 0xb4 /* USB 2.0 */
+#define USB_PID_SOF 0xa5
+#define USB_PID_NYET 0x96 /* USB 2.0 */
+#define USB_PID_DATA2 0x87 /* USB 2.0 */
+#define USB_PID_SPLIT 0x78 /* USB 2.0 */
+#define USB_PID_IN 0x69
+#define USB_PID_NAK 0x5a
+#define USB_PID_DATA1 0x4b
+#define USB_PID_PREAMBLE 0x3c /* Token mode */
+#define USB_PID_ERR 0x3c /* USB 2.0: handshake mode */
+#define USB_PID_SETUP 0x2d
+#define USB_PID_STALL 0x1e
+#define USB_PID_MDATA 0x0f /* USB 2.0 */
/*
* Standard requests
@@ -174,10 +174,10 @@
#define USB_ST_BUFFEROVERRUN (-ECOMM)
#define USB_ST_BUFFERUNDERRUN (-ENOSR)
#define USB_ST_INTERNALERROR (-EPROTO) /* unknown error */
-#define USB_ST_SHORT_PACKET (-EREMOTEIO)
-#define USB_ST_PARTIAL_ERROR (-EXDEV) /* ISO transfer only partially completed */
-#define USB_ST_URB_KILLED (-ENOENT) /* URB canceled by user */
-#define USB_ST_URB_PENDING (-EINPROGRESS)
+#define USB_ST_SHORT_PACKET (-EREMOTEIO)
+#define USB_ST_PARTIAL_ERROR (-EXDEV) /* ISO transfer only partially completed */
+#define USB_ST_URB_KILLED (-ENOENT) /* URB canceled by user */
+#define USB_ST_URB_PENDING (-EINPROGRESS)
#define USB_ST_REMOVED (-ENODEV) /* device not existing or removed */
#define USB_ST_TIMEOUT (-ETIMEDOUT) /* communication timed out, also in urb->status**/
#define USB_ST_NOTSUPPORTED (-ENOSYS)
@@ -423,23 +423,23 @@
/*
* urb->transfer_flags:
*/
-#define USB_DISABLE_SPD 0x0001
-#define USB_ISO_ASAP 0x0002
-#define USB_ASYNC_UNLINK 0x0008
-#define USB_QUEUE_BULK 0x0010
+#define USB_DISABLE_SPD 0x0001
+#define USB_ISO_ASAP 0x0002
+#define USB_ASYNC_UNLINK 0x0008
+#define USB_QUEUE_BULK 0x0010
#define USB_NO_FSBR 0x0020
-#define USB_ZERO_PACKET 0x0040 // Finish bulk OUTs always with zero length packet
+#define USB_ZERO_PACKET 0x0040 // Finish bulk OUTs always with zero length packet
#define URB_NO_INTERRUPT 0x0080 /* HINT: no non-error interrupt needed */
/* ... less overhead for QUEUE_BULK */
#define USB_TIMEOUT_KILLED 0x1000 // only set by HCD!
-typedef struct
+struct iso_packet_descriptor
{
unsigned int offset;
unsigned int length; // expected length
unsigned int actual_length;
unsigned int status;
-} iso_packet_descriptor_t, *piso_packet_descriptor_t;
+};
struct urb;
typedef void (*usb_complete_t)(struct urb *);
@@ -469,7 +469,7 @@
void *context; // context for completion routine
usb_complete_t complete; // pointer to completion routine
//
- iso_packet_descriptor_t iso_frame_desc[0];
+ struct iso_packet_descriptor iso_frame_desc[0];
} urb_t, *purb_t;
/**