Changeset 1885

Timestamp:

02/01/09 18:44:33 (3 years ago)

Author:

mwhitworth

Message:

Fix function parameters to address #64.

Location:

Whitix/trunk/devices/storage/ata

Files:

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

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

@@ -225 +225 @@
 }
 
-int AtapiReadWrite(struct Request* request,struct AtaDrive* drive,int type)
+int AtapiReadWrite(struct Request* request, struct AtaDrive* drive)
 {
         struct AtaController* control=drive->parent;

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

@@ -64 +64 @@
 
         if (request->numSectors > 0)
-                AtaReadWrite(request, drive, request->type);
+                AtaReadWrite(request, drive);
         else
                 AtaFinishRequest(drive, 0);
 }
 
-int AtaReadWrite(struct Request* request, struct AtaDrive* drive, int type)
+int AtaReadWrite(struct Request* request, struct AtaDrive* drive)
 {
         struct AtaCommand command;
@@ -82 +82 @@
         command.driveNum=drive->drive;
         command.ldh=(command.driveNum << 4) | LDH_DEFAULT;
-        command.command=(type == REQUEST_WRITE ? CMD_ATA_WRITE : CMD_ATA_READ);
+        command.command=(request->type == REQUEST_WRITE ? CMD_ATA_WRITE : CMD_ATA_READ);
         command.block=request->sector;
         command.count=1; /* For now */

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

@@ -205 +205 @@
 
         if (drive->type & ATA_DISK)
-                err = AtaReadWrite(request, drive, request->type);
+                err = AtaReadWrite(request, drive);
         else
-                err = AtapiReadWrite(request, drive, request->type);
+                err = AtapiReadWrite(request, drive);
                 
         /* Set up the timer, which will expire if we happen to miss an interrupt

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

@@ -16 +16 @@
  *
  */
-
-/* TODO: ReadWrite function doesn't need type parameter. Remove. */
 
 #ifndef ATA_H
@@ -202 +200 @@
 
 /* Drive-specific functions */
-int AtaReadWrite(struct Request* request,struct AtaDrive* drive,int type);
-int AtapiReadWrite(struct Request* request,struct AtaDrive* drive,int type);
+int AtaReadWrite(struct Request* request, struct AtaDrive* drive);
+int AtapiReadWrite(struct Request* request, struct AtaDrive* drive);
 
 #endif