Changeset 1916 for Whitix/trunk/devices/storage/ata/ata-cd.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-cd.c (modified) (2 diffs)

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;