mirror of https://github.com/PCSX2/pcsx2.git
DEV9: Implement ATA pending interrupts
This commit is contained in:
parent
a8a0c5c0bf
commit
078a10dcdb
|
@ -96,6 +96,8 @@ private:
|
||||||
|
|
||||||
u8 regStatus; //ReadOnly. When read via AlternateStatus pending interrupts are not cleared
|
u8 regStatus; //ReadOnly. When read via AlternateStatus pending interrupts are not cleared
|
||||||
|
|
||||||
|
bool pendingInterrupt = false;
|
||||||
|
|
||||||
//Transfer
|
//Transfer
|
||||||
//Write Buffer(s)
|
//Write Buffer(s)
|
||||||
bool awaitFlush = false;
|
bool awaitFlush = false;
|
||||||
|
|
|
@ -380,6 +380,7 @@ u16 ATA::Read(u32 addr, int width)
|
||||||
return regSelect;
|
return regSelect;
|
||||||
case ATA_R_STATUS:
|
case ATA_R_STATUS:
|
||||||
// Clear irqcause
|
// Clear irqcause
|
||||||
|
pendingInterrupt = false;
|
||||||
dev9.irqcause &= ~ATA_INTR_INTRQ;
|
dev9.irqcause &= ~ATA_INTR_INTRQ;
|
||||||
[[fallthrough]];
|
[[fallthrough]];
|
||||||
case ATA_R_ALT_STATUS:
|
case ATA_R_ALT_STATUS:
|
||||||
|
@ -437,21 +438,38 @@ void ATA::Write(u32 addr, u16 value, int width)
|
||||||
regHcyl = static_cast<u8>(value);
|
regHcyl = static_cast<u8>(value);
|
||||||
break;
|
break;
|
||||||
case ATA_R_SELECT:
|
case ATA_R_SELECT:
|
||||||
|
{
|
||||||
//DevCon.WriteLn("DEV9: ATA: ATA_R_SELECT %dbit write %x", width, value);
|
//DevCon.WriteLn("DEV9: ATA: ATA_R_SELECT %dbit write %x", width, value);
|
||||||
|
const int oldDev = GetSelectedDevice();
|
||||||
|
const int newDev = (value >> 4) & 1;
|
||||||
|
// Suppress INTRQ when not selected device
|
||||||
|
if (oldDev == 0 && newDev == 1)
|
||||||
|
{
|
||||||
|
dev9.irqcause &= ~ATA_INTR_INTRQ;
|
||||||
|
}
|
||||||
|
else if (oldDev == 1 && newDev == 0)
|
||||||
|
{
|
||||||
|
if (regControlEnableIRQ && pendingInterrupt)
|
||||||
|
_DEV9irq(ATA_INTR_INTRQ, 1);
|
||||||
|
}
|
||||||
|
|
||||||
regSelect = static_cast<u8>(value);
|
regSelect = static_cast<u8>(value);
|
||||||
//bus->ifs[0].select = (val & ~0x10) | 0xa0;
|
|
||||||
//bus->ifs[1].select = (val | 0x10) | 0xa0;
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
case ATA_R_CONTROL:
|
case ATA_R_CONTROL:
|
||||||
//DevCon.WriteLn("DEV9: ATA: ATA_R_CONTROL %dbit write %x", width, value);
|
//DevCon.WriteLn("DEV9: ATA: ATA_R_CONTROL %dbit write %x", width, value);
|
||||||
if ((value & 0x2) != 0)
|
if ((value & 0x2) != 0)
|
||||||
{
|
{
|
||||||
// Suppress all IRQ
|
// Suppress INTRQ
|
||||||
dev9.irqcause &= ~ATA_INTR_INTRQ;
|
dev9.irqcause &= ~ATA_INTR_INTRQ;
|
||||||
regControlEnableIRQ = false;
|
regControlEnableIRQ = false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
if (GetSelectedDevice() == 0 && regControlEnableIRQ == false && pendingInterrupt)
|
||||||
|
_DEV9irq(ATA_INTR_INTRQ, 1);
|
||||||
regControlEnableIRQ = true;
|
regControlEnableIRQ = true;
|
||||||
|
}
|
||||||
|
|
||||||
if ((value & 0x4) != 0)
|
if ((value & 0x4) != 0)
|
||||||
{
|
{
|
||||||
|
@ -467,6 +485,7 @@ void ATA::Write(u32 addr, u16 value, int width)
|
||||||
//DevCon.WriteLn("DEV9: ATA: ATA_R_CMD %dbit write %x", width, value);
|
//DevCon.WriteLn("DEV9: ATA: ATA_R_CMD %dbit write %x", width, value);
|
||||||
regCommand = value;
|
regCommand = value;
|
||||||
regControlHOBRead = false;
|
regControlHOBRead = false;
|
||||||
|
pendingInterrupt = false;
|
||||||
dev9.irqcause &= ~ATA_INTR_INTRQ;
|
dev9.irqcause &= ~ATA_INTR_INTRQ;
|
||||||
IDE_ExecCmd(value);
|
IDE_ExecCmd(value);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -23,6 +23,7 @@ void ATA::PostCmdDMADataToHost()
|
||||||
dmaReady = false;
|
dmaReady = false;
|
||||||
|
|
||||||
dev9.irqcause &= ~SPD_INTR_ATA_FIFO_DATA;
|
dev9.irqcause &= ~SPD_INTR_ATA_FIFO_DATA;
|
||||||
|
pendingInterrupt = true;
|
||||||
if (regControlEnableIRQ)
|
if (regControlEnableIRQ)
|
||||||
_DEV9irq(ATA_INTR_INTRQ, 1);
|
_DEV9irq(ATA_INTR_INTRQ, 1);
|
||||||
//PCSX2 Will Start DMA
|
//PCSX2 Will Start DMA
|
||||||
|
@ -66,8 +67,9 @@ void ATA::PostCmdDMADataFromHost()
|
||||||
if (fetWriteCacheEnabled)
|
if (fetWriteCacheEnabled)
|
||||||
{
|
{
|
||||||
regStatus &= ~ATA_STAT_BUSY;
|
regStatus &= ~ATA_STAT_BUSY;
|
||||||
|
pendingInterrupt = true;
|
||||||
if (regControlEnableIRQ)
|
if (regControlEnableIRQ)
|
||||||
_DEV9irq(ATA_INTR_INTRQ, 1); //0x6C
|
_DEV9irq(ATA_INTR_INTRQ, 1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
awaitFlush = true;
|
awaitFlush = true;
|
||||||
|
|
|
@ -8,6 +8,7 @@ void ATA::PreCmdExecuteDeviceDiag()
|
||||||
{
|
{
|
||||||
regStatus |= ATA_STAT_BUSY;
|
regStatus |= ATA_STAT_BUSY;
|
||||||
regStatus &= ~ATA_STAT_READY;
|
regStatus &= ~ATA_STAT_READY;
|
||||||
|
pendingInterrupt = false;
|
||||||
dev9.irqcause &= ~ATA_INTR_INTRQ;
|
dev9.irqcause &= ~ATA_INTR_INTRQ;
|
||||||
//dev9.spd.regIntStat &= unchecked((UInt16)~DEV9Header.ATA_INTR_DMA_RDY); //Is this correct?
|
//dev9.spd.regIntStat &= unchecked((UInt16)~DEV9Header.ATA_INTR_DMA_RDY); //Is this correct?
|
||||||
}
|
}
|
||||||
|
@ -21,8 +22,12 @@ void ATA::PostCmdExecuteDeviceDiag(bool sendIRQ)
|
||||||
|
|
||||||
// If Device Diagnostics is performed as part of a reset
|
// If Device Diagnostics is performed as part of a reset
|
||||||
// then we don't raise an IRQ or set pending interrupt
|
// then we don't raise an IRQ or set pending interrupt
|
||||||
if (regControlEnableIRQ && sendIRQ)
|
if (sendIRQ)
|
||||||
_DEV9irq(ATA_INTR_INTRQ, 1);
|
{
|
||||||
|
pendingInterrupt = true;
|
||||||
|
if (regControlEnableIRQ)
|
||||||
|
_DEV9irq(ATA_INTR_INTRQ, 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//GENRAL FEATURE SET
|
//GENRAL FEATURE SET
|
||||||
|
|
|
@ -8,6 +8,7 @@ void ATA::PostCmdNoData()
|
||||||
{
|
{
|
||||||
regStatus &= ~ATA_STAT_BUSY;
|
regStatus &= ~ATA_STAT_BUSY;
|
||||||
|
|
||||||
|
pendingInterrupt = true;
|
||||||
if (regControlEnableIRQ)
|
if (regControlEnableIRQ)
|
||||||
_DEV9irq(ATA_INTR_INTRQ, 1);
|
_DEV9irq(ATA_INTR_INTRQ, 1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,8 +15,12 @@ void ATA::DRQCmdPIODataToHost(u8* buff, int buffLen, int buffIndex, int size, bo
|
||||||
regStatus &= ~ATA_STAT_BUSY;
|
regStatus &= ~ATA_STAT_BUSY;
|
||||||
regStatus |= ATA_STAT_DRQ;
|
regStatus |= ATA_STAT_DRQ;
|
||||||
|
|
||||||
|
// Only set pendingInterrupt if nIEN is cleared
|
||||||
if (regControlEnableIRQ && sendIRQ)
|
if (regControlEnableIRQ && sendIRQ)
|
||||||
_DEV9irq(ATA_INTR_INTRQ, 1); //0x6c cycles before
|
{
|
||||||
|
pendingInterrupt = true;
|
||||||
|
_DEV9irq(ATA_INTR_INTRQ, 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
void ATA::PostCmdPIODataToHost()
|
void ATA::PostCmdPIODataToHost()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue