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

8 files changed, 15 insertions, 17 deletions

diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index eba3cd7342..83e2ce78f0 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -150,7 +150,7 @@ void main(void)
     printf("kernel init done");
     int rc;
 
-    set_interrupt_status(IRQ_FIQ_ENABLED, IRQ_FIQ_STATUS);
+    disable_interrupt(IRQ_FIQ_STATUS);
 
     rc = ata_init();
     if(rc)
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,
 void avic_enable_int(enum IMX31_INT_LIST ints, enum INT_TYPE intstype,
                      unsigned long ni_priority, void (*handler)(void))
 {
-    int oldstatus = set_interrupt_status(IRQ_FIQ_DISABLED,
-                                         IRQ_FIQ_STATUS);
+    int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
 
     if (ints != ALL) /* No mass-enable allowed */
     {
@@ -136,7 +135,7 @@ void avic_enable_int(enum IMX31_INT_LIST ints, enum INT_TYPE intstype,
         avic_set_int_priority(ints, ni_priority);
     }
 
-    set_interrupt_status(oldstatus, IRQ_FIQ_STATUS);
+    restore_interrupt(oldstatus);
 }
 
 void avic_disable_int(enum IMX31_INT_LIST ints)
@@ -184,8 +183,7 @@ static void set_int_type(int i, enum INT_TYPE intstype)
 
 void avic_set_int_type(enum IMX31_INT_LIST ints, enum INT_TYPE intstype)
 {
-    int oldstatus = set_interrupt_status(IRQ_FIQ_DISABLED,
-                                         IRQ_FIQ_STATUS);
+    int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
 
     if (ints == ALL)
     {
@@ -198,5 +196,5 @@ void avic_set_int_type(enum IMX31_INT_LIST ints, enum INT_TYPE intstype)
         set_int_type(ints, intstype);
     }
 
-    set_interrupt_status(oldstatus, IRQ_FIQ_STATUS);
+    restore_interrupt(oldstatus);
 }
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)
 #ifdef BOOTLOADER
 void system_prepare_fw_start(void)
 {
-    set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS);
+    disable_interrupt(IRQ_FIQ_STATUS);
     avic_disable_int(ALL);
     tick_stop();
 }
diff --git a/firmware/target/arm/olympus/mrobe-100/power-mr100.c b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
index 797e7084e8..c6f7d65844 100644
--- a/firmware/target/arm/olympus/mrobe-100/power-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
@@ -60,7 +60,7 @@ bool ide_powered(void)
 void power_off(void)
 {
     /* Disable interrupts on this core */
-    set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS);
+    disable_interrupt(IRQ_FIQ_STATUS);
 
     /* Mask them on both cores */
     CPU_INT_CLR = -1;
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index b881ccd6a0..d23754a478 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -33,7 +33,7 @@ void power_off(void)
     char byte;
 
     /* Disable interrupts on this core */
-    set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS);
+    disable_interrupt(IRQ_FIQ_STATUS);
 
     /* Mask them on both cores */
     CPU_INT_CLR = -1;
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index 390c80d9fd..a699b3a38a 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -149,7 +149,7 @@ void scale_suspend_core(bool suspend)
 
     if (suspend)
     {
-        oldstatus = set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS);
+        oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
         IF_COP( PROC_CTL(othercore) = 0x40000000; nop; )
         PROC_CTL(core) = 0x48000003; nop;
     }
@@ -157,7 +157,7 @@ void scale_suspend_core(bool suspend)
     {
         PROC_CTL(core) = 0x4800001f; nop;
         IF_COP( PROC_CTL(othercore) = 0x00000000; nop; )
-        set_interrupt_status(oldstatus, IRQ_FIQ_STATUS);
+        restore_interrupt(oldstatus);
     }
 }
 
diff --git a/firmware/target/arm/tcc780x/cowond2/power-cowond2.c b/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
index b1fd56d980..96fe211a64 100644
--- a/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
@@ -43,7 +43,7 @@ bool ide_powered(void)
 void power_off(void)
 {
     /* Disable interrupts on this core */
-    set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS);
+    disable_interrupt(IRQ_FIQ_STATUS);
 
     /* Shutdown: stop XIN oscillator */
     CLKCTRL &= ~(1 << 31);
diff --git a/firmware/target/arm/tms320dm320/timer-dm320.c b/firmware/target/arm/tms320dm320/timer-dm320.c
index e1e051d3a5..7895005d46 100644
--- a/firmware/target/arm/tms320dm320/timer-dm320.c
+++ b/firmware/target/arm/tms320dm320/timer-dm320.c
@@ -76,7 +76,7 @@ static void stop_timer(void)
 
 bool __timer_register(void)
 {
-    int oldstatus = set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS);
+    int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
 
     stop_timer();
 
@@ -85,14 +85,14 @@ bool __timer_register(void)
 
     IO_INTC_EINT0 |= 1<<IRQ_TIMER0;
 
-    set_interrupt_status(oldstatus, IRQ_FIQ_STATUS);
+    restore_interrupt(oldstatus);
 
     return true;
 }
 
 void __timer_unregister(void)
 {
-    int oldstatus = set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS);
+    int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
     stop_timer();
-    set_interrupt_status(oldstatus, IRQ_FIQ_STATUS);
+    restore_interrupt(oldstatus);
 }