Updated linux plugin to build under Linux 2.6.5-7.151

Note, these are hacky fixes that may break it under earlier versions of Linux. Sorry.


git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@86 e343933a-64c8-49c5-92b1-88f2ce3e89e8

2 files changed, 9 insertions, 9 deletions

diff --git a/plugins/linux/src/native/EventDevice.cpp b/plugins/linux/src/native/EventDevice.cpp
index 668b6c4..6598ab6 100644
--- a/plugins/linux/src/native/EventDevice.cpp
+++ b/plugins/linux/src/native/EventDevice.cpp
@@ -190,7 +190,7 @@ EventDevice::EventDevice(char *deviceFileName) {
         sprintf(errorMessage, "Error reading device %s\n", deviceFileName);
         perror(errorMessage);
       }
-      absAxesData[i] = abs_features[i].curr_value;
+      absAxesData[i] = abs_features[i].value;
     }
   }
 
@@ -334,9 +334,6 @@ int EventDevice::poll(){
         //printf("abs axis %d translates to abs axis %d on this device\n", events[i].code, axisIndex);
         break;
       }
-      case EV_RST:
-        // not sure what to do here, doing nothing seems to work :)
-        break;
       case EV_LED:
         // reveiced for things like numlock led change
         break;
@@ -363,11 +360,11 @@ void EventDevice::getPolledData(int relAxesData[], int absAxesData[], int button
 }
 
 int EventDevice::getAbsAxisMinimum(int axisNumber) {
-  return abs_features[axisNumber].min_value;
+  return abs_features[axisNumber].minimum;
 }
 
 int EventDevice::getAbsAxisMaximum(int axisNumber) {
-  return abs_features[axisNumber].max_value;
+  return abs_features[axisNumber].maximum;
 }
 
 int EventDevice::getAbsAxisFuzz(int axisNumber) {
diff --git a/plugins/linux/src/native/eventInterfaceTypes.h b/plugins/linux/src/native/eventInterfaceTypes.h
index 2f1f936..c8ffd6e 100644
--- a/plugins/linux/src/native/eventInterfaceTypes.h
+++ b/plugins/linux/src/native/eventInterfaceTypes.h
@@ -13,12 +13,15 @@ struct input_devinfo {
         uint16_t version;
 };
 
+
+/** removed for compatability with input.h --JPK
 struct input_absinfo {
-  int curr_value;
-  int min_value;
-  int max_value;
+  int value;
+  int minimum;
+  int maximum;
   int fuzz;
   int flat;
 };
+*/
 
 #endif //eventInterfaceTypes_h