ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Changed select to poll.

This commit is contained in:
Damjan Jovanovic 2006-11-06 08:28:29 +02:00 committed by Alexandre Julliard
parent 0082973d93
commit b56953f49d
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/dinput/joystick_linux.c
View File

@ -53,6 +53,9 @@
#ifdef HAVE_LINUX_JOYSTICK_H #ifdef HAVE_LINUX_JOYSTICK_H
# include <linux/joystick.h> # include <linux/joystick.h>
#endif #endif
#ifdef HAVE_SYS_POLL_H
# include <sys/poll.h>
#endif
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
@ -897,8 +900,7 @@ static LONG calculate_pov(JoystickImpl *This, int index)
} }
static void joy_polldev(JoystickImpl *This) { static void joy_polldev(JoystickImpl *This) {
struct timeval tv; struct pollfd plfd;
fd_set readfds;
struct js_event jse; struct js_event jse;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
@ -907,9 +909,9 @@ static void joy_polldev(JoystickImpl *This) {
return; return;
} }
while (1) { while (1) {
memset(&tv,0,sizeof(tv)); plfd.fd = This->joyfd;
FD_ZERO(&readfds);FD_SET(This->joyfd,&readfds); plfd.events = POLLIN;
if (1>select(This->joyfd+1,&readfds,NULL,NULL,&tv)) if (poll(&plfd,1,0) != 1)
return; return;
/* we have one event, so we can read */ /* we have one event, so we can read */
if (sizeof(jse)!=read(This->joyfd,&jse,sizeof(jse))) { if (sizeof(jse)!=read(This->joyfd,&jse,sizeof(jse))) {

13
dlls/dinput/joystick_linuxinput.c
View File

@ -48,6 +48,9 @@
# define HAVE_CORRECT_LINUXINPUT_H # define HAVE_CORRECT_LINUXINPUT_H
# endif # endif
#endif #endif
#ifdef HAVE_SYS_POLL_H
# include <sys/poll.h>
#endif
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
@ -860,8 +863,7 @@ static void calculate_ids(LPDIDATAFORMAT df)
} }
static void joy_polldev(JoystickImpl *This) { static void joy_polldev(JoystickImpl *This) {
struct timeval tv; struct pollfd plfd;
fd_set readfds;
struct input_event ie; struct input_event ie;
int btn, offset; int btn, offset;
@ -869,11 +871,10 @@ static void joy_polldev(JoystickImpl *This) {
return; return;
while (1) { while (1) {
memset(&tv,0,sizeof(tv)); plfd.fd = This->joyfd;
FD_ZERO(&readfds); plfd.events = POLLIN;
FD_SET(This->joyfd,&readfds);
if (1>select(This->joyfd+1,&readfds,NULL,NULL,&tv)) if (poll(&plfd,1,0) != 1)
return; return;
/* we have one event, so we can read */ /* we have one event, so we can read */