X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FStorage%2FATA%2Fio.c;h=de6bf96b48dee67a1600b9528e46310526f3fb4f;hb=98d45a155c3ce437d0eddb67b9eb2b203f87ec3b;hp=6ed040969ac538ab96886ce72e6a4a1a39d80de7;hpb=adbdc45e64c40f7d3a022caedeb22f5e95dcd12a;p=tpg%2Facess2.git

diff --git a/Modules/Storage/ATA/io.c b/Modules/Storage/ATA/io.c
index 6ed04096..de6bf96b 100644
--- a/Modules/Storage/ATA/io.c
+++ b/Modules/Storage/ATA/io.c
@@ -119,7 +119,7 @@ int ATA_SetupIO(void)
 	// Get IDE Controller's PCI Entry
 	ent = PCI_GetDeviceByClass(0x0101, 0xFFFF, -1);
 	LOG("ent = %i", ent);
-	gATA_BusMasterBase = PCI_GetBAR4( ent );
+	gATA_BusMasterBase = PCI_GetBAR(ent, 4);
 	if( gATA_BusMasterBase == 0 ) {
 		Log_Warning("ATA", "It seems that there is no Bus Master Controller on this machine. Get one");
 		// TODO: Use PIO mode instead
@@ -127,8 +127,8 @@ int ATA_SetupIO(void)
 		return MODULE_ERR_NOTNEEDED;
 	}
 	
-	LOG("BAR5 = 0x%x", PCI_GetBAR5( ent ));
-	LOG("IRQ = %i", PCI_GetIRQ( ent ));
+	LOG("BAR5 = 0x%x", PCI_GetBAR(ent, 5));
+	LOG("IRQ = %i", PCI_GetIRQ(ent));
 	
 	// Map memory
 	if( !(gATA_BusMasterBase & 1) )
@@ -353,7 +353,8 @@ int ATA_ReadDMA(Uint8 Disk, Uint64 Address, Uint Count, void *Buffer)
 	
 	// HACK: Ensure the PRDT is reset
 	ATA_int_BusMasterWriteDWord(cont*8+4, gaATA_PRDT_PAddrs[cont]);
-		
+	ATA_int_BusMasterWriteByte(cont*8, 4);	// Reset IRQ
+	
 	LOG("gATA_PRDTs[%i].Bytes = %i", cont, gATA_PRDTs[cont].Bytes);
 	if( Address > 0x0FFFFFFF )
 		outb(base+0x07, HDD_DMA_R48);	// Read Command (LBA48)
@@ -368,7 +369,6 @@ int ATA_ReadDMA(Uint8 Disk, Uint64 Address, Uint Count, void *Buffer)
 	while( gaATA_IRQs[cont] == 0 && now() < timeoutTime)
 	{
 		HALT();
-//		Threads_Yield();
 	}
 
 	// Complete Transfer
@@ -471,7 +471,6 @@ int ATA_WriteDMA(Uint8 Disk, Uint64 Address, Uint Count, const void *Buffer)
 	timeoutTime = now() + ATA_TIMEOUT;
 	while( gaATA_IRQs[cont] == 0 && now() < timeoutTime)
 	{
-//		Threads_Yield();
 		HALT();
 	}