summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-04-30 12:54:05 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-04-30 12:54:05 +0000
commita05bb26233c368d7670bc150f3a0597fe91501f2 (patch)
tree4307047aba216cffab04a51a14237826b2b2548f /firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
parent0987a6be89bb369aa6cfa9befce7af8667fa4d2c (diff)
downloadrockbox-a05bb26233c368d7670bc150f3a0597fe91501f2.tar.gz
rockbox-a05bb26233c368d7670bc150f3a0597fe91501f2.zip
Gigabeat F/X: Correct the yielding in the ATA. Dump the unneeded DMA transfer complete interrupt in there too. Clean it out.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13293 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c')
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
index 6c5e35f0d5..212b8facb2 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
@@ -6,13 +6,16 @@
#include "lcd.h"
#include <stdio.h>
-const int TIMER4_MASK = (1 << 14);
-const int LCD_MASK = (1 << 16);
-const int DMA0_MASK = (1 << 17);
-const int DMA1_MASK = (1 << 18);
-const int DMA2_MASK = (1 << 19);
-const int DMA3_MASK = (1 << 20);
-const int ALARM_MASK = (1 << 30);
+enum
+{
+ TIMER4_MASK = (1 << 14),
+ LCD_MASK = (1 << 16),
+ DMA0_MASK = (1 << 17),
+ DMA1_MASK = (1 << 18),
+ DMA2_MASK = (1 << 19),
+ DMA3_MASK = (1 << 20),
+ ALARM_MASK = (1 << 30),
+};
int system_memory_guard(int newmode)
{
@@ -21,7 +24,7 @@ int system_memory_guard(int newmode)
}
extern void timer4(void);
-extern void dma0(void);
+extern void dma0(void); /* free */
extern void dma1(void);
extern void dma3(void);
@@ -35,8 +38,6 @@ void irq(void)
/* Timer 4 */
if ((intpending & TIMER4_MASK) != 0)
timer4();
- else if ((intpending & DMA0_MASK) != 0)
- dma0();
else
{
/* unexpected interrupt */