diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-03-31 06:00:23 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-03-31 06:00:23 +0000 |
commit | 75f2d441e9a4753d815c9dc67974a6b0be64ef46 (patch) | |
tree | 46957489b6aba7850230058fc1a430596c949240 /firmware/target/arm/imx31/gigabeat-s | |
parent | 2ea0206502c54b73158ebf494bc0faa371ab0426 (diff) | |
download | rockbox-75f2d441e9a4753d815c9dc67974a6b0be64ef46.tar.gz rockbox-75f2d441e9a4753d815c9dc67974a6b0be64ef46.zip |
Change the remaining set_interrupt_status usage to the more parsimonious disable/enable/restore.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16897 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/avic-imx31.c | 10 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/system-imx31.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/avic-imx31.c b/firmware/target/arm/imx31/gigabeat-s/avic-imx31.c index b04b22911a..194bc11ed6 100644 --- a/firmware/target/arm/imx31/gigabeat-s/avic-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/avic-imx31.c | |||
@@ -125,8 +125,7 @@ void avic_set_int_priority(enum IMX31_INT_LIST ints, | |||
125 | void avic_enable_int(enum IMX31_INT_LIST ints, enum INT_TYPE intstype, | 125 | void avic_enable_int(enum IMX31_INT_LIST ints, enum INT_TYPE intstype, |
126 | unsigned long ni_priority, void (*handler)(void)) | 126 | unsigned long ni_priority, void (*handler)(void)) |
127 | { | 127 | { |
128 | int oldstatus = set_interrupt_status(IRQ_FIQ_DISABLED, | 128 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); |
129 | IRQ_FIQ_STATUS); | ||
130 | 129 | ||
131 | if (ints != ALL) /* No mass-enable allowed */ | 130 | if (ints != ALL) /* No mass-enable allowed */ |
132 | { | 131 | { |
@@ -136,7 +135,7 @@ void avic_enable_int(enum IMX31_INT_LIST ints, enum INT_TYPE intstype, | |||
136 | avic_set_int_priority(ints, ni_priority); | 135 | avic_set_int_priority(ints, ni_priority); |
137 | } | 136 | } |
138 | 137 | ||
139 | set_interrupt_status(oldstatus, IRQ_FIQ_STATUS); | 138 | restore_interrupt(oldstatus); |
140 | } | 139 | } |
141 | 140 | ||
142 | void avic_disable_int(enum IMX31_INT_LIST ints) | 141 | void avic_disable_int(enum IMX31_INT_LIST ints) |
@@ -184,8 +183,7 @@ static void set_int_type(int i, enum INT_TYPE intstype) | |||
184 | 183 | ||
185 | void avic_set_int_type(enum IMX31_INT_LIST ints, enum INT_TYPE intstype) | 184 | void avic_set_int_type(enum IMX31_INT_LIST ints, enum INT_TYPE intstype) |
186 | { | 185 | { |
187 | int oldstatus = set_interrupt_status(IRQ_FIQ_DISABLED, | 186 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); |
188 | IRQ_FIQ_STATUS); | ||
189 | 187 | ||
190 | if (ints == ALL) | 188 | if (ints == ALL) |
191 | { | 189 | { |
@@ -198,5 +196,5 @@ void avic_set_int_type(enum IMX31_INT_LIST ints, enum INT_TYPE intstype) | |||
198 | set_int_type(ints, intstype); | 196 | set_int_type(ints, intstype); |
199 | } | 197 | } |
200 | 198 | ||
201 | set_interrupt_status(oldstatus, IRQ_FIQ_STATUS); | 199 | restore_interrupt(oldstatus); |
202 | } | 200 | } |
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c index c77c923d60..bd7999558b 100644 --- a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c | |||
@@ -28,7 +28,7 @@ void system_init(void) | |||
28 | #ifdef BOOTLOADER | 28 | #ifdef BOOTLOADER |
29 | void system_prepare_fw_start(void) | 29 | void system_prepare_fw_start(void) |
30 | { | 30 | { |
31 | set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS); | 31 | disable_interrupt(IRQ_FIQ_STATUS); |
32 | avic_disable_int(ALL); | 32 | avic_disable_int(ALL); |
33 | tick_stop(); | 33 | tick_stop(); |
34 | } | 34 | } |