Core: Remove unaligned dma

project64 · Dec 18, 2022 · ae62981 · ae62981
1 parent cbacddb
commit ae62981
Show file tree

Hide file tree

Showing 24 changed files with 2 additions and 339 deletions.
diff --git a/Config/Project64.rdb b/Config/Project64.rdb
diff --git a/Lang/Bengali.pj.lang b/Lang/Bengali.pj.lang
@@ -287,7 +287,6 @@
 # 538# "32-বিট ইঞ্জিন" "
 # 539# "বিলম্ব ডিপি বাধা"
 # 5400# "ওভারক্লক মডিফায়ার:"
-# 5410# "স্বীকৃত ডিএমএ"
 # 5420# "এলোমেলো সি/পিআই বাধা"
 # 5440# "ডিস্কের সময় নির্ধারণ করুন:"
 # 5441# "টার্বো"

diff --git a/Lang/Brazilian Portuguese.pj.Lang b/Lang/Brazilian Portuguese.pj.Lang
@@ -287,7 +287,6 @@
 #538#  "Motor de 32 bits"
 #539#  "Atrasar a interrupção do DP"
 #5400# "Modificador overclock:"
-#5410# "DMA desalinhado"
 #5420# "Aleatorizar as interrupções SI/PI"
 #5440# "Tempo de busca no disco:"
 #5441# "Turbo"

diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang
@@ -307,7 +307,6 @@
 #538#  "32 位引擎"
 #539#  "延迟 DP 中断"
 #5400#  "超频修改器:"
-#5410#  "不对齐 DMA"
 #5420#  "随机化 SI/PI 中断"
 #5440#  "磁盘搜索计时:"
 #5441#  "快速"

diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang
@@ -287,7 +287,6 @@
 #538#  "32-bit engine"
 #539#  "Delay DP interrupt"
 #5400# "Overclock modifier:"
-#5410# "Unaligned DMA"
 #5420# "Randomize SI/PI interrupts"
 #5440# "Disk seek timing:"
 #5441# "Turbo"

diff --git a/Lang/French.pj.Lang b/Lang/French.pj.Lang
@@ -309,10 +309,6 @@
 #5441# "Rapide"
 #5442# "Lente"
 
-#5410# "Interruptions SI/PI aléatoires"
-
-#5420# "DMA non alignée"
-
 //Core Styles
 #540#  "Interpréteur"
 #541#  "Recompilateur"

diff --git a/Lang/Indonesian.pj.lang b/Lang/Indonesian.pj.lang
@@ -287,7 +287,6 @@
 #538# "mesin 32-bit"
 #539# "Menunda interupsi DP"
 #5400# "Pengubah overclock:"
-#5410# "DMA Tidak Sejajar"
 #5420# "Acak interupsi SI/PI"
 #5440# "Waktu pencarian disk:"
 #5441# "Turbo"

diff --git a/Lang/Japanese.pj.Lang b/Lang/Japanese.pj.Lang
@@ -287,7 +287,6 @@
 #538#  "32bitエンジン"
 #539#  "DP割り込み遅延"
 #5400# "Overclock modifier:"
-#5410# "非整列DMA"
 #5420# "SI/PI割り込みのランダム化"
 #5440# "ディスクシークのタイミング:"
 #5441# "ターボ"

diff --git a/Lang/Portuguese.pj.Lang b/Lang/Portuguese.pj.Lang
@@ -287,7 +287,6 @@
 #538#  "Engine de 32 bits"
 #539#  "Atrasar a interrupção do DP"
 #5400# "Modificador overclock:"
-#5410# "DMA desalinhado"
 #5420# "Aleatorizar as interrupções SI/PI"
 #5440# "Tempo de busca em disco:"
 #5441# "Turbo"

diff --git a/Lang/Punjabi.pj.lang b/Lang/Punjabi.pj.lang
@@ -287,7 +287,6 @@
 #538# "32-ਬਿੱਟ ਇੰਜਣ"
 #539# "ਡੀਪੀ ਰੁਕਾਵਟ ਵਿੱਚ ਦੇਰੀ"
 #5400# "ਓਵਰਕਲਾਕ ਮੋਡੀਫਾਇਰ:"
