summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/ipod/button-1g-3g.c2
-rw-r--r--firmware/target/arm/olympus/mrobe-100/power-mr100.c4
-rw-r--r--firmware/target/arm/philips/sa9200/power-sa9200.c4
-rw-r--r--firmware/target/arm/sandisk/power-c200_e200.c4
-rw-r--r--firmware/target/arm/system-pp5002.c4
-rw-r--r--firmware/target/arm/system-pp502x.c8
-rw-r--r--firmware/target/arm/usb-drv-arc.c2
7 files changed, 14 insertions, 14 deletions
diff --git a/firmware/target/arm/ipod/button-1g-3g.c b/firmware/target/arm/ipod/button-1g-3g.c
index c91051e78b..c869f6f271 100644
--- a/firmware/target/arm/ipod/button-1g-3g.c
+++ b/firmware/target/arm/ipod/button-1g-3g.c
@@ -167,7 +167,7 @@ static int ipod_3g_button_read(void)
void ipod_3g_button_int(void)
{
- CPU_INT_CLR = GPIO_MASK;
+ CPU_INT_DIS = GPIO_MASK;
int_btn = ipod_3g_button_read();
CPU_INT_EN = GPIO_MASK;
}
diff --git a/firmware/target/arm/olympus/mrobe-100/power-mr100.c b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
index c6f7d65844..dff8bb97f2 100644
--- a/firmware/target/arm/olympus/mrobe-100/power-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
@@ -63,8 +63,8 @@ void power_off(void)
disable_interrupt(IRQ_FIQ_STATUS);
/* Mask them on both cores */
- CPU_INT_CLR = -1;
- COP_INT_CLR = -1;
+ CPU_INT_DIS = -1;
+ COP_INT_DIS = -1;
while (1)
GPIOB_OUTPUT_VAL |= 0x80;
diff --git a/firmware/target/arm/philips/sa9200/power-sa9200.c b/firmware/target/arm/philips/sa9200/power-sa9200.c
index 8c8214a7ce..ddb782e107 100644
--- a/firmware/target/arm/philips/sa9200/power-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/power-sa9200.c
@@ -40,8 +40,8 @@ void power_off(void)
/* Stop interrupts on both cores */
disable_interrupt(IRQ_FIQ_STATUS);
- COP_INT_CLR = -1;
- CPU_INT_CLR = -1;
+ COP_INT_DIS = -1;
+ CPU_INT_DIS = -1;
/* Halt everything and wait for device to power off */
while (1)
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index 8c8214a7ce..ddb782e107 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -40,8 +40,8 @@ void power_off(void)
/* Stop interrupts on both cores */
disable_interrupt(IRQ_FIQ_STATUS);
- COP_INT_CLR = -1;
- CPU_INT_CLR = -1;
+ COP_INT_DIS = -1;
+ CPU_INT_DIS = -1;
/* Halt everything and wait for device to power off */
while (1)
diff --git a/firmware/target/arm/system-pp5002.c b/firmware/target/arm/system-pp5002.c
index 164913f0f6..e4d3913651 100644
--- a/firmware/target/arm/system-pp5002.c
+++ b/firmware/target/arm/system-pp5002.c
@@ -177,8 +177,8 @@ void system_init(void)
#endif
INT_FORCED_CLR = -1;
- CPU_INT_CLR = -1;
- COP_INT_CLR = -1;
+ CPU_INT_DIS = -1;
+ COP_INT_DIS = -1;
GPIOA_INT_EN = 0;
GPIOB_INT_EN = 0;
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index f74b0484ab..fb292b5edf 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -384,12 +384,12 @@ void system_init(void)
#endif
/* disable all irqs */
- COP_HI_INT_CLR = -1;
- CPU_HI_INT_CLR = -1;
+ COP_HI_INT_DIS = -1;
+ CPU_HI_INT_DIS = -1;
HI_INT_FORCED_CLR = -1;
- COP_INT_CLR = -1;
- CPU_INT_CLR = -1;
+ COP_INT_DIS = -1;
+ CPU_INT_DIS = -1;
INT_FORCED_CLR = -1;
GPIOA_INT_EN = 0;
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c
index f785535100..31a6acb71b 100644
--- a/firmware/target/arm/usb-drv-arc.c
+++ b/firmware/target/arm/usb-drv-arc.c
@@ -475,7 +475,7 @@ void usb_drv_exit(void)
#if CONFIG_CPU == IMX31L
avic_disable_int(USB_OTG);
#else
- CPU_INT_CLR = USB_MASK;
+ CPU_INT_DIS = USB_MASK;
#endif
cancel_cpu_boost();