From 37f7f0b23bc360f8ad8ad30b19055470545f5a83 Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Mon, 23 Oct 2006 13:11:57 +0000 Subject: reduce the number of gigabeat warnings git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11316 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/s3c2440.h | 2 +- firmware/rolo.c | 3 ++- firmware/timer.c | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/firmware/export/s3c2440.h b/firmware/export/s3c2440.h index 799c14e..2c7c058 100644 --- a/firmware/export/s3c2440.h +++ b/firmware/export/s3c2440.h @@ -144,7 +144,7 @@ #define TCONSEL (*(volatile int *)0x4D000060) /* TCON(LPC3600/LCC3600) control */ /* The following should be computed but for now, we cheat. */ -#define FRAME ( (volatile short * ) 0x31E00000 ) /* LCD Frame buffer */ +#define FRAME ( (short *) 0x31E00000 ) /* LCD Frame buffer */ /* NAND Flash */ diff --git a/firmware/rolo.c b/firmware/rolo.c index dac51fc..e977f74 100644 --- a/firmware/rolo.c +++ b/firmware/rolo.c @@ -31,7 +31,8 @@ #include "buffer.h" #if (CONFIG_CPU != TCC730) && !defined(IRIVER_IFP7XX_SERIES) && \ - (CONFIG_CPU != PP5002) && !defined(IRIVER_H10) && !defined(IRIVER_H10_5GB) + (CONFIG_CPU != PP5002) && !defined(IRIVER_H10) && \ + !defined(IRIVER_H10_5GB) && (CONFIG_CPU != S3C2440) /* FIX: this doesn't work on Gmini, iFP, 3rd Gen ipods, or H10 yet */ #define IRQ0_EDGE_TRIGGER 0x80 diff --git a/firmware/timer.c b/firmware/timer.c index 84d0359..80d3fec 100644 --- a/firmware/timer.c +++ b/firmware/timer.c @@ -167,6 +167,9 @@ static bool timer_set(long cycles, bool start) else cycles_new = cycles; +#elif CONFIG_CPU == S3C2440 /* TODO: Implement for the Gigabeat */ + (void)start; + (void)cycles; #endif /* CONFIG_CPU */ return true; } @@ -197,7 +200,8 @@ bool timer_register(int reg_prio, void (*unregister_callback)(void), if (reg_prio <= timer_prio || cycles == 0) return false; -#if (CONFIG_CPU==PP5002) || (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101) +#if (CONFIG_CPU==PP5002) || (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101) \ + || (CONFIG_CPU==S3C2440) /* TODO: Implement for iPod and iFP (if possible) */ (void)int_prio; #endif -- cgit v1.1