Reduce ACL max queue size back to 10. Increase IPC_HLE freq to 8 KHz to compensate.

This commit is contained in:
Jordan Woyak 2013-02-01 23:44:17 -06:00
parent 15936cb995
commit 286392af9d
2 changed files with 4 additions and 4 deletions

View File

@ -248,10 +248,10 @@ void Init()
DSP_PERIOD = (int)(GetTicksPerSecond() * 0.003f); DSP_PERIOD = (int)(GetTicksPerSecond() * 0.003f);
// AyuanX: TO BE TWEAKED // AyuanX: TO BE TWEAKED
// Now the 1500 is a pure assumption // Now the 1500 is (was) a pure assumption
// We need to figure out the real frequency though // We need to figure out the real frequency though
const int freq = 4000; const int freq = 8000;
const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter.
bVBeam ? 2 : 1; bVBeam ? 2 : 1;
IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields); IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields);

View File

@ -509,13 +509,13 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u16 size, const u16 conn_handle) void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u16 size, const u16 conn_handle)
{ {
if (m_queue.size() >= 100) if (m_queue.size() >= 10)
{ {
// Many simultaneous exchanges of ACL packets tend to cause the // Many simultaneous exchanges of ACL packets tend to cause the
// queue to fill up. Typically, this occurs when // queue to fill up. Typically, this occurs when
// many emulated Wiimotes are requesting connections at once. // many emulated Wiimotes are requesting connections at once.
// See issue 4608 for more info. // See issue 4608 for more info.
ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue size reached 100 - current packet will be " ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue size reached 10 - current packet will be "
"dropped! (Hopefully you never see this.)"); "dropped! (Hopefully you never see this.)");
return; return;
} }