2 files changed, 7 insertions, 8 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 143d4570e4..fc9cc7ac25 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -203,7 +203,7 @@ static int ipod_4g_button_read(void)
 
 void ipod_4g_button_int(void)
 {
-    PP5020_CPU_HI_INT_CLR = PP5020_I2C_MASK;
+    CPU_HI_INT_CLR = I2C_MASK;
     udelay(250);
     outl(0x0, 0x7000c140); 
     int_btn = ipod_4g_button_read();
@@ -211,8 +211,8 @@ void ipod_4g_button_int(void)
     outl(0x400a1f00, 0x7000c100);
 
     GPIOB_OUTPUT_VAL |= 0x10;
-    PP5020_CPU_INT_EN = 0x40000000;
-    PP5020_CPU_HI_INT_EN = PP5020_I2C_MASK;
+    CPU_INT_EN = 0x40000000;
+    CPU_HI_INT_EN = I2C_MASK;
 }
 #endif 
 
@@ -397,8 +397,8 @@ void button_init(void)
     GPIOA_INT_CLR = GPIOA_INT_STAT & 0x20;
     /* enable interrupts */
     GPIOA_INT_EN = 0x20;
-    PP5020_CPU_INT_EN = 0x40000000;
-    PP5020_CPU_HI_INT_EN = PP5020_I2C_MASK;
+    CPU_INT_EN = 0x40000000;
+    CPU_HI_INT_EN = I2C_MASK;
 #endif /* CONFIG_KEYPAD */
 
     queue_init(&button_queue);
diff --git a/firmware/drivers/lcd-ipod.c b/firmware/drivers/lcd-ipod.c
index 154158c6ad..9aa7d01adb 100644
--- a/firmware/drivers/lcd-ipod.c
+++ b/firmware/drivers/lcd-ipod.c
@@ -31,7 +31,6 @@
 
 /*** definitions ***/
 #define IPOD_HW_REVISION        (*((volatile unsigned long*)0x00002084))
-#define IPOD_PP5020_RTC         (*((volatile unsigned long*)0x60005010))
 
 #define IPOD_LCD_BASE           0x70008a0c
 #define IPOD_LCD_BUSY_MASK      0x80000000
@@ -49,7 +48,7 @@ static int lcd_type = 1; /* 0 = "old" Color/Photo, 1 = "new" Color & Nano */
 /* check if number of useconds has past */
 static inline int timer_check(unsigned long clock_start, unsigned long usecs)
 {
-    if ( (IPOD_PP5020_RTC - clock_start) >= usecs ) {
+    if ( (USEC_TIMER - clock_start) >= usecs ) {
         return 1;
     } else {
         return 0;
@@ -59,7 +58,7 @@ static inline int timer_check(unsigned long clock_start, unsigned long usecs)
 static void lcd_wait_write(void)
 {
     if ((inl(IPOD_LCD_BASE) & IPOD_LCD_BUSY_MASK) != 0) {
-        int start = IPOD_PP5020_RTC;
+        int start = USEC_TIMER;
 
         do {
             if ((inl(IPOD_LCD_BASE) & IPOD_LCD_BUSY_MASK) == 0) break;