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

After removing the input queueing in IOdarwin.mm I was still seeing 

the occasional HLE wiimote disconnection, although nowhere it was at     
near the level before both the recent wiiuse integration and adding 
the queue in the first place.

The callback-based bluetooth input method on OS X really requires     
that packets be accepted immediately and the 1ms polling done by the 
wiimote worker threads isn't quite good enough.

So just play along with the native OS X model and send the packet up
our stack directly from the callback. With our current API, this is  
kind of a layering violation, but it seems less messy than either
putting back internal queueing in IOdarwin.mm or adding the platform
support for higher-frequency polling than what usleep(3) offers.

Perhaps we should just change our own API to a callback model. While
this makes no real difference right now, it would make it a fair bit
cleaner to accept new wiimotes at any time instead of having to click
Refresh, although with the recent realmote changes, that feature can
probably just be hacked in by looping around FindWiimotes().
 
For other platforms having problems with HLE disconnections caused by
dropped bluetooth packets, as a first stop I would suggest trying to    
do more than just one wiimote->Read() per iteration in the thread.
 
This change also conveniently sidesteps another new IOdarwin.mm bug 
where the discovery and I/O code would clash during a refresh because     
they use the same default CFRunLoop, so if we switch back to using a
run loop for I/O, must remember to create a separate one.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6743 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-05 01:45:36 +00:00
parent 1fbf53cbdf
commit 012939d127
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
View File

@ -70,7 +70,7 @@ extern "C" OSErr UpdateSystemActivity(UInt8 activity);
memcpy(wm->input, data, length); memcpy(wm->input, data, length);
wm->inputlen = length; wm->inputlen = length;
CFRunLoopStop(CFRunLoopGetCurrent()); (void)wm->Read();
(void)UpdateSystemActivity(1); (void)UpdateSystemActivity(1);
} }
@ -125,7 +125,7 @@ int FindWiimotes(Wiimote **wm, int max_wiimotes)
} }
sbt = [[SearchBT alloc] init]; sbt = [[SearchBT alloc] init];
sbt->maxDevices = max_wiimotes; sbt->maxDevices = max_wiimotes - found_wiimotes;
bti = [[IOBluetoothDeviceInquiry alloc] init]; bti = [[IOBluetoothDeviceInquiry alloc] init];
[bti setDelegate: sbt]; [bti setDelegate: sbt];
[bti setInquiryLength: 5]; [bti setInquiryLength: 5];
@ -226,11 +226,6 @@ int Wiimote::IORead(unsigned char *buf)
if (!IsConnected()) if (!IsConnected())
return 0; return 0;
if (inputlen == 0) {
CFRunLoopRunInMode(kCFRunLoopDefaultMode, 1, true);
return 0;
}
bytes = inputlen; bytes = inputlen;
memcpy(buf, input, bytes); memcpy(buf, input, bytes);
inputlen = 0; inputlen = 0;

2
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -543,8 +543,10 @@ THREAD_RETURN WiimoteThreadFunc(void* arg)
// hopefully this is alright // hopefully this is alright
while (wiimote->Write()) {} while (wiimote->Write()) {}
#ifndef __APPLE__
// sleep if there was nothing to read // sleep if there was nothing to read
if (false == wiimote->Read()) if (false == wiimote->Read())
#endif
Common::SleepCurrentThread(1); Common::SleepCurrentThread(1);
} }