Import 2.3.18pre1

[davej-history.git] / drivers / usb / usb.h

diff --git a/drivers/usb/usb.hb/drivers/usb/usb.h
index 469aa35..7044bcf 100644 (file)
--- a/drivers/usb/usb.h
+++ b/drivers/usb/usb.h
@@ -372,7+372,8 @@ enum {
                                   current callback function ret. values */        CB_REUSE,               /* leave descriptors as NULL, not active */        CB_RESTART,             /* leave descriptors as they are, alive */                                   current callback function ret. values */        CB_REUSE,               /* leave descriptors as NULL, not active */        CB_RESTART,             /* leave descriptors as they are, alive */
-       CB_ABORT                /* kill this USB transfer request */+       CB_ABORT,                /* kill this USB transfer request */+       CB_CONT_RUN             /* append the isoc_desc at the end of all active isoc_desc */
 };  struct isoc_frame_desc { };  struct isoc_frame_desc {

@@ -406,6+407,7 @@ struct usb_isoc_desc {
        usb_device_irq  callback_fn;        void            *data;        int             buf_size;        usb_device_irq  callback_fn;        void            *data;        int             buf_size;
+       struct usb_isoc_desc *prev_isocdesc; /* previous isoc_desc, for CB_CONT_RUN */
        /*         * The following fields are set by the usb_run_isoc() call.         */        /*         * The following fields are set by the usb_run_isoc() call.         */