Modules/RAMDisk - a bit more work

[tpg/acess2.git] / KernelLand / Modules / USB / UHCI / uhci.c

diff --git a/KernelLand/Modules/USB/UHCI/uhci.c b/KernelLand/Modules/USB/UHCI/uhci.c
index dd07210..be27c39 100644 (file)
--- a/KernelLand/Modules/USB/UHCI/uhci.c
+++ b/KernelLand/Modules/USB/UHCI/uhci.c
@@ -578,19 +578,12 @@ void *UHCI_BulkOUT(void *Ptr, int Dest, int bToggle, tUSBHostCb Cb, void *CbData
 
        ENTER("pPtr xDest ibToggle pCb pCbData pData iLength", Ptr, Dest, bToggle, Cb, CbData, Buf, Length);
 
-       while( Length > MAX_PACKET_SIZE )
-       {
-               LOG("MaxPacket (rem = %i)", Length);
-               td = UHCI_int_CreateTD(Cont, Dest, PID_OUT, bToggle, NULL, NULL, src, MAX_PACKET_SIZE);
-               UHCI_int_AppendTD(Cont, qh, td);
-               
-               bToggle = !bToggle;
-               Length -= MAX_PACKET_SIZE;
-               src += MAX_PACKET_SIZE;
+       if( Length > MAX_PACKET_SIZE ) {
+               Log_Error("UHCI", "Passed an oversized packet by the USB code (%i > %i)", Length, MAX_PACKET_SIZE);
+               LEAVE('n');
        }
-
-       LOG("Final");
-       td = UHCI_int_CreateTD(Cont, Dest, PID_OUT, bToggle, NULL, NULL, src, Length);
+       
+       td = UHCI_int_CreateTD(Cont, Dest, PID_OUT, bToggle, Cb, CbData, src, Length);
        UHCI_int_AppendTD(Cont, qh, td);
 
        LEAVE('p', td);
@@ -604,19 +597,12 @@ void *UHCI_BulkIN(void *Ptr, int Dest, int bToggle, tUSBHostCb Cb, void *CbData,
        char    *dst = Buf;
 
        ENTER("pPtr xDest ibToggle pCb pCbData pData iLength", Ptr, Dest, bToggle, Cb, CbData, Buf, Length);
-       while( Length > MAX_PACKET_SIZE )
-       {
-               LOG("MaxPacket (rem = %i)", Length);
-               td = UHCI_int_CreateTD(Cont, Dest, PID_IN, bToggle, NULL, NULL, dst, MAX_PACKET_SIZE);
-               UHCI_int_AppendTD(Cont, qh, td);
-               
-               bToggle = !bToggle;
-               Length -= MAX_PACKET_SIZE;
-               dst += MAX_PACKET_SIZE;
+       if( Length > MAX_PACKET_SIZE ) {
+               Log_Error("UHCI", "Passed an oversized packet by the USB code (%i > %i)", Length, MAX_PACKET_SIZE);
+               LEAVE('n');
        }
 
-       LOG("Final");
-       td = UHCI_int_CreateTD(Cont, Dest, PID_IN, bToggle, NULL, NULL, dst, Length);
+       td = UHCI_int_CreateTD(Cont, Dest, PID_IN, bToggle, Cb, CbData, dst, Length);
        UHCI_int_AppendTD(Cont, qh, td);
 
        LEAVE('p', td);