Modules/ATA - (minor) Updated commenting
[tpg/acess2.git] / KernelLand / Modules / Storage / ATA / io.c
index b15918e..8b2d1b7 100644 (file)
@@ -153,8 +153,8 @@ int ATA_SetupIO(void)
                outb(base+0x03, 0xFF);
                if(inb(base+0x02) != 0x66 || inb(base+0x03) != 0xFF) {
                        Log_Error("ATA", "Unable to write to 0x%x/0x%x", base+2, base+3);
-                       LEAVE('i', 0);
-                       return 0;
+                       LEAVE('i', MODULE_ERR_MISC);
+                       return MODULE_ERR_MISC;
                }
        }
        
@@ -183,11 +183,11 @@ int ATA_SetupIO(void)
 
        LOG("gATA_PRDTs = {PBufAddr: 0x%x, PBufAddr: 0x%x}", gATA_PRDTs[0].PBufAddr, gATA_PRDTs[1].PBufAddr);
 
-       // TODO: Ensure that this is within 32-bits
        gaATA_PRDT_PAddrs[0] = MM_GetPhysAddr( &gATA_PRDTs[0] );
        gaATA_PRDT_PAddrs[1] = MM_GetPhysAddr( &gATA_PRDTs[1] );
        LOG("gaATA_PRDT_PAddrs = {0x%P, 0x%P}", gaATA_PRDT_PAddrs[0], gaATA_PRDT_PAddrs[1]);
        #if PHYS_BITS > 32
+       // Ensure that this is within 32-bits
        if( gaATA_PRDT_PAddrs[0] >> 32 || gaATA_PRDT_PAddrs[1] >> 32 ) {
                Log_Error("ATA", "Physical addresses of PRDTs are not in 32-bits (%P and %P)",
                        gaATA_PRDT_PAddrs[0], gaATA_PRDT_PAddrs[1]);
@@ -305,7 +305,7 @@ int ATA_DoDMA(Uint8 Disk, Uint64 Address, Uint Count, int bWrite, void *Buffer)
         int    cont = (Disk>>1)&1;     // Controller ID
         int    disk = Disk & 1;
        Uint16  base;
-        int    bUseBounceBuffer;
+        int    bUseBounceBuffer = 0;
 
        ENTER("iDisk XAddress iCount bbWrite pBuffer", Disk, Address, Count, bWrite, Buffer);
 

UCC git Repository :: git.ucc.asn.au