evdev changes to sync with kernel

diff --git a/apps/pndevmapperd.c b/apps/pndevmapperd.c
index c42b942..955dc8d 100644 (file)
--- a/apps/pndevmapperd.c
+++ b/apps/pndevmapperd.c
@@ -476,9 +476,9 @@ int main ( int argc, char *argv[] ) {
       fds [ 1 ] = fd;
     } else if ( strcmp ( name, "AT Translated Set 2 keyboard" ) == 0) { // for vmware, my dev environment
       fds [ 0 ] = fd;
-    } else if ( strcmp ( name, "triton2-pwrbutton" ) == 0) {
+    } else if ( strcmp ( name, PND_EVDEV_POWER/*"triton2-pwrbutton"*/ ) == 0) {
       fds [ 2 ] = fd;
-    } else if ( strcmp ( name, "ADS784x Touchscreen" ) == 0) {
+    } else if ( strcmp ( name, PND_EVDEV_TS/*"ADS784x Touchscreen"*/ ) == 0) {
       fds [ 3 ] = fd;
     } else if ( strcmp ( name, PND_EVDEV_NUB1/*"vsense66"*/ ) == 0) {
       fds [ 4 ] = fd;

diff --git a/include/pnd_device.h b/include/pnd_device.h
index 442adc4..2003cf9 100644 (file)
--- a/include/pnd_device.h
+++ b/include/pnd_device.h
@@ -37,8 +37,8 @@ extern "C" {
 #define PND_EVDEV_NUB2    "nub1" /*"vsense67"*/
 #define PND_EVDEV_KEYPAD  "keypad" /*"omap_twl4030keypad"*/
 #define PND_EVDEV_GPIO    "gpio-keys"
-#define PND_EVDEV_TS      "ADS784x Touchscreen"
-#define PND_EVDEV_POWER   "triton2-pwrbutton"
+#define PND_EVDEV_TS      "touchscreen" /*"ADS784x Touchscreen"*/
+#define PND_EVDEV_POWER   "power-button" /*"triton2-pwrbutton"*/
 
 /* utility
  */