Changeset 1126 for Whitix

Timestamp:

10/14/08 19:32:34 (1 month ago)

Author:

mwhitworth

Message:

Delete commented code, misc fixes, add more detailed printfs.

Location:

Whitix/branches/keobject/devices/storage/ata

Files:

• ata-cd.c (modified) (1 diff)
• ata.c (modified) (5 diffs)

Whitix/branches/keobject/devices/storage/ata/ata-cd.c

@@ -212 +212 @@
 
 finishedRead:
+        StorageEndRequest(drive->sDev,0);
         drive->interrupt=NULL;
         drive->busy=0;
-        StorageEndRequest(drive->sDev,0);
         AtaRequest(drive);
 }

Whitix/branches/keobject/devices/storage/ata/ata.c

@@ -316 +316 @@
         if (request->sector > part->secLen)
                 return -EIO;
-
-        request->sector+=part->startSector;
-//      memcpy(&head,&request->list, sizeof(struct ListHead));
         
         memcpy(&newRequest, request, sizeof(struct Request));
@@ -325 +322 @@
         
         err=BlockSendRequestRaw(part->sDev, &newRequest);
-//      memcpy(&request->list,&head, sizeof(struct ListHead));
-
-//      request->sector-=part->startSector;
 
         StorageEndRequest(partDev,-err);
@@ -370 +364 @@
 
         StorageDeviceInit(sDevice, DEV_ID_MAKE(4, ((base*64)+i+1)));    
-        StorageDeviceAdd(sDevice, "AtaDisk%c%d", 'A'+base, i);
-        
-        KePrint("Partition found: %#X, %u, %u\n",(DWORD)part[i].system,part[i].startSectorAbs,part[i].sectorCount);
+        StorageDeviceAdd(sDevice, "AtaDisk%d%c", base, 'a'+i);
+        
+        KePrint("%s: %#X, %u, %u\n", KeDeviceGetName(&sDevice->device),
+                (DWORD)part[i].system,part[i].startSectorAbs,part[i].sectorCount);
 
         return 0;
@@ -424 +419 @@
                 
                 format = "AtaDisk%u";
-                index = hdIndex++;
+                index = hdIndex;
         }else{
                 sDevice->cylinders=sDevice->heads=sDevice->sectors=0;
@@ -439 +434 @@
 
         if (drive->type & ATA_DISK)
-                AtaPartitionDevice(drive,(controlIndex*2)+driveIndex);
+        {
+                AtaPartitionDevice(drive, hdIndex);
+                hdIndex++;
+        }
 }