Changeset 1916 for Whitix/trunk/devices/storage/ata/ata-disk.c

Timestamp:

02/25/09 01:21:12 (3 years ago)

Author:

mwhitworth

Message:

Move ind/inw reading code to AtaDataRead function, let ATA disk code use it, check against drive->totalSectors for out of bound I/O, and misc formatting.

Files:

• Whitix/trunk/devices/storage/ata/ata-disk.c (modified) (4 diffs)

Whitix/trunk/devices/storage/ata/ata-disk.c

@@ -28 +28 @@
 {
         struct Request* request=StorageGetCurrRequest(drive->sDev);
-        WORD* p=(WORD*)request->data;
+        BYTE* p=(WORD*)request->data;
         int i;
 
         if (!request)
-        {
-                KePrint("AtaRwInterrupt: request is null?\n");
                 return;
-        }
 
-        if (status & STATE_ERR || status & STATE_DF)
+        if ( (status & STATE_ERR) || (status & STATE_DF))
         {
                 KePrint("AtaRwInterrupt: failure reading sector %u\n",request->sector);
@@ -53 +50 @@
                         return;
                 }
-
-                for (i=0; i<256; i++)
-                        p[i]=inw(CTRL_REG(drive->parent,REG_DATA));
+                
+                AtaDataRead(drive, p, 512);
         }
 
@@ -77 +73 @@
         /* If the request is out of bounds, notify the request code and process
          * another request. */
-        if (request->sector > (drive->cyls*drive->heads*drive->sectors))
+        if (request->sector > drive->totalSectors)
                 return AtaFinishRequest(drive, -EIO);
         
@@ -86 +82 @@
         command.count=1; /* For now */
 
-        drive->interrupt=AtaRwInterrupt;
+        drive->interrupt = AtaRwInterrupt;
         err=AtaSendCommand(drive,&command);