-#5410# "ਅਨਲਾਈਨ ਡੀਐਮਏ"
 #5420# "SI/PI ਰੁਕਾਵਟਾਂ ਨੂੰ ਰੈਂਡਮਾਈਜ਼ ਕਰੋ"
 #5440# "ਡਿਸਕ ਖੋਜ ਸਮਾਂ:"
 #5441# "ਟਰਬੋ"

diff --git a/Lang/Spanish.pj.Lang b/Lang/Spanish.pj.Lang
@@ -290,10 +290,6 @@
 #5441# "Turbo"
 #5442# "Lento"
 
-#5410# "Interrupciones aleatorias SI/PI"
-
-#5420# "DMA desalineado"
-
 // Core styles
 #540#  "Interpretador"
 #541#  "Recompilador"

diff --git a/Lang/Vietnamese.pj.lang b/Lang/Vietnamese.pj.lang
@@ -287,7 +287,6 @@
 # 538 # "Động cơ 32-bit"
 # 539 # "Trì hoãn ngắt DP"
 # 5400 # "Công cụ sửa đổi ép xung:"
-# 5410 # "DMA không dấu"
 # 5420 # "Ngẫu nhiên ngắt SI / PI"
 # 5440 # "Thời gian tìm kiếm đĩa:"
 # 5441 # "Turbo"

diff --git a/Source/Android/Bridge/jniBridgeSettings.cpp b/Source/Android/Bridge/jniBridgeSettings.cpp
@@ -79,7 +79,6 @@ CJniBridegSettings::CJniBridegSettings()
     ADD_SETTING(Default_CounterFactor);
     ADD_SETTING(Default_SyncViaAudio);
     ADD_SETTING(Default_FixedAudio);
-    ADD_SETTING(Default_UnalignedDMA);
     ADD_SETTING(Default_RandomizeSIPIInterrupts);
     ADD_SETTING(Default_SMM_Protect_Memory);
     ADD_SETTING(Default_DiskSeekTiming);
@@ -117,7 +116,6 @@ CJniBridegSettings::CJniBridegSettings()
     ADD_SETTING(Rdb_AudioResetOnLoad);
     ADD_SETTING(Rdb_AllowROMWrites);
     ADD_SETTING(Rdb_CRC_Recalc);
-    ADD_SETTING(Rdb_UnalignedDMA);
     ADD_SETTING(Rdb_RandomizeSIPIInterrupts);
     ADD_SETTING(Rdb_RPCKey);
     ADD_SETTING(Rdb_DiskSeekTiming);
@@ -174,7 +172,6 @@ CJniBridegSettings::CJniBridegSettings()
     ADD_SETTING(Game_LoadSaveAtStart);
     ADD_SETTING(Game_OverClockModifier);
     ADD_SETTING(Game_FullSpeed);
-    ADD_SETTING(Game_UnalignedDMA);
     ADD_SETTING(Game_RandomizeSIPIInterrupts);
     ADD_SETTING(Game_RPCKey);
     ADD_SETTING(Game_DiskSeekTiming);

diff --git a/Source/Project64-core/Multilanguage.h b/Source/Project64-core/Multilanguage.h
@@ -323,7 +323,6 @@ enum LanguageStringID
     ROM_32BIT = 538,
     ROM_DELAY_DP = 539,
     ROM_OVER_CLOCK_MODIFIER = 5400,
-    ROM_UNALIGNED_DMA = 5410,
     ROM_RANDOMIZE_SIPI_INTERRUPTS = 5420,
     ROM_DISK_SEEK_TIMING = 5440,
     ROM_DISK_SEEK_TIMING_TURBO = 5441,

diff --git a/Source/Project64-core/Multilanguage/Language.cpp b/Source/Project64-core/Multilanguage/Language.cpp
@@ -271,7 +271,6 @@ void CLanguage::LoadDefaultStrings(void)
     DEF_STR(ROM_32BIT, "32-bit engine:");
     DEF_STR(ROM_DELAY_DP, "Delay DP interrupt:");
     DEF_STR(ROM_OVER_CLOCK_MODIFIER, "Overclock modifier:");
