From 3cfed9b80cb8864b443a5ade6277a35bec7d87cf Mon Sep 17 00:00:00 2001
From: "gruvin@gmail.com"
 <gruvin@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Wed, 19 Sep 2012 07:10:06 +0000
Subject: [PATCH] Corrected IN_P* references to correct names, INP_L* (G9X v4
 board). No other changes.

---
 src/open9x.h      | 24 ++++++++++++------------
 src/simpgmspace.h | 16 ++++++++--------
 src/simu.cpp      | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/open9x.h b/src/open9x.h
index df221401d..f2f6a871c 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -180,14 +180,14 @@ extern uint8_t s_bind_allowed;
 
 #if defined (PCBV4)
 
-#  define INP_P_SPARE6    7
-#  define INP_P_SPARE5    6
-#  define INP_P_KEY_EXT   5
-#  define INP_P_KEY_MEN   4
-#  define INP_P_KEY_LFT   3
-#  define INP_P_KEY_RGT   2
-#  define INP_P_KEY_UP    1
-#  define INP_P_KEY_DWN   0
+#  define INP_L_SPARE6    7
+#  define INP_L_SPARE5    6
+#  define INP_L_KEY_EXT   5
+#  define INP_L_KEY_MEN   4
+#  define INP_L_KEY_LFT   3
+#  define INP_L_KEY_RGT   2
+#  define INP_L_KEY_UP    1
+#  define INP_L_KEY_DWN   0
 
 #  define INP_J_TRM_RH_UP   7
 #  define INP_J_TRM_RH_DWN  6
@@ -247,10 +247,10 @@ inline uint8_t KEYS_PRESSED()
   return in;
 }
 
-#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & ((1<<INP_P_KEY_RGT) + (1<<INP_P_KEY_LFT))) == ((1<<INP_P_KEY_RGT) + (1<<INP_P_KEY_LFT)))
-#define DBLKEYS_PRESSED_UP_DWN(i)  ((in & ((1<<INP_P_KEY_UP)  + (1<<INP_P_KEY_DWN))) == ((1<<INP_P_KEY_UP)  + (1<<INP_P_KEY_DWN)))
-#define DBLKEYS_PRESSED_RGT_UP(i)  ((in & ((1<<INP_P_KEY_RGT) + (1<<INP_P_KEY_UP)))  == ((1<<INP_P_KEY_RGT) + (1<<INP_P_KEY_UP)))
-#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & ((1<<INP_P_KEY_LFT) + (1<<INP_P_KEY_DWN))) == ((1<<INP_P_KEY_LFT) + (1<<INP_P_KEY_DWN)))
+#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & ((1<<INP_L_KEY_RGT) + (1<<INP_L_KEY_LFT))) == ((1<<INP_L_KEY_RGT) + (1<<INP_L_KEY_LFT)))
+#define DBLKEYS_PRESSED_UP_DWN(i)  ((in & ((1<<INP_L_KEY_UP)  + (1<<INP_L_KEY_DWN))) == ((1<<INP_L_KEY_UP)  + (1<<INP_L_KEY_DWN)))
+#define DBLKEYS_PRESSED_RGT_UP(i)  ((in & ((1<<INP_L_KEY_RGT) + (1<<INP_L_KEY_UP)))  == ((1<<INP_L_KEY_RGT) + (1<<INP_L_KEY_UP)))
+#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & ((1<<INP_L_KEY_LFT) + (1<<INP_L_KEY_DWN))) == ((1<<INP_L_KEY_LFT) + (1<<INP_L_KEY_DWN)))
 
 
 #elif defined(PCBSTD) // stock board ...
diff --git a/src/simpgmspace.h b/src/simpgmspace.h
index effa67b31..5722abb73 100644
--- a/src/simpgmspace.h
+++ b/src/simpgmspace.h
@@ -247,14 +247,14 @@ extern void rxPdcUsart( void (*pChProcess)(uint8_t x) );
 #define INP_B_KEY_EXT 2
 #define INP_B_KEY_MEN 1
 
