diff options
-rw-r--r-- | bootloader/gigabeat-s.c | 2 | ||||
-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 | ||||
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/power-mr100.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/power-c200_e200.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/system-pp502x.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/cowond2/power-cowond2.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/timer-dm320.c | 8 |
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) | |||
150 | printf("kernel init done"); | 150 | printf("kernel init done"); |
151 | int rc; | 151 | int rc; |
152 | 152 | ||
153 | set_interrupt_status(IRQ_FIQ_ENABLED, IRQ_FIQ_STATUS); | 153 | disable_interrupt(IRQ_FIQ_STATUS); |
154 | 154 | ||
155 | rc = ata_init(); | 155 | rc = ata_init(); |
156 | if(rc) | 156 | 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, | |||
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 | } |
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) | |||
60 | void power_off(void) | 60 | void power_off(void) |
61 | { | 61 | { |
62 | /* Disable interrupts on this core */ | 62 | /* Disable interrupts on this core */ |
63 | set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS); | 63 | disable_interrupt(IRQ_FIQ_STATUS); |
64 | 64 | ||
65 | /* Mask them on both cores */ | 65 | /* Mask them on both cores */ |
66 | CPU_INT_CLR = -1; | 66 | 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) | |||
33 | char byte; | 33 | char byte; |
34 | 34 | ||
35 | /* Disable interrupts on this core */ | 35 | /* Disable interrupts on this core */ |
36 | set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS); | 36 | disable_interrupt(IRQ_FIQ_STATUS); |
37 | 37 | ||
38 | /* Mask them on both cores */ | 38 | /* Mask them on both cores */ |
39 | CPU_INT_CLR = -1; | 39 | 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) | |||
149 | 149 | ||
150 | if (suspend) | 150 | if (suspend) |
151 | { | 151 | { |
152 | oldstatus = set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS); | 152 | oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); |
153 | IF_COP( PROC_CTL(othercore) = 0x40000000; nop; ) | 153 | IF_COP( PROC_CTL(othercore) = 0x40000000; nop; ) |
154 | PROC_CTL(core) = 0x48000003; nop; | 154 | PROC_CTL(core) = 0x48000003; nop; |
155 | } | 155 | } |
@@ -157,7 +157,7 @@ void scale_suspend_core(bool suspend) | |||
157 | { | 157 | { |
158 | PROC_CTL(core) = 0x4800001f; nop; | 158 | PROC_CTL(core) = 0x4800001f; nop; |
159 | IF_COP( PROC_CTL(othercore) = 0x00000000; nop; ) | 159 | IF_COP( PROC_CTL(othercore) = 0x00000000; nop; ) |
160 | set_interrupt_status(oldstatus, IRQ_FIQ_STATUS); | 160 | restore_interrupt(oldstatus); |
161 | } | 161 | } |
162 | } | 162 | } |
163 | 163 | ||
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) | |||
43 | void power_off(void) | 43 | void power_off(void) |
44 | { | 44 | { |
45 | /* Disable interrupts on this core */ | 45 | /* Disable interrupts on this core */ |
46 | set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS); | 46 | disable_interrupt(IRQ_FIQ_STATUS); |
47 | 47 | ||
48 | /* Shutdown: stop XIN oscillator */ | 48 | /* Shutdown: stop XIN oscillator */ |
49 | CLKCTRL &= ~(1 << 31); | 49 | 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) | |||
76 | 76 | ||
77 | bool __timer_register(void) | 77 | bool __timer_register(void) |
78 | { | 78 | { |
79 | int oldstatus = set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS); | 79 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); |
80 | 80 | ||
81 | stop_timer(); | 81 | stop_timer(); |
82 | 82 | ||
@@ -85,14 +85,14 @@ bool __timer_register(void) | |||
85 | 85 | ||
86 | IO_INTC_EINT0 |= 1<<IRQ_TIMER0; | 86 | IO_INTC_EINT0 |= 1<<IRQ_TIMER0; |
87 | 87 | ||
88 | set_interrupt_status(oldstatus, IRQ_FIQ_STATUS); | 88 | restore_interrupt(oldstatus); |
89 | 89 | ||
90 | return true; | 90 | return true; |
91 | } | 91 | } |
92 | 92 | ||
93 | void __timer_unregister(void) | 93 | void __timer_unregister(void) |
94 | { | 94 | { |
95 | int oldstatus = set_interrupt_status(IRQ_FIQ_DISABLED, IRQ_FIQ_STATUS); | 95 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); |
96 | stop_timer(); | 96 | stop_timer(); |
97 | set_interrupt_status(oldstatus, IRQ_FIQ_STATUS); | 97 | restore_interrupt(oldstatus); |
98 | } | 98 | } |