[Plib-cvs] plib/src/js js.h,1.17,1.18

[Sebastian U. <ud...@us...>]

Update of /cvsroot/plib/plib/src/js
In directory usw-pr-cvs1:/tmp/cvs-serv18843

Modified Files:
	js.h 
Log Message:
With Linux, also check for joystick devices using the devfs naming scheme

Index: js.h
===================================================================
RCS file: /cvsroot/plib/plib/src/js/js.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- js.h	18 Apr 2002 19:54:34 -0000	1.17
+++ js.h	22 Jun 2002 02:38:17 -0000	1.18
@@ -132,9 +132,9 @@
 
 
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+/*#if defined(__FreeBSD__) || defined(__NetBSD__)
   int          id ;
-#endif
+#endif*/
 #ifdef WIN32
   JOYINFOEX    js       ;
   UINT         js_id    ;
@@ -495,10 +495,12 @@
 
 #else
 #  if defined(__FreeBSD__) || defined(__NetBSD__)
-    id = ident;
+    //id = ident;
     sprintf ( fname, "/dev/joy%d", ident ) ;
 #  else
-    sprintf ( fname, "/dev/js%d", ident ) ;
+    sprintf ( fname, "/dev/input/js%d", ident ) ;
+    if ( access ( fname, F_OK ) != 0 )
+      sprintf ( fname, "/dev/js%d", ident ) ;
 #  endif
     open () ;
 #endif