Changeset 1951 for Whitix/tags

Timestamp:

02/28/09 15:53:25 (3 years ago)

Author:

mwhitworth

Message:

Rework AtaPartitionRequest function, add shadow buffer.

Files:

• Whitix/tags/0.2b/devices/storage/ata/ata.c (modified) (1 diff)

Whitix/tags/0.2b/devices/storage/ata/ata.c

@@ -446 +446 @@
         struct Request* request=StorageGetCurrRequest(partDev);
         struct Request newRequest;
+        struct Buffer newBuffer;
         int err;
 
         if (!request)
                 return 0;
-
-again:
-        if (request->sector > part->secLen)
-                return -EIO;
-        
-        memcpy(&newRequest, request, sizeof(struct Request));
-
-        newRequest.sector += part->startSector;
-        
-        err=BlockSendRequestRaw(part->sDev, &newRequest);
-
-        StorageEndRequest(partDev,-err);
-        
-        request = StorageGetCurrRequest(partDev);
-        
-        if (request)
-                goto again;
-        
-        return err;
+        
+        do
+        {
+                if (request->sector > part->secLen)
+                        break;
+        
+                memcpy(&newRequest, request, sizeof(struct Request));
+
+                newRequest.sector += part->startSector;
+        
+                memcpy(&newBuffer, newRequest.buffer, sizeof(struct Buffer));
+                INIT_WAITQUEUE_HEAD(&newBuffer.waitQueue);
+                newRequest.buffer = &newBuffer;
+                newRequest.buffer->flags = (1 << BUFFER_LOCKED);
+        
+                err = BlockSendRequestRaw(part->sDev, &newRequest);
+
+                StorageEndRequest(partDev, -err);
+        
+        } while (( request = StorageGetCurrRequest(partDev) ));
+        
+        return 0;
 }