From 1aa7b591b65320917f59879ff2e9b657b8a3ee48 Mon Sep 17 00:00:00 2001 From: TheLastRar Date: Tue, 23 Jan 2024 17:52:24 +0000 Subject: [PATCH] DEV9: LBA48 Support --- pcsx2-qt/Settings/DEV9SettingsWidget.cpp | 22 ++++++++++++ pcsx2-qt/Settings/DEV9SettingsWidget.h | 1 + pcsx2-qt/Settings/DEV9SettingsWidget.ui | 14 ++++++++ pcsx2/DEV9/ATA/ATA.h | 2 +- pcsx2/DEV9/ATA/ATA_State.cpp | 2 ++ pcsx2/DEV9/ATA/Commands/ATA_CmdDMA.cpp | 4 +-- pcsx2/DEV9/ATA/Commands/ATA_Command.cpp | 43 ++++++++++++++++++++---- 7 files changed, 78 insertions(+), 10 deletions(-) diff --git a/pcsx2-qt/Settings/DEV9SettingsWidget.cpp b/pcsx2-qt/Settings/DEV9SettingsWidget.cpp index 9228c965c4..fc431bed3b 100644 --- a/pcsx2-qt/Settings/DEV9SettingsWidget.cpp +++ b/pcsx2-qt/Settings/DEV9SettingsWidget.cpp @@ -253,6 +253,8 @@ DEV9SettingsWidget::DEV9SettingsWidget(SettingsWindow* dialog, QWidget* parent) else m_ui.hddFile->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Hdd", "HddFile", "DEV9hdd.raw").value().c_str())); + connect(m_ui.hddLBA48, QOverload::of(&QCheckBox::stateChanged), this, &DEV9SettingsWidget::onHddLBA48Changed); + UpdateHddSizeUIValues(); connect(m_ui.hddFile, &QLineEdit::textChanged, this, &DEV9SettingsWidget::onHddFileTextChange); @@ -720,6 +722,21 @@ void DEV9SettingsWidget::onHddSizeAccessorSpin() m_ui.hddSizeSlider->setValue(m_ui.hddSizeSpinBox->value()); } +void DEV9SettingsWidget::onHddLBA48Changed(int state) +{ + const bool enabled = state; + + m_ui.hddSizeSlider->setMaximum(state ? 2000 : 120); + m_ui.hddSizeSpinBox->setMaximum(state ? 2000 : 120); + m_ui.hddSizeMaxLabel->setText(state ? tr("2000") : tr("120")); + // Bump up min size to have ticks align with 100GiB sizes + m_ui.hddSizeSlider->setMinimum(state ? 100 : 40); + m_ui.hddSizeSpinBox->setMinimum(state ? 100 : 40); + m_ui.hddSizeMinLabel->setText(state ? tr("100") : tr("40")); + + m_ui.hddSizeSlider->setTickInterval(state ? 100 : 5); +} + void DEV9SettingsWidget::onHddCreateClicked() { //Do the thing @@ -800,6 +817,11 @@ void DEV9SettingsWidget::UpdateHddSizeUIValues() if (size < 0) return; + if (size > static_cast(120) * 1024 * 1024 * 1024) + m_ui.hddLBA48->setChecked(true); + else + m_ui.hddLBA48->setChecked(false); + const int sizeGB = size / 1024 / 1024 / 1024; QSignalBlocker sb1(m_ui.hddSizeSpinBox); QSignalBlocker sb2(m_ui.hddSizeSlider); diff --git a/pcsx2-qt/Settings/DEV9SettingsWidget.h b/pcsx2-qt/Settings/DEV9SettingsWidget.h index fb9923522a..860a2d159b 100644 --- a/pcsx2-qt/Settings/DEV9SettingsWidget.h +++ b/pcsx2-qt/Settings/DEV9SettingsWidget.h @@ -39,6 +39,7 @@ private Q_SLOTS: void onHddFileEdit(); void onHddSizeSlide(int i); void onHddSizeAccessorSpin(); + void onHddLBA48Changed(int state); void onHddCreateClicked(); public: diff --git a/pcsx2-qt/Settings/DEV9SettingsWidget.ui b/pcsx2-qt/Settings/DEV9SettingsWidget.ui index 97bf8b6b0a..f31c9bd909 100644 --- a/pcsx2-qt/Settings/DEV9SettingsWidget.ui +++ b/pcsx2-qt/Settings/DEV9SettingsWidget.ui @@ -365,6 +365,20 @@ + + + + 48-bit LBA: + + + + + + + Enabled + + + diff --git a/pcsx2/DEV9/ATA/ATA.h b/pcsx2/DEV9/ATA/ATA.h index 736c836e89..85a27acf53 100644 --- a/pcsx2/DEV9/ATA/ATA.h +++ b/pcsx2/DEV9/ATA/ATA.h @@ -22,7 +22,7 @@ public: int nsector = 0; //sector count int nsectorLeft = 0; //sectors left to transfer private: - const bool lba48Supported = false; + bool lba48Supported = false; std::FILE* hddImage = nullptr; u64 hddImageSize; diff --git a/pcsx2/DEV9/ATA/ATA_State.cpp b/pcsx2/DEV9/ATA/ATA_State.cpp index 8aefb1b72c..83b91bdf04 100644 --- a/pcsx2/DEV9/ATA/ATA_State.cpp +++ b/pcsx2/DEV9/ATA/ATA_State.cpp @@ -94,6 +94,8 @@ int ATA::Open(const std::string& hddPath) //Store HddImage size for later use hddImageSize = static_cast(size); + lba48Supported = (hddImageSize > ((static_cast(1) << 28) - 1) * 512); + CreateHDDinfo(hddImageSize / 512); InitSparseSupport(hddPath); diff --git a/pcsx2/DEV9/ATA/Commands/ATA_CmdDMA.cpp b/pcsx2/DEV9/ATA/Commands/ATA_CmdDMA.cpp index 7a8b8f4e7f..7ea25ba8b4 100644 --- a/pcsx2/DEV9/ATA/Commands/ATA_CmdDMA.cpp +++ b/pcsx2/DEV9/ATA/Commands/ATA_CmdDMA.cpp @@ -133,7 +133,7 @@ void ATA::HDD_ReadDMA(bool isLBA48) { if (!PreCmd()) return; - DevCon.WriteLn("DEV9: HDD_ReadDMA"); + DevCon.WriteLn(isLBA48 ? "DEV9: HDD_ReadDMA48" : "DEV9: HDD_ReadDMA"); IDE_CmdLBA48Transform(isLBA48); @@ -155,7 +155,7 @@ void ATA::HDD_WriteDMA(bool isLBA48) { if (!PreCmd()) return; - DevCon.WriteLn("DEV9: HDD_WriteDMA"); + DevCon.WriteLn(isLBA48 ? "DEV9: HDD_WriteDMA48" : "DEV9: HDD_WriteDMA"); IDE_CmdLBA48Transform(isLBA48); diff --git a/pcsx2/DEV9/ATA/Commands/ATA_Command.cpp b/pcsx2/DEV9/ATA/Commands/ATA_Command.cpp index 2c1cea2692..eec58d8d76 100644 --- a/pcsx2/DEV9/ATA/Commands/ATA_Command.cpp +++ b/pcsx2/DEV9/ATA/Commands/ATA_Command.cpp @@ -14,11 +14,27 @@ void ATA::IDE_ExecCmd(u16 value) case 0x20: HDD_ReadSectors(false); break; - //0x21 + case 0x24: + if (lba48Supported) + HDD_ReadSectors(true); + else + HDD_Unk(); + break; + case 0x29: + if (lba48Supported) + HDD_ReadMultiple(true); + else + HDD_Unk(); + break; case 0x40: HDD_ReadVerifySectors(false); break; - //0x41 + case 0x42: + if (lba48Supported) + HDD_ReadVerifySectors(true); + else + HDD_Unk(); + break; case 0x70: HDD_SeekCmd(); break; @@ -37,13 +53,21 @@ void ATA::IDE_ExecCmd(u16 value) case 0xC8: HDD_ReadDMA(false); break; - //0xC9 case 0xCA: HDD_WriteDMA(false); break; - //0xCB - //0x25 = HDDreadDMA48; - //0x35 = HDDwriteDMA48;*/ + case 0x25: + if (lba48Supported) + HDD_ReadDMA(true); + else + HDD_Unk(); + break; + case 0x35: + if (lba48Supported) + HDD_WriteDMA(true); + else + HDD_Unk(); + break; case 0xE1: HDD_IdleImmediate(); break; @@ -53,7 +77,12 @@ void ATA::IDE_ExecCmd(u16 value) case 0xE7: HDD_FlushCache(); break; - //0xEA = HDDflushCache48 + case 0xEA: + if (lba48Supported) + HDD_FlushCache(); + else + HDD_Unk(); + break; case 0xEC: HDD_IdentifyDevice(); break;