-#define INP_P_SPARE6    7
-#define INP_P_SPARE5    6
-#define INP_P_KEY_EXT   5
-#define INP_P_KEY_MEN   4
-#define INP_P_KEY_LFT   3
-#define INP_P_KEY_RGT   2
-#define INP_P_KEY_UP    1
-#define INP_P_KEY_DWN   0
+#define INP_L_SPARE6    7
+#define INP_L_SPARE5    6
+#define INP_L_KEY_EXT   5
+#define INP_L_KEY_MEN   4
+#define INP_L_KEY_LFT   3
+#define INP_L_KEY_RGT   2
+#define INP_L_KEY_UP    1
+#define INP_L_KEY_DWN   0
 
 #define WGM10   0
 #define WGM12   0
diff --git a/src/simu.cpp b/src/simu.cpp
index b3f8a33fd..14291b085 100644
--- a/src/simu.cpp
+++ b/src/simu.cpp
@@ -257,16 +257,16 @@ long Open9xSim::onTimeout(FXObject*,FXSelector,void*)
 #define ERSKY9X_LEFT_MASK  (0x40 >> 1)
 #endif
     static uint64_t keys1[]={
-      KEY_Return,    INP_B_KEY_MEN, INP_P_KEY_MEN, (uint64_t)PIOB, ERSKY9X_MENU_MASK,
-      KEY_Page_Up,   INP_B_KEY_MEN, INP_P_KEY_MEN, (uint64_t)PIOB, ERSKY9X_MENU_MASK,
-      KEY_KP_1,      INP_B_KEY_MEN, INP_P_KEY_MEN, (uint64_t)PIOB, ERSKY9X_MENU_MASK,
-      KEY_Page_Down, INP_B_KEY_EXT, INP_P_KEY_EXT, (uint64_t)ERSKY9X_EXIT_PIO, ERSKY9X_EXIT_MASK,
-      KEY_BackSpace, INP_B_KEY_EXT, INP_P_KEY_EXT, (uint64_t)ERSKY9X_EXIT_PIO, ERSKY9X_EXIT_MASK,
-      KEY_KP_0,      INP_B_KEY_EXT, INP_P_KEY_EXT, (uint64_t)ERSKY9X_EXIT_PIO, ERSKY9X_EXIT_MASK,
-      KEY_Down,      INP_B_KEY_DWN, INP_P_KEY_DWN, (uint64_t)PIOC, ERSKY9X_DOWN_MASK,
-      KEY_Up,        INP_B_KEY_UP,  INP_P_KEY_UP,  (uint64_t)PIOC, ERSKY9X_UP_MASK,
-      KEY_Right,     INP_B_KEY_RGT, INP_P_KEY_RGT, (uint64_t)PIOC, ERSKY9X_RIGHT_MASK,
-      KEY_Left,      INP_B_KEY_LFT, INP_P_KEY_LFT, (uint64_t)PIOC, ERSKY9X_LEFT_MASK,
+      KEY_Return,    INP_B_KEY_MEN, INP_L_KEY_MEN, (uint64_t)PIOB, ERSKY9X_MENU_MASK,
+      KEY_Page_Up,   INP_B_KEY_MEN, INP_L_KEY_MEN, (uint64_t)PIOB, ERSKY9X_MENU_MASK,
+      KEY_KP_1,      INP_B_KEY_MEN, INP_L_KEY_MEN, (uint64_t)PIOB, ERSKY9X_MENU_MASK,
+      KEY_Page_Down, INP_B_KEY_EXT, INP_L_KEY_EXT, (uint64_t)ERSKY9X_EXIT_PIO, ERSKY9X_EXIT_MASK,
+      KEY_BackSpace, INP_B_KEY_EXT, INP_L_KEY_EXT, (uint64_t)ERSKY9X_EXIT_PIO, ERSKY9X_EXIT_MASK,
+      KEY_KP_0,      INP_B_KEY_EXT, INP_L_KEY_EXT, (uint64_t)ERSKY9X_EXIT_PIO, ERSKY9X_EXIT_MASK,
+      KEY_Down,      INP_B_KEY_DWN, INP_L_KEY_DWN, (uint64_t)PIOC, ERSKY9X_DOWN_MASK,
+      KEY_Up,        INP_B_KEY_UP,  INP_L_KEY_UP,  (uint64_t)PIOC, ERSKY9X_UP_MASK,
+      KEY_Right,     INP_B_KEY_RGT, INP_L_KEY_RGT, (uint64_t)PIOC, ERSKY9X_RIGHT_MASK,
+      KEY_Left,      INP_B_KEY_LFT, INP_L_KEY_LFT, (uint64_t)PIOC, ERSKY9X_LEFT_MASK,
     };
 
 #if defined(PCBARM)