Changeset 1916

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.

Location:

Whitix/trunk/devices/storage/ata

Files:

• ata-cd.c (modified) (2 diffs)
• ata-disk.c (modified) (4 diffs)
• ata-identify.c (modified) (1 diff)
• ata.c (modified) (1 diff)
• ata.h (modified) (1 diff)

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

@@ -101 +101 @@
 /***********************************************************************
  *
- * FUNCTION:    AtapiRead
- *
- * DESCRIPTION: Read data from the drive controller.
- *
- * PARAMETERS:  controller - controller of the drive.
- *                              buffer - buffer to transfer data into.
- *                              count - number of bytes available.
- *
- * RETURNS:             Nothing.
- *
- ***********************************************************************/
-
-static void AtapiRead(struct AtaDrive* drive, BYTE* buffer, int count)
-{
-        if (!count)
-        {
-                KePrint("AtapiRead: no bytes to read.\n");
-                return;
-        }
-        
-        if (drive->ioFlags & ATA_IO_DWORD)
-                insd(CTRL_REG(drive->parent, REG_DATA), buffer, count >> 2);
-        else
-                insw(CTRL_REG(drive->parent,REG_DATA), buffer, count >> 1);
-}
-
-/***********************************************************************
- *
  * FUNCTION:    AtapiError
  *
@@ -205 +177 @@
                 count=AtapiTransferCount(drive->parent);
                 
-                AtapiRead(drive, (BYTE*)request->data, count);
+                AtaDataRead(drive, (BYTE*)request->data, count);
                 
                 request->data+=ATAPI_SECTOR_SIZE;

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);
 

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

@@ -83 +83 @@
         }else{
                 KePrint("CHS: TODO\n");
-        }
+        }       
 }
 

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

@@ -53 +53 @@
 
 KE_OBJECT_TYPE_SIMPLE(ataType, NULL);
+
+/***********************************************************************
+ *
+ * FUNCTION:    AtaDataRead
+ *
+ * DESCRIPTION: Read data from the drive controller.
+ *
+ * PARAMETERS:  controller - controller of the drive.
+ *                              buffer - buffer to transfer data into.
+ *                              count - number of bytes available.
+ *
+ * RETURNS:             Nothing.
+ *
+ ***********************************************************************/
+
+void AtaDataRead(struct AtaDrive* drive, BYTE* buffer, int count)
+{
+        if (!count)
+        {
+                KePrint(KERN_ERROR "AtaDataRead: no bytes to read.\n");
+                return;
+        }
+        
+        if (drive->ioFlags & ATA_IO_DWORD)
+                insd(CTRL_REG(drive->parent, REG_DATA), buffer, count >> 2);
+        else
+                insw(CTRL_REG(drive->parent,REG_DATA), buffer, count >> 1);
+}
 
 /***********************************************************************

Whitix/trunk/devices/storage/ata/ata.h

@@ -199 +199 @@
 int AtaFinishRequest(struct AtaDrive* drive, int status);
 
+void AtaDataRead(struct AtaDrive* drive, BYTE* buffer, int count);
+
 /* Drive-specific functions */
 int AtaReadWrite(struct Request* request, struct AtaDrive* drive);