commit dd174c54e13e5d3cf27c396128d179dcbf1e5560
author Mike Frysinger <vapier@gentoo.org> Tue Apr 18 18:58:44 2006 -0400
committer Alexandre Julliard <julliard@winehq.org> Wed Apr 19 19:27:41 2006 +0200
tree c75749085534e07d9fb94c02c8aaaaa70facd79e
parent 162d9cb6f429d3d1143b8057de95767106463d90

joystick: Search for /dev/input/js as well as /dev/js.

dlls/winmm/joystick/joystick.c

diff --git a/dlls/winmm/joystick/joystick.c b/dlls/winmm/joystick/joystick.c
index a5914e9..2e04e31 100644
--- a/dlls/winmm/joystick/joystick.c
+++ b/dlls/winmm/joystick/joystick.c
@@ -54,7 +54,8 @@
 #endif
 #ifdef HAVE_LINUX_JOYSTICK_H
 #include <linux/joystick.h>
-#define JOYDEV "/dev/js%d"
+#define JOYDEV_NEW "/dev/input/js%d"
+#define JOYDEV_OLD "/dev/js%d"
 #endif
 #ifdef HAVE_SYS_ERRNO_H
 #include <sys/errno.h>
@@ -166,12 +167,15 @@
     if (jstick->dev > 0)
       return jstick->dev;
 
-    sprintf(buf, JOYDEV, jstick->joyIntf);
+    sprintf(buf, JOYDEV_NEW, jstick->joyIntf);
 #ifdef HAVE_LINUX_22_JOYSTICK_API
     flags = O_RDONLY | O_NONBLOCK;
 #else
     flags = O_RDONLY;
 #endif
+    if ((jstick->dev = open(buf, flags)) < 0) {
+        sprintf(buf, JOYDEV_OLD, jstick->joyIntf);
+    }
     return (jstick->dev = open(buf, flags));
 }