1 files changed, 21 insertions, 20 deletions

diff --git a/firmware/drivers/tuner/lv24020lp.c b/firmware/drivers/tuner/lv24020lp.c
index 0f05d90ea2..9d6425b962 100644
--- a/firmware/drivers/tuner/lv24020lp.c
+++ b/firmware/drivers/tuner/lv24020lp.c
@@ -61,16 +61,17 @@ static int fd_log = -1;
 /** tuner register defines **/
 
 #if defined(SANSA_E200) || defined(SANSA_C200)
-#define GPIO_OUTPUT_EN  GPIOH_OUTPUT_EN
-#define GPIO_OUTPUT_VAL GPIOH_OUTPUT_VAL
-#define GPIO_INPUT_VAL  GPIOH_INPUT_VAL
+#define TUNER_GPIO_OUTPUT_EN  GPIOH_OUTPUT_EN
+#define TUNER_GPIO_OUTPUT_VAL GPIOH_OUTPUT_VAL
+#define TUNER_GPIO_INPUT_VAL  GPIOH_INPUT_VAL
 #define FM_NRW_PIN      3
 #define FM_CLOCK_PIN    4
 #define FM_DATA_PIN     5
+
 #elif defined(IAUDIO_7)
-#define GPIO_OUTPUT_EN  GPIOA_DIR
-#define GPIO_OUTPUT_VAL GPIOA
-#define GPIO_INPUT_VAL  GPIOA
+#define TUNER_GPIO_OUTPUT_EN  GPIOA_DIR
+#define TUNER_GPIO_OUTPUT_VAL GPIOA
+#define TUNER_GPIO_INPUT_VAL  GPIOA
 #define FM_CLOCK_PIN    5
 #define FM_DATA_PIN     6
 #define FM_NRW_PIN      7
@@ -83,9 +84,9 @@ static void udelay(int usecs)
 }
 
 #elif defined(COWON_D2)
-#define GPIO_OUTPUT_EN  GPIOC_DIR
-#define GPIO_OUTPUT_VAL GPIOC
-#define GPIO_INPUT_VAL  GPIOC
+#define TUNER_GPIO_OUTPUT_EN  GPIOC_DIR
+#define TUNER_GPIO_OUTPUT_VAL GPIOC
+#define TUNER_GPIO_INPUT_VAL  GPIOC
 #define FM_NRW_PIN      31
 #define FM_CLOCK_PIN    29
 #define FM_DATA_PIN     30
@@ -292,16 +293,16 @@ static void lv24020lp_send_byte(unsigned int byte)
 
     for (i = 0; i < 8; i++)
     {
-        GPIO_OUTPUT_VAL &= ~(1 << FM_CLOCK_PIN);
+        TUNER_GPIO_OUTPUT_VAL &= ~(1 << FM_CLOCK_PIN);
 
         if (byte & 1)
-            GPIO_OUTPUT_VAL |= (1 << FM_DATA_PIN);
+            TUNER_GPIO_OUTPUT_VAL |= (1 << FM_DATA_PIN);
         else
-            GPIO_OUTPUT_VAL &=  ~(1 << FM_DATA_PIN);
+            TUNER_GPIO_OUTPUT_VAL &=  ~(1 << FM_DATA_PIN);
 
         udelay(FM_CLK_DELAY);
 
-        GPIO_OUTPUT_VAL |= (1 << FM_CLOCK_PIN);
+        TUNER_GPIO_OUTPUT_VAL |= (1 << FM_CLOCK_PIN);
         udelay(FM_CLK_DELAY);
 
         byte >>= 1;
@@ -312,8 +313,8 @@ static void lv24020lp_send_byte(unsigned int byte)
 static void lv24020lp_end_write(void)
 {
     /* switch back to read mode */
-    GPIO_OUTPUT_EN &= ~(1 << FM_DATA_PIN);
-    GPIO_OUTPUT_VAL &= ~(1 << FM_NRW_PIN);
+    TUNER_GPIO_OUTPUT_EN &= ~(1 << FM_DATA_PIN);
+    TUNER_GPIO_OUTPUT_VAL &= ~(1 << FM_NRW_PIN);
     udelay(FM_CLK_DELAY);
 }
 
@@ -327,8 +328,8 @@ static unsigned int lv24020lp_begin_write(unsigned int address)
     for (;;)
     {
         /* Prepare 3-wire bus pins for write cycle */
-        GPIO_OUTPUT_VAL |= (1 << FM_NRW_PIN);
-        GPIO_OUTPUT_EN |= (1 << FM_DATA_PIN);
+        TUNER_GPIO_OUTPUT_VAL |= (1 << FM_NRW_PIN);
+        TUNER_GPIO_OUTPUT_EN |= (1 << FM_DATA_PIN);
         udelay(FM_CLK_DELAY);
 
         /* current block == register block? */
@@ -419,13 +420,13 @@ static unsigned int lv24020lp_read(unsigned int address)
     toread = 0;
     for (i = 0; i < 8; i++)
     {
-        GPIO_OUTPUT_VAL &= ~(1 << FM_CLOCK_PIN);
+        TUNER_GPIO_OUTPUT_VAL &= ~(1 << FM_CLOCK_PIN);
         udelay(FM_CLK_DELAY);
 
-        if (GPIO_INPUT_VAL & (1 << FM_DATA_PIN))
+        if (TUNER_GPIO_INPUT_VAL & (1 << FM_DATA_PIN))
             toread |= (1 << i);
 
-        GPIO_OUTPUT_VAL |= (1 << FM_CLOCK_PIN);
+        TUNER_GPIO_OUTPUT_VAL |= (1 << FM_CLOCK_PIN);
         udelay(FM_CLK_DELAY);
     }