Oops. Lost sync on a few instances and 'HI' registers.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17684 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 5 insertions, 5 deletions

diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index caae5a7e00..6500862e86 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -82,12 +82,12 @@
 
 #define CPU_HI_INT_EN_STAT  (*(volatile unsigned long*)(0x60004120))
 #define CPU_HI_INT_EN       (*(volatile unsigned long*)(0x60004124))
-#define CPU_HI_INT_CLR      (*(volatile unsigned long*)(0x60004128))
+#define CPU_HI_INT_DIS      (*(volatile unsigned long*)(0x60004128))
 #define CPU_HI_INT_PRIORITY (*(volatile unsigned long*)(0x6000412c))
  
 #define COP_HI_INT_EN_STAT  (*(volatile unsigned long*)(0x60004130))
 #define COP_HI_INT_EN       (*(volatile unsigned long*)(0x60004134))
-#define COP_HI_INT_CLR      (*(volatile unsigned long*)(0x60004138))
+#define COP_HI_INT_DIS      (*(volatile unsigned long*)(0x60004138))
 #define COP_HI_INT_PRIORITY (*(volatile unsigned long*)(0x6000413c))
 
 #define TIMER1_IRQ   0
diff --git a/firmware/rolo.c b/firmware/rolo.c
index 6bb0bb13a1..56a2169872 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -70,7 +70,7 @@ void rolo_restart_cop(void)
         return;
     }
 
-    COP_INT_CLR = -1;
+    COP_INT_DIS = -1;
 
     /* Invalidate cache */
     invalidate_icache();
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c
index f8dd818a01..e3a96a411c 100644
--- a/firmware/target/arm/ipod/button-clickwheel.c
+++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -262,7 +262,7 @@ void wheel_send_events(bool send)
 
 void ipod_4g_button_int(void)
 {
-    CPU_HI_INT_CLR = I2C_MASK;
+    CPU_HI_INT_DIS = I2C_MASK;
 
     int_btn = ipod_4g_button_read();
     
diff --git a/firmware/target/arm/ipod/button-mini1g.c b/firmware/target/arm/ipod/button-mini1g.c
index 1ff0a19bdb..f521b19242 100644
--- a/firmware/target/arm/ipod/button-mini1g.c
+++ b/firmware/target/arm/ipod/button-mini1g.c
@@ -151,7 +151,7 @@ static int ipod_mini_button_read(void)
 
 void ipod_mini_button_int(void)
 {
-    CPU_HI_INT_CLR = GPIO0_MASK;
+    CPU_HI_INT_DIS = GPIO0_MASK;
     int_btn = ipod_mini_button_read();
     //CPU_INT_EN = 0x40000000;
     CPU_HI_INT_EN = GPIO0_MASK;