-    DEF_STR(ROM_UNALIGNED_DMA, "Unaligned DMA");
     DEF_STR(ROM_RANDOMIZE_SIPI_INTERRUPTS, "Randomize SI/PI interrupts");
     DEF_STR(ROM_DISK_SEEK_TIMING, "Disk seek timing:");
     DEF_STR(ROM_DISK_SEEK_TIMING_TURBO, "Turbo");

diff --git a/Source/Project64-core/N64System/MemoryHandler/PeripheralInterfaceHandler.cpp b/Source/Project64-core/N64System/MemoryHandler/PeripheralInterfaceHandler.cpp
@@ -126,7 +126,7 @@ bool PeripheralInterfaceHandler::Write32(uint32_t Address, uint32_t Value, uint3
     {
     case 0x04600000: PI_DRAM_ADDR_REG = ((PI_DRAM_ADDR_REG & ~Mask) | (Value & Mask)) & 0x00FFFFFE; break;
     case 0x04600004:
-        PI_CART_ADDR_REG = ((PI_CART_ADDR_REG & ~Mask) | (Value & Mask)) & (g_Settings->LoadBool(Game_UnalignedDMA) ? 0xFFFFFFFF : 0xFFFFFFFE);
+        PI_CART_ADDR_REG = ((PI_CART_ADDR_REG & ~Mask) | (Value & Mask)) & 0xFFFFFFFE;
         if (EnableDisk())
         {
             DiskDMACheck();

diff --git a/Source/Project64-core/Settings.cpp b/Source/Project64-core/Settings.cpp
@@ -134,7 +134,6 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory)
     AddHandler(Default_CounterFactor, new CSettingTypeApplication("Defaults", "Counter Factor", 2u));
     AddHandler(Default_SyncViaAudio, new CSettingTypeApplication("Defaults", "Audio-Sync Audio", true));
     AddHandler(Default_FixedAudio, new CSettingTypeApplication("Defaults", "Fixed Audio", true));
-    AddHandler(Default_UnalignedDMA, new CSettingTypeApplication("Defaults", "Unaligned DMA", false));
     AddHandler(Default_RandomizeSIPIInterrupts, new CSettingTypeApplication("Defaults", "Randomize SI/PI Interrupts", true));
     AddHandler(Default_SMM_Protect_Memory, new CSettingTypeApplication("Defaults", "SMM-Protect", false));
     AddHandler(Default_DiskSeekTiming, new CSettingTypeApplication("Defaults", "Disk Seek Timing", (uint32_t)DiskSeek_Turbo));
@@ -176,7 +175,6 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory)
     AddHandler(Rdb_AudioResetOnLoad, new CSettingTypeRDBYesNo("AudioResetOnLoad", false));
     AddHandler(Rdb_AllowROMWrites, new CSettingTypeRDBYesNo("AllowROMWrites", false));
     AddHandler(Rdb_CRC_Recalc, new CSettingTypeRDBYesNo("CRC-Recalc", false));
-    AddHandler(Rdb_UnalignedDMA, new CSettingTypeRomDatabase("Unaligned DMA", Default_UnalignedDMA));
     AddHandler(Rdb_RandomizeSIPIInterrupts, new CSettingTypeRomDatabase("Randomize SI/PI Interrupts", Default_RandomizeSIPIInterrupts));
     AddHandler(Rdb_DiskSeekTiming, new CSettingTypeRomDatabase("DiskSeekTiming", Default_DiskSeekTiming));
 
@@ -235,7 +233,6 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory)
     AddHandler(Game_LoadSaveAtStart, new CSettingTypeTempBool(false));
     AddHandler(Game_OverClockModifier, new CSettingTypeGame("OverClockModifier", (uint32_t)1));
     AddHandler(Game_FullSpeed, new CSettingTypeTempBool(true, "Full Speed"));
-    AddHandler(Game_UnalignedDMA, new CSettingTypeGame("Unaligned DMA", Rdb_UnalignedDMA));
     AddHandler(Game_RandomizeSIPIInterrupts, new CSettingTypeGame("Randomize SI/PI Interrupts", Rdb_RandomizeSIPIInterrupts));
     AddHandler(Game_RPCKey, new CSettingTypeTempString(""));
     AddHandler(Game_DiskSeekTiming, new CSettingTypeGame("DiskSeekTiming", Rdb_DiskSeekTiming));

