ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV9: Reduce the amount of log spam from HDD access

This commit is contained in:
TheLastRar 2021-08-25 22:55:26 +01:00 committed by refractionpcsx2
parent f7838750c9
commit feaf5ba5f2
3 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pcsx2/DEV9/ATA/ATA_State.cpp
View File

@ -131,7 +131,7 @@ void ATA::ResetEnd(bool hard)
void ATA::ATA_HardReset()
{
DevCon.WriteLn("DEV9: *ATA_HARD RESET");
//DevCon.WriteLn("DEV9: *ATA_HARD RESET");
ResetBegin();
ResetEnd(true);
}
@ -143,12 +143,12 @@ u16 ATA::Read16(u32 addr)
case ATA_R_DATA:
return ATAreadPIO();
case ATA_R_ERROR:
DevCon.WriteLn("DEV9: *ATA_R_ERROR 16bit read at address %x, value %x, Active %s", addr, regError, (GetSelectedDevice() == 0) ? "True" : "False");
//DevCon.WriteLn("DEV9: *ATA_R_ERROR 16bit read at address %x, value %x, Active %s", addr, regError, (GetSelectedDevice() == 0) ? "True" : "False");
if (GetSelectedDevice() != 0)
return 0;
return regError;
case ATA_R_NSECTOR:
DevCon.WriteLn("DEV9: *ATA_R_NSECTOR 16bit read at address %x, value %x, Active %s", addr, nsector, (GetSelectedDevice() == 0) ? "True" : "False");
//DevCon.WriteLn("DEV9: *ATA_R_NSECTOR 16bit read at address %x, value %x, Active %s", addr, nsector, (GetSelectedDevice() == 0) ? "True" : "False");
if (GetSelectedDevice() != 0)
return 0;
if (!regControlHOBRead)
@ -156,7 +156,7 @@ u16 ATA::Read16(u32 addr)
else
return regNsectorHOB;
case ATA_R_SECTOR:
DevCon.WriteLn("DEV9: *ATA_R_NSECTOR 16bit read at address %x, value %x, Active %s", addr, regSector, (GetSelectedDevice() == 0) ? "True" : "False");
//DevCon.WriteLn("DEV9: *ATA_R_NSECTOR 16bit read at address %x, value %x, Active %s", addr, regSector, (GetSelectedDevice() == 0) ? "True" : "False");
if (GetSelectedDevice() != 0)
return 0;
if (!regControlHOBRead)
@ -164,7 +164,7 @@ u16 ATA::Read16(u32 addr)
else
return regSectorHOB;
case ATA_R_LCYL:
DevCon.WriteLn("DEV9: *ATA_R_LCYL 16bit read at address %x, value %x, Active %s", addr, regLcyl, (GetSelectedDevice() == 0) ? "True" : "False");
//DevCon.WriteLn("DEV9: *ATA_R_LCYL 16bit read at address %x, value %x, Active %s", addr, regLcyl, (GetSelectedDevice() == 0) ? "True" : "False");
if (GetSelectedDevice() != 0)
return 0;
if (!regControlHOBRead)
@ -172,7 +172,7 @@ u16 ATA::Read16(u32 addr)
else
return regLcylHOB;
case ATA_R_HCYL:
DevCon.WriteLn("DEV9: *ATA_R_HCYL 16bit read at address % x, value % x, Active %s", addr, regHcyl, (GetSelectedDevice() == 0) ? " True " : " False ");
//DevCon.WriteLn("DEV9: *ATA_R_HCYL 16bit read at address % x, value % x, Active %s", addr, regHcyl, (GetSelectedDevice() == 0) ? " True " : " False ");
if (GetSelectedDevice() != 0)
return 0;
if (!regControlHOBRead)
@ -180,15 +180,15 @@ u16 ATA::Read16(u32 addr)
else
return regHcylHOB;
case ATA_R_SELECT:
DevCon.WriteLn("DEV9: *ATA_R_SELECT 16bit read at address % x, value % x, Active %s", addr, regSelect, (GetSelectedDevice() == 0) ? " True " : " False ");
//DevCon.WriteLn("DEV9: *ATA_R_SELECT 16bit read at address % x, value % x, Active %s", addr, regSelect, (GetSelectedDevice() == 0) ? " True " : " False ");
return regSelect;
case ATA_R_STATUS:
DevCon.WriteLn("DEV9: *ATA_R_STATUS (Fallthough to ATA_R_ALT_STATUS)");
//DevCon.WriteLn("DEV9: *ATA_R_STATUS (Fallthough to ATA_R_ALT_STATUS)");
//Clear irqcause
dev9.irqcause &= ~ATA_INTR_INTRQ;
[[fallthrough]];
case ATA_R_ALT_STATUS:
DevCon.WriteLn("DEV9: *ATA_R_ALT_STATUS 16bit read at address % x, value % x, Active %s", addr, regStatus, (GetSelectedDevice() == 0) ? " True " : " False ");
//DevCon.WriteLn("DEV9: *ATA_R_ALT_STATUS 16bit read at address % x, value % x, Active %s", addr, regStatus, (GetSelectedDevice() == 0) ? " True " : " False ");
//raise IRQ?
if (GetSelectedDevice() != 0)
return 0;
@ -209,43 +209,43 @@ void ATA::Write16(u32 addr, u16 value)
switch (addr)
{
case ATA_R_FEATURE:
DevCon.WriteLn("DEV9: *ATA_R_FEATURE 16bit write at address %x, value %x", addr, value);
//DevCon.WriteLn("DEV9: *ATA_R_FEATURE 16bit write at address %x, value %x", addr, value);
ClearHOB();
regFeatureHOB = regFeature;
regFeature = (u8)value;
break;
case ATA_R_NSECTOR:
DevCon.WriteLn("DEV9: *ATA_R_NSECTOR 16bit write at address %x, value %x", addr, value);
//DevCon.WriteLn("DEV9: *ATA_R_NSECTOR 16bit write at address %x, value %x", addr, value);
ClearHOB();
regNsectorHOB = regNsector;
regNsector = (u8)value;
break;
case ATA_R_SECTOR:
DevCon.WriteLn("DEV9: *ATA_R_SECTOR 16bit write at address %x, value %x", addr, value);
//DevCon.WriteLn("DEV9: *ATA_R_SECTOR 16bit write at address %x, value %x", addr, value);
ClearHOB();
regSectorHOB = regSector;
regSector = (u8)value;
break;
case ATA_R_LCYL:
DevCon.WriteLn("DEV9: *ATA_R_LCYL 16bit write at address %x, value %x", addr, value);
//DevCon.WriteLn("DEV9: *ATA_R_LCYL 16bit write at address %x, value %x", addr, value);
ClearHOB();
regLcylHOB = regLcyl;
regLcyl = (u8)value;
break;
case ATA_R_HCYL:
DevCon.WriteLn("DEV9: *ATA_R_HCYL 16bit write at address %x, value %x", addr, value);
//DevCon.WriteLn("DEV9: *ATA_R_HCYL 16bit write at address %x, value %x", addr, value);
ClearHOB();
regHcylHOB = regHcyl;
regHcyl = (u8)value;
break;
case ATA_R_SELECT:
DevCon.WriteLn("DEV9: *ATA_R_SELECT 16bit write at address %x, value %x", addr, value);
//DevCon.WriteLn("DEV9: *ATA_R_SELECT 16bit write at address %x, value %x", addr, value);
regSelect = (u8)value;
//bus->ifs[0].select = (val & ~0x10) | 0xa0;
//bus->ifs[1].select = (val | 0x10) | 0xa0;
break;
case ATA_R_CONTROL:
DevCon.WriteLn("DEV9: *ATA_R_CONTROL 16bit write at address %x, value %x", addr, value);
//DevCon.WriteLn("DEV9: *ATA_R_CONTROL 16bit write at address %x, value %x", addr, value);
//dev9Ru16(ATA_R_CONTROL) = value;
if ((value & 0x2) != 0)
{
@ -267,7 +267,7 @@ void ATA::Write16(u32 addr, u16 value)
break;
case ATA_R_CMD:
DevCon.WriteLn("DEV9: *ATA_R_CMD 16bit write at address %x, value %x", addr, value);
//DevCon.WriteLn("DEV9: *ATA_R_CMD 16bit write at address %x, value %x", addr, value);
regCommand = value;
regControlHOBRead = false;
dev9.irqcause &= ~ATA_INTR_INTRQ;
@ -404,7 +404,7 @@ bool ATA::HDD_CanAccess(int* sectors)
if (lba == -1)
return false;
DevCon.WriteLn("DEV9: LBA :%i", lba);
//DevCon.WriteLn("DEV9: LBA :%i", lba);
posStart = lba;
if (posStart > maxLBA)

4
pcsx2/DEV9/ATA/Commands/ATA_CmdPIOData.cpp
View File

@ -51,11 +51,11 @@ void ATA::PostCmdPIODataToHost()
//FromHost
u16 ATA::ATAreadPIO()
{
DevCon.WriteLn("DEV9: *ATA_R_DATA 16bit read, pio_count %i, pio_size %i", pioPtr, pioEnd);
//DevCon.WriteLn("DEV9: *ATA_R_DATA 16bit read, pio_count %i, pio_size %i", pioPtr, pioEnd);
if (pioPtr < pioEnd)
{
const u16 ret = *(u16*)&pioBuffer[pioPtr * 2];
DevCon.WriteLn("DEV9: *ATA_R_DATA returned value is %x", ret);
//DevCon.WriteLn("DEV9: *ATA_R_DATA returned value is %x", ret);
pioPtr++;
if (pioPtr >= pioEnd) //Fnished transfer (Changed from MegaDev9)
PostCmdPIODataToHost();

72
pcsx2/DEV9/DEV9.cpp
View File

@ -507,11 +507,11 @@ u16 DEV9read16(u32 addr)
hard |= SPD_DBUF_STAT_FULL;
}
DevCon.WriteLn("DEV9: SPD_R_DBUF_STAT 16bit read %x", hard);
//DevCon.WriteLn("DEV9: SPD_R_DBUF_STAT 16bit read %x", hard);
return hard;
}
case SPD_R_IF_CTRL:
DevCon.WriteLn("DEV9: SPD_R_IF_CTRL 16bit read %x", dev9.if_ctrl);
//DevCon.WriteLn("DEV9: SPD_R_IF_CTRL 16bit read %x", dev9.if_ctrl);
return dev9.if_ctrl;
default:
hard = dev9Ru16(addr);
@ -787,35 +787,35 @@ void DEV9write16(u32 addr, u16 value)
break;
case SPD_R_XFR_CTRL:
DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL 16bit write %x", value);
//DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL 16bit write %x", value);
dev9.xfr_ctrl = value;
if (value & SPD_XFR_WRITE)
DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL Set Write");
else
DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL Set Read");
//if (value & SPD_XFR_WRITE)
// DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL Set Write");
//else
// DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL Set Read");
if ((value & (1 << 1)) != 0)
DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL Unknown Bit 1");
//if ((value & (1 << 1)) != 0)
// DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL Unknown Bit 1");
if ((value & (1 << 2)) != 0)
DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL Unknown Bit 2");
//if ((value & (1 << 2)) != 0)
// DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL Unknown Bit 2");
if (value & SPD_XFR_DMAEN)
DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL For DMA Enabled");
else
DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL For DMA Disabled");
//if (value & SPD_XFR_DMAEN)
// DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL For DMA Enabled");
//else
// DevCon.WriteLn("DEV9: SPD_R_XFR_CTRL For DMA Disabled");
if ((value & 0b1111111101111000) != 0)
Console.Error("DEV9: SPD_R_XFR_CTRL Unknown value written %x", value);
break;
case SPD_R_DBUF_STAT:
DevCon.WriteLn("DEV9: SPD_R_DBUF_STAT 16bit write %x", value);
//DevCon.WriteLn("DEV9: SPD_R_DBUF_STAT 16bit write %x", value);
if ((value & SPD_DBUF_RESET_FIFO) != 0)
{
DevCon.WriteLn("DEV9: SPD_R_DBUF_STAT Reset FIFO");
//DevCon.WriteLn("DEV9: SPD_R_DBUF_STAT Reset FIFO");
dev9.fifo_bytes_write = 0;
dev9.fifo_bytes_read = 0;
dev9.xfr_ctrl &= ~SPD_XFR_WRITE; //?
@ -829,21 +829,21 @@ void DEV9write16(u32 addr, u16 value)
break;
case SPD_R_IF_CTRL:
DevCon.WriteLn("DEV9: SPD_R_IF_CTRL 16bit write %x", value);
//DevCon.WriteLn("DEV9: SPD_R_IF_CTRL 16bit write %x", value);
dev9.if_ctrl = value;
if (value & SPD_IF_UDMA)
DevCon.WriteLn("DEV9: IF_CTRL UDMA Enabled");
else
DevCon.WriteLn("DEV9: IF_CTRL UDMA Disabled");
if (value & SPD_IF_READ)
DevCon.WriteLn("DEV9: IF_CTRL DMA Is ATA Read");
else
DevCon.WriteLn("DEV9: IF_CTRL DMA Is ATA Write");
//if (value & SPD_IF_UDMA)
// DevCon.WriteLn("DEV9: IF_CTRL UDMA Enabled");
//else
// DevCon.WriteLn("DEV9: IF_CTRL UDMA Disabled");
//if (value & SPD_IF_READ)
// DevCon.WriteLn("DEV9: IF_CTRL DMA Is ATA Read");
//else
// DevCon.WriteLn("DEV9: IF_CTRL DMA Is ATA Write");
if (value & SPD_IF_ATA_DMAEN)
{
DevCon.WriteLn("DEV9: IF_CTRL ATA DMA Enabled");
//DevCon.WriteLn("DEV9: IF_CTRL ATA DMA Enabled");
if (value & SPD_IF_READ) //Semi async
{
HDDWriteFIFO(); //Yes this is not a typo
@ -854,8 +854,8 @@ void DEV9write16(u32 addr, u16 value)
}
FIFOIntr();
}
else
DevCon.WriteLn("DEV9: IF_CTRL ATA DMA Disabled");
//else
// DevCon.WriteLn("DEV9: IF_CTRL ATA DMA Disabled");
if (value & (1 << 3))
DevCon.WriteLn("DEV9: IF_CTRL Unknown Bit 3 Set");
@ -867,7 +867,7 @@ void DEV9write16(u32 addr, u16 value)
if ((value & SPD_IF_HDD_RESET) == 0) //Maybe?
{
DevCon.WriteLn("DEV9: IF_CTRL HDD Hard Reset");
//DevCon.WriteLn("DEV9: IF_CTRL HDD Hard Reset");
dev9.ata->ATA_HardReset();
}
if ((value & SPD_IF_ATA_RESET) != 0)
@ -887,25 +887,25 @@ void DEV9write16(u32 addr, u16 value)
break;
case SPD_R_PIO_MODE: //ATA only? or includes EEPROM?
DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 16bit write %x", value);
//DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 16bit write %x", value);
dev9.pio_mode = value;
switch (value)
{
case 0x92:
DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 0");
//DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 0");
break;
case 0x72:
DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 1");
//DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 1");
break;
case 0x32:
DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 2");
//DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 2");
break;
case 0x24:
DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 3");
//DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 3");
break;
case 0x23:
DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 4");
//DevCon.WriteLn("DEV9: SPD_R_PIO_MODE 4");
break;
default: