From 11a4c92325d54fa2ae45d134d51e7c72d2d329a7 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 1 Feb 2013 21:36:16 -0600 Subject: [PATCH] Remove "Alternate Wiimote Timing" option. It's no longer needed. Also kill some irrelevant comments. --- Source/Core/Core/Src/BootManager.cpp | 5 +---- Source/Core/Core/Src/CoreParameter.cpp | 6 ++---- Source/Core/Core/Src/CoreParameter.h | 1 - Source/Core/Core/Src/HW/SystemTimers.cpp | 6 ++---- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 14 ++------------ Source/Core/DolphinWX/Src/ISOProperties.cpp | 14 -------------- Source/Core/DolphinWX/Src/ISOProperties.h | 3 +-- 7 files changed, 8 insertions(+), 41 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index b867052381..1e9e612fe0 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -55,7 +55,7 @@ namespace BootManager struct ConfigCache { bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, - bVBeam, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bDisableWiimoteSpeaker, bHLE_BS2; + bVBeam, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2; int iTLBHack, iCPUCore; std::string strBackend; }; @@ -98,7 +98,6 @@ bool BootCore(const std::string& _rFilename) config_cache.bFastDiscSpeed = StartUp.bFastDiscSpeed; config_cache.bMergeBlocks = StartUp.bMergeBlocks; config_cache.bDSPHLE = StartUp.bDSPHLE; - config_cache.bDisableWiimoteSpeaker = StartUp.bDisableWiimoteSpeaker; config_cache.strBackend = StartUp.m_strVideoBackend; config_cache.bHLE_BS2 = StartUp.bHLE_BS2; @@ -113,7 +112,6 @@ bool BootCore(const std::string& _rFilename) game_ini.Get("Core", "FastDiscSpeed", &StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed); game_ini.Get("Core", "BlockMerging", &StartUp.bMergeBlocks, StartUp.bMergeBlocks); game_ini.Get("Core", "DSPHLE", &StartUp.bDSPHLE, StartUp.bDSPHLE); - game_ini.Get("Wii", "DisableWiimoteSpeaker",&StartUp.bDisableWiimoteSpeaker, StartUp.bDisableWiimoteSpeaker); game_ini.Get("Core", "GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend.c_str()); game_ini.Get("Core", "CPUCore", &StartUp.iCPUCore, StartUp.iCPUCore); game_ini.Get("Core", "HLE_BS2", &StartUp.bHLE_BS2, StartUp.bHLE_BS2); @@ -173,7 +171,6 @@ void Stop() StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed; StartUp.bMergeBlocks = config_cache.bMergeBlocks; StartUp.bDSPHLE = config_cache.bDSPHLE; - StartUp.bDisableWiimoteSpeaker = config_cache.bDisableWiimoteSpeaker; StartUp.m_strVideoBackend = config_cache.strBackend; VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); StartUp.bHLE_BS2 = config_cache.bHLE_BS2; diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 7f019bcf59..a7a44be5ea 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -51,8 +51,8 @@ SCoreStartupParameter::SCoreStartupParameter() bRunCompareServer(false), bRunCompareClient(false), bMMU(false), bDCBZOFF(false), iTLBHack(0), bVBeam(false), bFastDiscSpeed(false), - SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false), - bConfirmStop(false), bHideCursor(false), + SelectedLanguage(0), bWii(false), + bConfirmStop(false), bHideCursor(false), bAutoHideCursor(false), bUsePanicHandlers(true), bOnScreenDisplayMessages(true), iRenderWindowXPos(-1), iRenderWindowYPos(-1), iRenderWindowWidth(640), iRenderWindowHeight(480), @@ -99,8 +99,6 @@ void SCoreStartupParameter::LoadDefaults() bJITPairedOff = false; bJITSystemRegistersOff = false; - bDisableWiimoteSpeaker = false; - m_strName = "NONE"; m_strUniqueID = "00000000"; } diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index e2e5eb6f1b..55d20b7b1b 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -121,7 +121,6 @@ struct SCoreStartupParameter int SelectedLanguage; bool bWii; - bool bDisableWiimoteSpeaker; // Interface settings bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers, bOnScreenDisplayMessages; diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index b9f9fe0107..bfeeb36b51 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -251,12 +251,10 @@ void Init() // Now the 1500 is a pure assumption // We need to figure out the real frequency though - // FIXME: does Wiimote Speaker support really require a different interval? (issue 4608) - const int interval = SConfig::GetInstance().m_LocalCoreStartupParameter. - bDisableWiimoteSpeaker ? 15000 : 4000; + const int freq = 4000; const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. bVBeam ? 2 : 1; - IPC_HLE_PERIOD = GetTicksPerSecond() / (interval * fields); + IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields); } else { diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 050cfe66eb..0391026023 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -485,18 +485,8 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update() } } - // The Real Wiimote sends report every ~6.66ms (150 Hz). - // However, we don't actually reach here at dependable intervals, so we - // instead just timeslice in such a way that makes the stack think we have - // perfect "radio quality" (WPADGetRadioSensitivity) and yet still have some - // idle time. - // Somehow, Dolphin's Wiimote Speaker support requires using an update interval - // of 5ms (200 Hz) for its output to work. This increased frequency tends to - // fill the ACL queue (even) quicker than it can be processed by Dolphin, - // especially during simultaneous requests involving many (emulated) Wiimotes... - // Thus, we only use that interval when the option is enabled. See issue 4608. - const u64 interval = SystemTimers::GetTicksPerSecond() / (SConfig::GetInstance(). - m_LocalCoreStartupParameter.bDisableWiimoteSpeaker ? 150 : 200); + // The Real Wiimote sends report every ~5ms (200 Hz). + const u64 interval = SystemTimers::GetTicksPerSecond() / 200; const u64 each_wiimote_interval = interval / m_WiiMotes.size(); const u64 now = CoreTiming::GetTicks(); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 6a673b95d1..c44aad5d5b 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -328,8 +328,6 @@ void CISOProperties::CreateGUIControls(bool IsWad) // Wii Console EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - DisableWiimoteSpeaker = new wxCheckBox(m_GameConfig, ID_DISABLEWIIMOTESPEAKER, _("Alternate Wiimote Timing"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - DisableWiimoteSpeaker->SetToolTip(_("Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes.")); // Video UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER); @@ -377,10 +375,8 @@ void CISOProperties::CreateGUIControls(bool IsWad) { sbWiiOverrides->ShowItems(false); EnableWideScreen->Hide(); - DisableWiimoteSpeaker->Hide(); } sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5); - sbWiiOverrides->Add(DisableWiimoteSpeaker, 0, wxLEFT, 5); wxStaticBoxSizer * const sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video")); @@ -966,11 +962,6 @@ void CISOProperties::LoadGameConfig() else EnableWideScreen->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Wii", "DisableWiimoteSpeaker", &bTemp)) - DisableWiimoteSpeaker->Set3StateValue((wxCheckBoxState)bTemp); - else - DisableWiimoteSpeaker->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Video", "UseBBox", &bTemp)) UseBBox->Set3StateValue((wxCheckBoxState)bTemp); else @@ -1059,11 +1050,6 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Wii", "Widescreen", EnableWideScreen->Get3StateValue()); - if (DisableWiimoteSpeaker->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Wii", "DisableWiimoteSpeaker"); - else - GameIni.Set("Wii", "DisableWiimoteSpeaker", DisableWiimoteSpeaker->Get3StateValue()); - if (UseBBox->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Video", "UseBBox"); else diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index 4f03130ba7..499b242516 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -72,7 +72,7 @@ private: wxCheckBox *CPUThread, *SkipIdle, *MMU, *DCBZOFF, *TLBHack; wxCheckBox *VBeam, *FastDiscSpeed, *BlockMerging, *DSPHLE; // Wii - wxCheckBox *EnableWideScreen, *DisableWiimoteSpeaker; + wxCheckBox *EnableWideScreen; // Video wxCheckBox *UseZTPSpeedupHack, *PHackEnable, *UseBBox; wxButton *PHSettings; @@ -139,7 +139,6 @@ private: ID_PHSETTINGS, ID_ENABLEPROGRESSIVESCAN, ID_ENABLEWIDESCREEN, - ID_DISABLEWIIMOTESPEAKER, ID_EDITCONFIG, ID_EMUSTATE, ID_EMU_ISSUES,