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

DEV9: Add support for external HDD ID. 

This commit introduces the capability to read the content of a *.hddid file located in the same directory as the HDD image (same name, different extension). The retrieved content is then used to fill the SCE_IDENTIFY_DRIVE response.
This commit is contained in:
AKuHAK 2023-12-22 19:22:25 +02:00 committed by Connor McLaughlin
parent 0a7fc06510
commit 8172b2e5ed
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ int ATA::Open(const std::string& hddPath)
{ {
readBufferLen = 256 * 512; readBufferLen = 256 * 512;
readBuffer = new u8[readBufferLen]; readBuffer = new u8[readBufferLen];
memset(sceSec, 0, sizeof(sceSec));
//Open File //Open File
if (!FileSystem::FileExists(hddPath.c_str())) if (!FileSystem::FileExists(hddPath.c_str()))
@ -52,6 +53,45 @@ int ATA::Open(const std::string& hddPath)
return -1; return -1;
} }
// Open and read the content of the hddid file
std::string hddidPath = Path::ReplaceExtension(hddPath, "hddid");
std::optional<std::vector<u8>> fileContent = FileSystem::ReadBinaryFile(hddidPath.c_str());
if (fileContent.has_value() && fileContent.value().size() <= sizeof(sceSec))
{
// Copy the content to sceSec
std::copy(fileContent.value().begin(), fileContent.value().end(), sceSec);
}
else
{
// fill sceSec with default data if hdd id file is not present
memcpy(sceSec, "Sony Computer Entertainment Inc.", 32); // Always this magic header.
memcpy(sceSec + 0x20, "SCPH-20401", 10); // sometimes this matches HDD model, the rest 6 bytes filles with zeroes, or sometimes with spaces
memcpy(sceSec + 0x30, " 40", 4); // or " 120" for PSX DESR, reference for ps2 area size. The rest bytes filled with zeroes
sceSec[0x40] = 0; // 0x40 - 0x43 - 4-byte HDD internal SCE serial, does not match real HDD serial, currently hardcoded to 0x1000000
sceSec[0x41] = 0;
sceSec[0x42] = 0;
sceSec[0x43] = 0x01;
// purpose of next 12 bytes is unknown
sceSec[0x44] = 0; // always zero
sceSec[0x45] = 0; // always zero
sceSec[0x46] = 0x1a;
sceSec[0x47] = 0x01;
sceSec[0x48] = 0x02;
sceSec[0x49] = 0x20;
sceSec[0x4a] = 0; // always zero
sceSec[0x4b] = 0; // always zero
// next 4 bytes always these values
sceSec[0x4c] = 0x01;
sceSec[0x4d] = 0x03;
sceSec[0x4e] = 0x11;
sceSec[0x4f] = 0x01;
// 0x50 - 0x80 is a random unique block of data
// 0x80 and up - zero filled
}
//Store HddImage size for later use //Store HddImage size for later use
hddImageSize = static_cast<u64>(size); hddImageSize = static_cast<u64>(size);
CreateHDDinfo(hddImageSize / 512); CreateHDDinfo(hddImageSize / 512);
@ -130,7 +170,7 @@ void ATA::InitSparseSupport(const std::string& hddPath)
/* https://askbob.tech/the-ntfs-blog-sparse-and-compressed-file/ /* https://askbob.tech/the-ntfs-blog-sparse-and-compressed-file/
* NTFS Sparse Block Size are the same size as a compression unit * NTFS Sparse Block Size are the same size as a compression unit
* Cluster Size Compression Unit * Cluster Size Compression Unit
* -------------------------------- * --------------------------------
* 512bytes 8kb (0x02000) * 512bytes 8kb (0x02000)
* 1kb 16kb (0x04000) * 1kb 16kb (0x04000)

29
pcsx2/DEV9/ATA/Commands/ATA_SCE.cpp
View File

@ -40,35 +40,6 @@ void ATA::SCE_IDENTIFY_DRIVE()
{ {
PreCmd(); PreCmd();
// fill sceSec response with default data
memcpy(sceSec, "Sony Computer Entertainment Inc.", 32); // Always this magic header.
memcpy(sceSec + 0x20, "SCPH-20401", 10); // sometimes this matches HDD model, the rest 6 bytes filles with zeroes, or sometimes with spaces
memcpy(sceSec + 0x30, " 40", 4); // or " 120" for PSX DESR, reference for ps2 area size. The rest bytes filled with zeroes
sceSec[0x40] = 0; // 0x40 - 0x43 - 4-byte HDD internal SCE serial, does not match real HDD serial, currently hardcoded to 0x1000000
sceSec[0x41] = 0;
sceSec[0x42] = 0;
sceSec[0x43] = 0x01;
// purpose of next 12 bytes is unknown
sceSec[0x44] = 0; // always zero
sceSec[0x45] = 0; // always zero
sceSec[0x46] = 0x1a;
sceSec[0x47] = 0x01;
sceSec[0x48] = 0x02;
sceSec[0x49] = 0x20;
sceSec[0x4a] = 0; // always zero
sceSec[0x4b] = 0; // always zero
// next 4 bytes always these values
sceSec[0x4c] = 0x01;
sceSec[0x4d] = 0x03;
sceSec[0x4e] = 0x11;
sceSec[0x4f] = 0x01;
// 0x50 - 0x80 is a random unique block of data
// 0x80 and up - zero filled
// TODO: if exists *.hddid file (size - 128-512 bytes) along with HDD image, replace generic sceSec with its content
pioDRQEndTransferFunc = nullptr; pioDRQEndTransferFunc = nullptr;
DRQCmdPIODataToHost(sceSec, 256 * 2, 0, 256 * 2, true); DRQCmdPIODataToHost(sceSec, 256 * 2, 0, 256 * 2, true);
} }