diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-04-07 01:13:44 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-04-07 01:13:44 +0000 |
commit | 1aaa89aa9b9a94ca33082e606f3ad8dca6a7b9e0 (patch) | |
tree | 371b09fcc8b9fb3e8f780181e448246264073e62 | |
parent | 2f9f34e0ea793f6d2134c749358655fcfc9062f6 (diff) | |
download | rockbox-1aaa89aa9b9a94ca33082e606f3ad8dca6a7b9e0.tar.gz rockbox-1aaa89aa9b9a94ca33082e606f3ad8dca6a7b9e0.zip |
Wow. Fix those irq #defines for ARM and use the right one in power-c200_e200.c. How'd that happen?
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17010 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/sandisk/power-c200_e200.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/system-arm.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c index 6b3f295e07..ade3a0c63b 100644 --- a/firmware/target/arm/sandisk/power-c200_e200.c +++ b/firmware/target/arm/sandisk/power-c200_e200.c | |||
@@ -38,7 +38,7 @@ void power_off(void) | |||
38 | pp_i2c_send(AS3514_I2C_ADDR, SYSTEM, byte); | 38 | pp_i2c_send(AS3514_I2C_ADDR, SYSTEM, byte); |
39 | 39 | ||
40 | /* Stop interrupts on both cores */ | 40 | /* Stop interrupts on both cores */ |
41 | disable_irq(IRQ_FIQ_STATUS); | 41 | disable_interrupt(IRQ_FIQ_STATUS); |
42 | COP_INT_CLR = -1; | 42 | COP_INT_CLR = -1; |
43 | CPU_INT_CLR = -1; | 43 | CPU_INT_CLR = -1; |
44 | 44 | ||
diff --git a/firmware/target/arm/system-arm.h b/firmware/target/arm/system-arm.h index 3f1dfb16c8..5627475408 100644 --- a/firmware/target/arm/system-arm.h +++ b/firmware/target/arm/system-arm.h | |||
@@ -131,16 +131,16 @@ static inline void disable_interrupt(int mask) | |||
131 | : "=&r"(tmp) : "i"(mask)); | 131 | : "=&r"(tmp) : "i"(mask)); |
132 | } | 132 | } |
133 | 133 | ||
134 | #define disable_irq(void) \ | 134 | #define disable_irq() \ |
135 | disable_interrupt(IRQ_STATUS) | 135 | disable_interrupt(IRQ_STATUS) |
136 | 136 | ||
137 | #define enable_irq(void) \ | 137 | #define enable_irq() \ |
138 | enable_interrupt(IRQ_STATUS) | 138 | enable_interrupt(IRQ_STATUS) |
139 | 139 | ||
140 | #define disable_fiq(void) \ | 140 | #define disable_fiq() \ |
141 | disable_interrupt(FIQ_STATUS) | 141 | disable_interrupt(FIQ_STATUS) |
142 | 142 | ||
143 | #define enable_fiq(void) \ | 143 | #define enable_fiq() \ |
144 | enable_interrupt(FIQ_STATUS) | 144 | enable_interrupt(FIQ_STATUS) |
145 | 145 | ||
146 | static inline int disable_interrupt_save(int mask) | 146 | static inline int disable_interrupt_save(int mask) |