diff options
-rw-r--r-- | firmware/export/s3c2440.h | 2 | ||||
-rw-r--r-- | firmware/rolo.c | 3 | ||||
-rw-r--r-- | firmware/timer.c | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/firmware/export/s3c2440.h b/firmware/export/s3c2440.h index 799c14eb0e..2c7c058090 100644 --- a/firmware/export/s3c2440.h +++ b/firmware/export/s3c2440.h | |||
@@ -144,7 +144,7 @@ | |||
144 | #define TCONSEL (*(volatile int *)0x4D000060) /* TCON(LPC3600/LCC3600) control */ | 144 | #define TCONSEL (*(volatile int *)0x4D000060) /* TCON(LPC3600/LCC3600) control */ |
145 | 145 | ||
146 | /* The following should be computed but for now, we cheat. */ | 146 | /* The following should be computed but for now, we cheat. */ |
147 | #define FRAME ( (volatile short * ) 0x31E00000 ) /* LCD Frame buffer */ | 147 | #define FRAME ( (short *) 0x31E00000 ) /* LCD Frame buffer */ |
148 | 148 | ||
149 | /* NAND Flash */ | 149 | /* NAND Flash */ |
150 | 150 | ||
diff --git a/firmware/rolo.c b/firmware/rolo.c index dac51fc0f3..e977f7489f 100644 --- a/firmware/rolo.c +++ b/firmware/rolo.c | |||
@@ -31,7 +31,8 @@ | |||
31 | #include "buffer.h" | 31 | #include "buffer.h" |
32 | 32 | ||
33 | #if (CONFIG_CPU != TCC730) && !defined(IRIVER_IFP7XX_SERIES) && \ | 33 | #if (CONFIG_CPU != TCC730) && !defined(IRIVER_IFP7XX_SERIES) && \ |
34 | (CONFIG_CPU != PP5002) && !defined(IRIVER_H10) && !defined(IRIVER_H10_5GB) | 34 | (CONFIG_CPU != PP5002) && !defined(IRIVER_H10) && \ |
35 | !defined(IRIVER_H10_5GB) && (CONFIG_CPU != S3C2440) | ||
35 | /* FIX: this doesn't work on Gmini, iFP, 3rd Gen ipods, or H10 yet */ | 36 | /* FIX: this doesn't work on Gmini, iFP, 3rd Gen ipods, or H10 yet */ |
36 | 37 | ||
37 | #define IRQ0_EDGE_TRIGGER 0x80 | 38 | #define IRQ0_EDGE_TRIGGER 0x80 |
diff --git a/firmware/timer.c b/firmware/timer.c index 84d0359008..80d3fec561 100644 --- a/firmware/timer.c +++ b/firmware/timer.c | |||
@@ -167,6 +167,9 @@ static bool timer_set(long cycles, bool start) | |||
167 | else | 167 | else |
168 | cycles_new = cycles; | 168 | cycles_new = cycles; |
169 | 169 | ||
170 | #elif CONFIG_CPU == S3C2440 /* TODO: Implement for the Gigabeat */ | ||
171 | (void)start; | ||
172 | (void)cycles; | ||
170 | #endif /* CONFIG_CPU */ | 173 | #endif /* CONFIG_CPU */ |
171 | return true; | 174 | return true; |
172 | } | 175 | } |
@@ -197,7 +200,8 @@ bool timer_register(int reg_prio, void (*unregister_callback)(void), | |||
197 | if (reg_prio <= timer_prio || cycles == 0) | 200 | if (reg_prio <= timer_prio || cycles == 0) |
198 | return false; | 201 | return false; |
199 | 202 | ||
200 | #if (CONFIG_CPU==PP5002) || (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101) | 203 | #if (CONFIG_CPU==PP5002) || (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101) \ |
204 | || (CONFIG_CPU==S3C2440) | ||
201 | /* TODO: Implement for iPod and iFP (if possible) */ | 205 | /* TODO: Implement for iPod and iFP (if possible) */ |
202 | (void)int_prio; | 206 | (void)int_prio; |
203 | #endif | 207 | #endif |