// 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
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) )
// 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)
while( gaATA_IRQs[cont] == 0 && now() < timeoutTime)
{
HALT();
-// Threads_Yield();
}
// Complete Transfer
LOG("Status byte = 0x%02x, Controller Status = 0x%02x",
val, ATA_int_BusMasterReadByte(cont * 8 + 2));
- if( gaATA_IRQs[cont] == 0 ) {
-
+ if( gaATA_IRQs[cont] == 0 )
+ {
+ if( ATA_int_BusMasterReadByte(cont * 8 + 2) & 0x4 ) {
+ Log_Error("ATA", "BM Status reports an interrupt, but none recieved");
+ ATA_int_BusMasterWriteByte(cont*8 + 2, 4); // Clear interrupt
+ memcpy( Buffer, gATA_Buffers[cont], Count*SECTOR_SIZE );
+ Mutex_Release( &glaATA_ControllerLock[ cont ] );
+ LEAVE_RET('i', 0);
+ }
+
#if 1
Debug_HexDump("ATA", Buffer, 512);
#endif
timeoutTime = now() + ATA_TIMEOUT;
while( gaATA_IRQs[cont] == 0 && now() < timeoutTime)
{
-// Threads_Yield();
HALT();
}