diff --git a/Source/Project64-core/Settings/SettingsID.h b/Source/Project64-core/Settings/SettingsID.h
@@ -70,7 +70,6 @@ enum SettingID
     Default_CounterFactor,
     Default_SyncViaAudio,
     Default_FixedAudio,
-    Default_UnalignedDMA,
     Default_RandomizeSIPIInterrupts,
     Default_SMM_Protect_Memory,
     Default_DiskSeekTiming,
@@ -108,7 +107,6 @@ enum SettingID
     Rdb_AudioResetOnLoad,
     Rdb_AllowROMWrites,
     Rdb_CRC_Recalc,
-    Rdb_UnalignedDMA,
     Rdb_RandomizeSIPIInterrupts,
     Rdb_RPCKey,
     Rdb_DiskSeekTiming,
@@ -165,7 +163,6 @@ enum SettingID
     Game_LoadSaveAtStart,
     Game_OverClockModifier,
     Game_FullSpeed,
-    Game_UnalignedDMA,
     Game_RandomizeSIPIInterrupts,
     Game_RPCKey,
     Game_DiskSeekTiming,

diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.cpp b/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.cpp
@@ -17,7 +17,6 @@ CDefaultsOptionsPage::CDefaultsOptionsPage(HWND hParent, const RECT & rcDispay)
     SetDlgItemText(IDC_COUNTFACT_TEXT, wGS(ROM_COUNTER_FACTOR).c_str());
     SetDlgItemText(IDC_ROM_FIXEDAUDIO, wGS(ROM_FIXED_AUDIO).c_str());
     SetDlgItemText(IDC_SYNC_AUDIO, wGS(ROM_SYNC_AUDIO).c_str());
-    SetDlgItemText(IDC_UNALIGNED_DMA, wGS(ROM_UNALIGNED_DMA).c_str());
     SetDlgItemText(IDC_RANDOMIZE_SIPI_INTERRUPTS, wGS(ROM_RANDOMIZE_SIPI_INTERRUPTS).c_str());
     SetDlgItemText(IDC_PROTECT_MEMORY, wGS(ADVANCE_SMM_PROTECT).c_str());
     SetDlgItemText(IDC_DISKSEEKTIMING_TEXT1, wGS(ROM_DISK_SEEK_TIMING).c_str());
@@ -51,7 +50,6 @@ CDefaultsOptionsPage::CDefaultsOptionsPage(HWND hParent, const RECT & rcDispay)
     AddModCheckBox(GetDlgItem(IDC_HLE_GFX), Default_UseHleGfx);
     AddModCheckBox(GetDlgItem(IDC_SYNC_AUDIO), Default_SyncViaAudio);
     AddModCheckBox(GetDlgItem(IDC_ROM_FIXEDAUDIO), Default_FixedAudio);
-    AddModCheckBox(GetDlgItem(IDC_UNALIGNED_DMA), Default_UnalignedDMA);
     AddModCheckBox(GetDlgItem(IDC_RANDOMIZE_SIPI_INTERRUPTS), Default_RandomizeSIPIInterrupts);
     AddModCheckBox(GetDlgItem(IDC_PROTECT_MEMORY), Default_SMM_Protect_Memory);
     AddModCheckBox(GetDlgItem(IDC_DISKSEEKTIMING), Default_DiskSeekTiming);

diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.h b/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.h
@@ -9,7 +9,6 @@ class CDefaultsOptionsPage :
         COMMAND_ID_HANDLER_EX(IDC_HLE_GFX, CheckBoxChanged);
         COMMAND_ID_HANDLER_EX(IDC_SYNC_AUDIO, CheckBoxChanged);
         COMMAND_ID_HANDLER_EX(IDC_ROM_FIXEDAUDIO, CheckBoxChanged);
-        COMMAND_ID_HANDLER_EX(IDC_UNALIGNED_DMA, CheckBoxChanged);
         COMMAND_ID_HANDLER_EX(IDC_RANDOMIZE_SIPI_INTERRUPTS, CheckBoxChanged);
         COMMAND_ID_HANDLER_EX(IDC_PROTECT_MEMORY, CheckBoxChanged);
         COMMAND_HANDLER_EX(IDC_RDRAM_SIZE, LBN_SELCHANGE, ComboBoxChanged);

diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.cpp b/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.cpp
@@ -25,15 +25,13 @@ CGameGeneralPage::CGameGeneralPage(HWND hParent, const RECT & rcDispay)
     SetDlgItemText(IDC_SYNC_AUDIO, wGS(ROM_SYNC_AUDIO).c_str());
     SetDlgItemText(IDC_DELAY_SI, wGS(ROM_DELAY_SI).c_str());
     SetDlgItemText(IDC_AUDIO_SIGNAL, wGS(ROM_AUDIO_SIGNAL).c_str());
-    SetDlgItemText(IDC_UNALIGNED_DMA, wGS(ROM_UNALIGNED_DMA).c_str());
     SetDlgItemText(IDC_RANDOMIZE_SIPI_INTERRUPTS, wGS(ROM_RANDOMIZE_SIPI_INTERRUPTS).c_str());
 
     AddModCheckBox(GetDlgItem(IDC_SYNC_AUDIO), Game_SyncViaAudio);
     AddModCheckBox(GetDlgItem(IDC_ROM_FIXEDAUDIO), Game_FixedAudio);
     AddModCheckBox(GetDlgItem(IDC_DELAY_DP), Game_DelayDP);
     AddModCheckBox(GetDlgItem(IDC_DELAY_SI), Game_DelaySI);
     AddModCheckBox(GetDlgItem(IDC_AUDIO_SIGNAL), Game_RspAudioSignal);
-    AddModCheckBox(GetDlgItem(IDC_UNALIGNED_DMA), Game_UnalignedDMA);
     AddModCheckBox(GetDlgItem(IDC_RANDOMIZE_SIPI_INTERRUPTS), Game_RandomizeSIPIInterrupts);
 
     CModifiedComboBox * ComboBox;

diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.h b/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.h
@@ -18,7 +18,6 @@ class CGameGeneralPage :
         COMMAND_ID_HANDLER_EX(IDC_DELAY_DP, CheckBoxChanged);
         COMMAND_ID_HANDLER_EX(IDC_DELAY_SI, CheckBoxChanged);
         COMMAND_ID_HANDLER_EX(IDC_AUDIO_SIGNAL, CheckBoxChanged);
-        COMMAND_ID_HANDLER_EX(IDC_UNALIGNED_DMA, CheckBoxChanged);
         COMMAND_ID_HANDLER_EX(IDC_RANDOMIZE_SIPI_INTERRUPTS, CheckBoxChanged);
         COMMAND_HANDLER_EX(IDC_VIREFRESH, EN_UPDATE, EditBoxChanged);
         COMMAND_HANDLER_EX(IDC_COUNTPERBYTE, EN_UPDATE, EditBoxChanged);

diff --git a/Source/Project64/UserInterface/UIResources.rc b/Source/Project64/UserInterface/UIResources.rc
@@ -228,7 +228,6 @@ BEGIN
     CONTROL         "RSP Audio Signal",IDC_AUDIO_SIGNAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,143,91,10
     CONTROL         "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,143,107,10
-    CONTROL         "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,154,91,10
 END
 
 IDD_Settings_Accelerator DIALOGEX 0, 0, 218, 183
@@ -1247,8 +1246,7 @@ BEGIN
     CONTROL         "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,92,91,10
     CONTROL         "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,92,107,10
-    CONTROL         "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,104,91,10
-    CONTROL         "Protect Memory",IDC_PROTECT_MEMORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,104,91,10
+    CONTROL         "Protect Memory",IDC_PROTECT_MEMORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,104,91,10
 END
 
 IDD_Enhancement_Config DIALOGEX 0, 0, 206, 214

diff --git a/Source/Project64/UserInterface/resource.h b/Source/Project64/UserInterface/resource.h
@@ -331,7 +331,6 @@
 #define IDC_MEMORY_SIZE_TEXT            1153
 #define IDC_SAVE_TYPE_TEXT              1154
 #define IDC_SYNC_AUDIO                  1156
-#define IDC_UNALIGNED_DMA               1158
 #define IDC_RANDOMIZE_SIPI_INTERRUPTS   1159
 #define IDC_PROTECT_MEMORY              1160
 #define IDC_R16_EDIT                    1165