Renamed evdev devices in pnd_Device.c; made evmapperd and io_gpio use pnd_Device...

diff --git a/apps/pndevmapperd.c b/apps/pndevmapperd.c
index 1484aa5..c42b942 100644 (file)
--- a/apps/pndevmapperd.c
+++ b/apps/pndevmapperd.c
@@ -470,7 +470,7 @@ int main ( int argc, char *argv[] ) {
 
     pnd_log ( pndn_rem, "%s maps to %s\n", fname, name );
 
-    if ( strcmp ( name, "omap_twl4030keypad" ) == 0 ) {
+    if ( strcmp ( name, PND_EVDEV_KEYPAD/*"omap_twl4030keypad"*/ ) == 0 ) {
       fds [ 0 ] = fd;
     } else if ( strcmp ( name, "gpio-keys" ) == 0) {
       fds [ 1 ] = fd;
@@ -480,9 +480,9 @@ int main ( int argc, char *argv[] ) {
       fds [ 2 ] = fd;
     } else if ( strcmp ( name, "ADS784x Touchscreen" ) == 0) {
       fds [ 3 ] = fd;
-    } else if ( strcmp ( name, "vsense66" ) == 0) {
+    } else if ( strcmp ( name, PND_EVDEV_NUB1/*"vsense66"*/ ) == 0) {
       fds [ 4 ] = fd;
-    } else if ( strcmp ( name, "vsense67" ) == 0) {
+    } else if ( strcmp ( name, PND_EVDEV_NUB1/*"vsense67"*/ ) == 0) {
       fds [ 5 ] = fd;
     } else {
       pnd_log ( pndn_rem, "Ignoring unknown device '%s'\n", name );

diff --git a/include/pnd_device.h b/include/pnd_device.h
index 09437f7..442adc4 100644 (file)
--- a/include/pnd_device.h
+++ b/include/pnd_device.h
@@ -33,9 +33,9 @@ extern "C" {
 #define PND_DEVICE_LED_SUFFIX_BRIGHTNESS "/brightness"
 
 // device names
-#define PND_EVDEV_NUB1    "vsense66"
-#define PND_EVDEV_NUB2    "vsense67"
-#define PND_EVDEV_KEYPAD  "omap_twl4030keypad"
+#define PND_EVDEV_NUB1    "nub0" /*"vsense66"*/
+#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"

diff --git a/lib/pnd_io_gpio.c b/lib/pnd_io_gpio.c
index d36c2ab..d8824aa 100755 (executable)
--- a/lib/pnd_io_gpio.c
+++ b/lib/pnd_io_gpio.c
@@ -17,6 +17,7 @@
 
 #include "pnd_io_gpio.h"
 //#include "pnd_keytype.h"
+#include "pnd_device.h"
 
 unsigned char GLES2D_Pad [ pke_pad_max ];
 
@@ -29,9 +30,9 @@ unsigned long bit[EV_MAX][NBITS(KEY_MAX)];
 char dev_name[256] = "Unknown";
 int absolute[5];
 
-char pnd_nub1[9]  = "vsense66";
-char pnd_nub2[9]  = "vsense67";
-char pnd_key[19]  = "omap_twl4030keypad";
+char pnd_nub1[9]  = PND_EVDEV_NUB1; //"vsense66";
+char pnd_nub2[9]  = PND_EVDEV_NUB2; //"vsense67";
+char pnd_key[19]  = PND_EVDEV_KEYPAD; //"omap_twl4030keypad";
 char pnd_gpio[10] = "gpio-keys";
 
 #define DEV_NUB1 0