From 815e5d952d2c115461b0a6157fbada7965fe44bc Mon Sep 17 00:00:00 2001 From: TheLastRar Date: Tue, 16 Apr 2024 23:26:35 +0100 Subject: [PATCH] DEV9: Adjustments to HDD logs --- pcsx2/DEV9/ATA/ATA_Info.cpp | 6 ++---- pcsx2/DEV9/ATA/ATA_State.cpp | 4 +++- pcsx2/DEV9/ATA/HddCreate.cpp | 4 ++-- pcsx2/DEV9/DEV9.cpp | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pcsx2/DEV9/ATA/ATA_Info.cpp b/pcsx2/DEV9/ATA/ATA_Info.cpp index 6e8201268e..6480265635 100644 --- a/pcsx2/DEV9/ATA/ATA_Info.cpp +++ b/pcsx2/DEV9/ATA/ATA_Info.cpp @@ -42,8 +42,8 @@ void ATA::CreateHDDinfo(u64 sizeSectors) sizeSectors = std::min(sizeSectors, maxSize); constexpr u16 sectorSize = 512; - DevCon.WriteLn("DEV9: HddSize : %i", sizeSectors * sectorSize / (1024 * 1024)); - DevCon.WriteLn("DEV9: sizeSectors : %i", sizeSectors); // SizeSectors will keep 48-bit size + DevCon.WriteLn("DEV9: ATA: HddSize : %i", sizeSectors * sectorSize / (1024 * 1024)); + DevCon.WriteLn("DEV9: ATA: sizeSectors : %i", sizeSectors); // SizeSectors will keep 48-bit size memset(&identifyData, 0, sizeof(identifyData)); //Defualt CHS translation @@ -399,6 +399,4 @@ void ATA::CreateHDDinfoCsum() for (int i = 0; i < (512); i++) counter += identifyData[i]; - - DevCon.WriteLn("DEV9: %i", counter); } diff --git a/pcsx2/DEV9/ATA/ATA_State.cpp b/pcsx2/DEV9/ATA/ATA_State.cpp index ffcbbd9823..3eada5724c 100644 --- a/pcsx2/DEV9/ATA/ATA_State.cpp +++ b/pcsx2/DEV9/ATA/ATA_State.cpp @@ -40,6 +40,8 @@ int ATA::Open(const std::string& hddPath) readBuffer = new u8[readBufferLen]; memset(sceSec, 0, sizeof(sceSec)); + DevCon.WriteLn("DEV9: ATA: HddFile : %s", hddPath.c_str()); + //Open File if (!FileSystem::FileExists(hddPath.c_str())) return -1; @@ -48,7 +50,7 @@ int ATA::Open(const std::string& hddPath) const s64 size = hddImage ? FileSystem::FSize64(hddImage) : -1; if (!hddImage || size < 0) { - Console.Error("Failed to open HDD image '%s'", hddPath.c_str()); + Console.Error("DEV9: ATA: Failed to open HDD image '%s'", hddPath.c_str()); return -1; } diff --git a/pcsx2/DEV9/ATA/HddCreate.cpp b/pcsx2/DEV9/ATA/HddCreate.cpp index cd1065c200..6655da6cbb 100644 --- a/pcsx2/DEV9/ATA/HddCreate.cpp +++ b/pcsx2/DEV9/ATA/HddCreate.cpp @@ -251,12 +251,12 @@ void HddCreate::WriteImage(const std::string& hddPath, u64 fileBytes, u64 zeroSi void HddCreate::SetFileProgress(u64 currentSize) { - Console.WriteLn(fmt::format("{} / {} Bytes", currentSize, neededSize).c_str()); + Console.WriteLn(fmt::format("DEV9: HddCreate: {} / {} Bytes", currentSize, neededSize).c_str()); } void HddCreate::SetError() { - Console.WriteLn("Failed to create HDD file"); + Console.WriteLn("DEV9: HddCreate: Failed to create HDD file"); } void HddCreate::SetCanceled() diff --git a/pcsx2/DEV9/DEV9.cpp b/pcsx2/DEV9/DEV9.cpp index 7be27825a0..ef9678bae1 100644 --- a/pcsx2/DEV9/DEV9.cpp +++ b/pcsx2/DEV9/DEV9.cpp @@ -180,7 +180,6 @@ void DEV9shutdown() s32 DEV9open() { DevCon.WriteLn("DEV9: DEV9open"); - DevCon.WriteLn("DEV9: open r+: %s", EmuConfig.DEV9.HddFile.c_str()); std::string hddPath(GetHDDPath());