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

Merge pull request #8462 from jordan-woyak/wm-real-linux-fix 

HW/WiimoteReal: Linux fix.
This commit is contained in:
Léo Lam 2019-11-10 13:24:59 +01:00 committed by GitHub
parent eebc64aaf8 e85e51e5ce
commit 7fa5a95800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/Core/HW/WiimoteReal/IOLinux.cpp
View File

@ -6,7 +6,7 @@
#include <bluetooth/hci.h> #include <bluetooth/hci.h>
#include <bluetooth/hci_lib.h> #include <bluetooth/hci_lib.h>
#include <bluetooth/l2cap.h> #include <bluetooth/l2cap.h>
#include <sys/select.h> #include <sys/poll.h>
#include <unistd.h> #include <unistd.h>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
@ -223,20 +223,23 @@ void WiimoteLinux::IOWakeup()
// zero = error // zero = error
int WiimoteLinux::IORead(u8* buf) int WiimoteLinux::IORead(u8* buf)
{ {
// Block select for 1/2000th of a second std::array<pollfd, 2> pollfds = {};
fd_set fds; auto& poll_wakeup = pollfds[0];
FD_ZERO(&fds); poll_wakeup.fd = m_wakeup_pipe_r;
FD_SET(m_int_sock, &fds); poll_wakeup.events = POLLIN;
FD_SET(m_wakeup_pipe_r, &fds);
if (select(m_int_sock + 1, &fds, nullptr, nullptr, nullptr) == -1) auto& poll_sock = pollfds[1];
poll_sock.fd = m_int_sock;
poll_sock.events = POLLIN;
if (poll(pollfds.data(), pollfds.size(), -1) == -1)
{ {
ERROR_LOG(WIIMOTE, "Unable to select Wiimote %i input socket.", m_index + 1); ERROR_LOG(WIIMOTE, "Unable to poll Wiimote %i input socket.", m_index + 1);
return -1; return -1;
} }
if (FD_ISSET(m_wakeup_pipe_r, &fds)) if (poll_wakeup.revents & POLLIN)
{ {
char c; char c;
if (read(m_wakeup_pipe_r, &c, 1) != 1) if (read(m_wakeup_pipe_r, &c, 1) != 1)
@ -246,7 +249,7 @@ int WiimoteLinux::IORead(u8* buf)
return -1; return -1;
} }
if (!FD_ISSET(m_int_sock, &fds)) if (!(poll_sock.revents & POLLIN))
return -1; return -1;
// Read the pending message into the buffer // Read the pending message into the buffer