From ed7cb82d3bcecf479fda1687c315d8a8f58d018c Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 12 Jun 2015 07:17:41 +0200
Subject: [PATCH] Compilation fix

---
 radio/src/targets/gruvin9x/board_gruvin9x.h | 20 ++++++++------------
 radio/src/targets/stock/board_stock.h       |  8 ++++----
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/radio/src/targets/gruvin9x/board_gruvin9x.h b/radio/src/targets/gruvin9x/board_gruvin9x.h
index 6c349172b..234767399 100644
--- a/radio/src/targets/gruvin9x/board_gruvin9x.h
+++ b/radio/src/targets/gruvin9x/board_gruvin9x.h
@@ -39,19 +39,21 @@
 
 #include "../common_avr/board_avr.h"
 
+// Keys
 #define KEYS_GPIO_REG_MENU         pinl
+#define KEYS_GPIO_PIN_MENU         (1<<4)
 #define KEYS_GPIO_REG_EXIT         pinl
+#define KEYS_GPIO_PIN_EXIT         (1<<5)
 #define KEYS_GPIO_REG_RIGHT        pinl
+#define KEYS_GPIO_PIN_RIGHT        (1<<2)
 #define KEYS_GPIO_REG_LEFT         pinl
+#define KEYS_GPIO_PIN_LEFT         (1<<3)
 #define KEYS_GPIO_REG_UP           pinl
+#define KEYS_GPIO_PIN_UP           (1<<1)
 #define KEYS_GPIO_REG_DOWN         pinl
-#define KEYS_GPIO_PIN_MENU          (1<<INP_L_KEY_MEN)
-#define KEYS_GPIO_PIN_EXIT          (1<<INP_L_KEY_EXT)
-#define KEYS_GPIO_PIN_UP            (1<<INP_L_KEY_UP)
-#define KEYS_GPIO_PIN_DOWN          (1<<INP_L_KEY_DWN)
-#define KEYS_GPIO_PIN_RIGHT         (1<<INP_L_KEY_RGT)
-#define KEYS_GPIO_PIN_LEFT          (1<<INP_L_KEY_LFT)
+#define KEYS_GPIO_PIN_DOWN         (1<<0)
 
+// Trims
 #define TRIMS_GPIO_REG_LHL           pinj
 #define TRIMS_GPIO_REG_LVD          pinj
 #define TRIMS_GPIO_REG_RVU          pinj
@@ -103,12 +105,6 @@ void sdPoll10ms();
 
 #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
diff --git a/radio/src/targets/stock/board_stock.h b/radio/src/targets/stock/board_stock.h
index 2f60d895a..7362c7eb4 100644
--- a/radio/src/targets/stock/board_stock.h
+++ b/radio/src/targets/stock/board_stock.h
@@ -218,10 +218,10 @@ void processMultiplexAna();
 #define TRIMS_PRESSED()            (~PIND)
 #endif
 #define KEYS_PRESSED()             (~PINB)
-#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & ((1<<INP_B_KEY_RGT) + (1<<INP_B_KEY_LFT))) == ((1<<INP_B_KEY_RGT) + (1<<INP_B_KEY_LFT)))
-#define DBLKEYS_PRESSED_UP_DWN(i)  ((in & ((1<<INP_B_KEY_UP)  + (1<<INP_B_KEY_DWN))) == ((1<<INP_B_KEY_UP)  + (1<<INP_B_KEY_DWN)))
-#define DBLKEYS_PRESSED_RGT_UP(i)  ((in & ((1<<INP_B_KEY_RGT) + (1<<INP_B_KEY_UP)))  == ((1<<INP_B_KEY_RGT) + (1<<INP_B_KEY_UP)))
-#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & ((1<<INP_B_KEY_LFT) + (1<<INP_B_KEY_DWN))) == ((1<<INP_B_KEY_LFT) + (1<<INP_B_KEY_DWN)))
+#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT)) == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT))
+#define DBLKEYS_PRESSED_UP_DWN(i)  ((in & (KEYS_GPIO_PIN_UP  + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_UP  + KEYS_GPIO_PIN_DOWN))
+#define DBLKEYS_PRESSED_RGT_UP(i)  ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))  == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))
+#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN))
 
 // LCD driver
 #define PORTA_LCD_DAT              PORTA