diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/pp5020.h | 4 | ||||
-rw-r--r-- | firmware/rolo.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/button-clickwheel.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/button-mini1g.c | 2 |
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 @@ | |||
82 | 82 | ||
83 | #define CPU_HI_INT_EN_STAT (*(volatile unsigned long*)(0x60004120)) | 83 | #define CPU_HI_INT_EN_STAT (*(volatile unsigned long*)(0x60004120)) |
84 | #define CPU_HI_INT_EN (*(volatile unsigned long*)(0x60004124)) | 84 | #define CPU_HI_INT_EN (*(volatile unsigned long*)(0x60004124)) |
85 | #define CPU_HI_INT_CLR (*(volatile unsigned long*)(0x60004128)) | 85 | #define CPU_HI_INT_DIS (*(volatile unsigned long*)(0x60004128)) |
86 | #define CPU_HI_INT_PRIORITY (*(volatile unsigned long*)(0x6000412c)) | 86 | #define CPU_HI_INT_PRIORITY (*(volatile unsigned long*)(0x6000412c)) |
87 | 87 | ||
88 | #define COP_HI_INT_EN_STAT (*(volatile unsigned long*)(0x60004130)) | 88 | #define COP_HI_INT_EN_STAT (*(volatile unsigned long*)(0x60004130)) |
89 | #define COP_HI_INT_EN (*(volatile unsigned long*)(0x60004134)) | 89 | #define COP_HI_INT_EN (*(volatile unsigned long*)(0x60004134)) |
90 | #define COP_HI_INT_CLR (*(volatile unsigned long*)(0x60004138)) | 90 | #define COP_HI_INT_DIS (*(volatile unsigned long*)(0x60004138)) |
91 | #define COP_HI_INT_PRIORITY (*(volatile unsigned long*)(0x6000413c)) | 91 | #define COP_HI_INT_PRIORITY (*(volatile unsigned long*)(0x6000413c)) |
92 | 92 | ||
93 | #define TIMER1_IRQ 0 | 93 | #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) | |||
70 | return; | 70 | return; |
71 | } | 71 | } |
72 | 72 | ||
73 | COP_INT_CLR = -1; | 73 | COP_INT_DIS = -1; |
74 | 74 | ||
75 | /* Invalidate cache */ | 75 | /* Invalidate cache */ |
76 | invalidate_icache(); | 76 | 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) | |||
262 | 262 | ||
263 | void ipod_4g_button_int(void) | 263 | void ipod_4g_button_int(void) |
264 | { | 264 | { |
265 | CPU_HI_INT_CLR = I2C_MASK; | 265 | CPU_HI_INT_DIS = I2C_MASK; |
266 | 266 | ||
267 | int_btn = ipod_4g_button_read(); | 267 | int_btn = ipod_4g_button_read(); |
268 | 268 | ||
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) | |||
151 | 151 | ||
152 | void ipod_mini_button_int(void) | 152 | void ipod_mini_button_int(void) |
153 | { | 153 | { |
154 | CPU_HI_INT_CLR = GPIO0_MASK; | 154 | CPU_HI_INT_DIS = GPIO0_MASK; |
155 | int_btn = ipod_mini_button_read(); | 155 | int_btn = ipod_mini_button_read(); |
156 | //CPU_INT_EN = 0x40000000; | 156 | //CPU_INT_EN = 0x40000000; |
157 | CPU_HI_INT_EN = GPIO0_MASK; | 157 | CPU_HI_INT_EN = GPIO0_MASK; |