Fix even more leaks

[pandora-libraries.git] / lib / pnd_io_gpio.c

diff --git a/lib/pnd_io_gpio.c b/lib/pnd_io_gpio.c
index 23105e5..0e666ef 100755 (executable)
--- a/lib/pnd_io_gpio.c
+++ b/lib/pnd_io_gpio.c
@@ -1,4 +1,6 @@
 
+// this is pulled from cpasjuste and/or pickle
+
 #if defined (_PANDORA) || !defined (EMULATOR)
 
 /* cribbed from pnd_keytypes.h so as to make it unnecessary */
@@ -15,6 +17,7 @@
 
 #include "pnd_io_gpio.h"
 //#include "pnd_keytype.h"
+#include "pnd_device.h"
 
 unsigned char GLES2D_Pad [ pke_pad_max ];
 
@@ -27,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
@@ -87,7 +90,7 @@ void PND_ReadEvents ( int fd, int device ) {
        PND_CheckEvent ( &ev[i], device );
       }
     }
-  
+
   } // got fd?
 
   return;
@@ -107,7 +110,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
     switch( event->code ) {
 
     case KEY_UP:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_up] = 1;
       }        else {
        GLES2D_Pad[pke_pad_up] = 0;
@@ -115,7 +118,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
 
     case KEY_DOWN:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_down] = 1;
       } else {
        GLES2D_Pad[pke_pad_down] = 0;
@@ -123,7 +126,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
 
     case KEY_LEFT:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_left] = 1;
       }        else {
        GLES2D_Pad[pke_pad_left] = 0;
@@ -131,7 +134,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
 
     case KEY_RIGHT:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_right] = 1;
       }        else {
        GLES2D_Pad[pke_pad_right] = 0;
@@ -139,7 +142,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
 
     case KEY_MENU:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_menu] = 1;
       }        else {
        GLES2D_Pad[pke_pad_menu] = 0;
@@ -155,7 +158,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
 
     case BTN_X:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_x] = 1;
       }        else {
        GLES2D_Pad[pke_pad_x] = 0;
@@ -163,7 +166,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
 
     case BTN_Y:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_y] = 1;
       }        else {
        GLES2D_Pad[pke_pad_y] = 0;
@@ -171,7 +174,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
 
     case BTN_A:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_a] = 1;
       }        else {
        GLES2D_Pad[pke_pad_a] = 0;
@@ -179,7 +182,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
 
     case BTN_B:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_b] = 1;
       }        else {
        GLES2D_Pad[pke_pad_b] = 0;
@@ -187,7 +190,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
 
     case BTN_TL:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_l] = 1;
       }        else {
        GLES2D_Pad[pke_pad_l] = 0;
@@ -195,7 +198,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
 
     case BTN_TR:
-      if ( event->value ) {    
+      if ( event->value ) {
        GLES2D_Pad[pke_pad_r] = 1;
       }        else {
        GLES2D_Pad[pke_pad_r] = 0;
@@ -206,7 +209,7 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
       break;
     }
     break;
-    
+
   case EV_ABS:
 
     switch ( device ) {
@@ -218,12 +221,12 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
          if( value > 0 ) {
            value = 1;
          } else if( value < 0 ) {
-           value = 1;                                              
+           value = 1;
          }
        } else {
        }
       }
-       
+
       if( event->code == ABS_Y ) {
        //printf( "nub1 y %3d\n", value );
        if( abs(value) > NUB1_CUTOFF ) {
@@ -244,12 +247,12 @@ void PND_CheckEvent ( struct input_event *event, int device ) {
          if( value > 0 ) {
            value = 1;
          } else if( value < 0 ) {
-           value = 1;                                              
+           value = 1;
          }
        } else {
        }
       }
-       
+
       if(event->code == ABS_Y) {
        //printf( "nub2 y %3d\n", value );
        if( abs(value) > NUB2_CUTOFF ) {
@@ -329,7 +332,7 @@ int PND_OpenEventDeviceByName ( char device_name[] ) {
 
       ioctl(fd, EVIOCGNAME(sizeof(dev_name)), dev_name);
       printf("Input device name: \"%s\"\n", dev_name);
-                 
+
       return fd;
     }