From 75f2d441e9a4753d815c9dc67974a6b0be64ef46 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Mon, 31 Mar 2008 06:00:23 +0000 Subject: 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 --- firmware/target/arm/imx31/gigabeat-s/avic-imx31.c | 10 ++++------ firmware/target/arm/imx31/gigabeat-s/system-imx31.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'firmware/target/arm/imx31') 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(); } -- cgit v1.2.3