I am sorry forget to send to the list.

Here is the patch version 3.
I try to fix the setup buffer size for ohci according the ohci spec.
I might be wrong about it, I don't know much about ohci and I am yet
to find an ohci box to test it.

Any comment?

thanks

Chris

===== devio.c 1.9 vs edited =====
--- 1.9/drivers/usb/devio.c     Thu Apr 18 05:34:31 2002
+++ edited/devio.c      Wed Feb  5 07:15:23 2003
@@ -800,7 +800,7 @@
                                return -EINVAL;
                }
                /* min 8 byte setup packet, max arbitrary */
-               if (uurb.buffer_length < 8 || uurb.buffer_length > PAGE_SIZE)
+               if (uurb.buffer_length < 8 || (uurb.buffer_length >> 16))
                        return -EINVAL;
                if (!(dr = kmalloc(sizeof(devrequest), GFP_KERNEL)))
                        return -ENOMEM;
===== usb-ohci.c 1.23 vs edited =====
--- 1.23/drivers/usb/usb-ohci.c Tue Apr 30 22:58:55 2002
+++ edited/usb-ohci.c   Wed Feb  5 06:38:26 2003
@@ -1419,14 +1419,15 @@
                                        urb->setup_packet, 8,
                                        PCI_DMA_TODEVICE),
                                8, urb, cnt++); 
-                       if (data_len > 0) {  
-                               info = usb_pipeout (urb->pipe)? 
-                                       TD_CC | TD_R | TD_DP_OUT | TD_T_DATA1 : TD_CC 
| TD_R | TD_DP_IN | TD_T_DATA1;
-                               /* NOTE:  mishandles transfers >8K, some >4K */
-                               td_fill (ohci, info, data, data_len, urb, cnt++);  
-                       } 
+                       info = usb_pipeout (urb->pipe)? (TD_CC | TD_R | TD_DP_OUT | 
+TD_T_TOGGLE)
+                                                     : (TD_CC | TD_R | TD_DP_IN | 
+TD_T_TOGGLE);
+                       while(data_len > 0) {
+                               int td_size = min(4096, data_len);              
+                               td_fill (ohci, info, data, td_size, urb, cnt);
+                               data += td_size; data_len -= td_size; cnt++;
+                       }
                        info = usb_pipeout (urb->pipe)? 
-                               TD_CC | TD_DP_IN | TD_T_DATA1: TD_CC | TD_DP_OUT | 
TD_T_DATA1;
+                               TD_CC | TD_DP_IN | TD_T_TOGGLE: TD_CC | TD_DP_OUT | 
+TD_T_TOGGLE;
                        td_fill (ohci, info, data, 0, urb, cnt++);
                        if (!ohci->sleeping) {
                                wmb();

On Wed, Feb 05, 2003 at 10:29:05PM +0100, Oliver Neukum wrote:
> 
> >             /* min 8 byte setup packet, max arbitrary */
> > -           if (uurb.buffer_length < 8 || uurb.buffer_length > PAGE_SIZE)
> > +           if (uurb.buffer_length < 8 || uurb.buffer_length > 64*1024)
> 
> Still one byte off. It must fit into 16 bits.
> 
>       Regards
>               Oliver
> 




-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to