From c31d2f84b73b7f08f949cebcff0e5f4d1babd529 Mon Sep 17 00:00:00 2001 From: Tomasz Malesinski Date: Fri, 3 Feb 2006 23:14:42 +0000 Subject: [PATCH] Fixed warnings on iFP. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8550 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/lib/gray_core.c | 3 +++ apps/plugins/lib/gray_draw.c | 6 ++++++ firmware/rolo.c | 8 ++++---- firmware/sound.c | 12 ++++++++++++ firmware/timer.c | 6 +++--- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/apps/plugins/lib/gray_core.c b/apps/plugins/lib/gray_core.c index f132d00495..d151250e69 100644 --- a/apps/plugins/lib/gray_core.c +++ b/apps/plugins/lib/gray_core.c @@ -233,6 +233,9 @@ void gray_show(bool enable) _gray_rb->timer_register(1, NULL, CPU_FREQ / 67, 1, _timer_isr); #elif CONFIG_LCD == LCD_S1D15E06 _gray_rb->timer_register(1, NULL, CPU_FREQ / 70, 1, _timer_isr); +#elif CONFIG_LCD == LCD_IFP7XX + /* TODO: implement for iFP */ + (void)_timer_isr; #endif _gray_rb->screen_dump_set_hook(gray_screendump_hook); } diff --git a/apps/plugins/lib/gray_draw.c b/apps/plugins/lib/gray_draw.c index 171c5e4a4b..b842658bd7 100644 --- a/apps/plugins/lib/gray_draw.c +++ b/apps/plugins/lib/gray_draw.c @@ -904,6 +904,12 @@ static void _writearray(unsigned char *address, const unsigned char *src, : /* clobbers */ "d0", "d1", "d2", "d3", "d4", "d5", "d6", "a0", "a1" ); +#elif defined(CPU_ARM) && (LCD_DEPTH == 1) + /* TODO: implement for iFP */ + (void)address; + (void)src; + (void)stride; + (void)mask; #endif } diff --git a/firmware/rolo.c b/firmware/rolo.c index cecfa19045..958db56322 100644 --- a/firmware/rolo.c +++ b/firmware/rolo.c @@ -29,8 +29,8 @@ #include "string.h" #include "buffer.h" -#if CONFIG_CPU != TCC730 -/* FIX: this doesn't work on Gmini yet */ +#if (CONFIG_CPU != TCC730) && !defined(IRIVER_IFP7XX_SERIES) +/* FIX: this doesn't work on Gmini and iFP yet */ #define IRQ0_EDGE_TRIGGER 0x80 @@ -210,7 +210,7 @@ int rolo_load(const char* filename) return 0; /* this is never reached */ } -#else /* CONFIG_CPU != TCC730 */ +#else /* (CONFIG_CPU != TCC730) && !defined(IRIVER_IFP7XX_SERIES) */ int rolo_load(const char* filename) { /* dummy */ @@ -218,4 +218,4 @@ int rolo_load(const char* filename) return 0; } -#endif /* ! CONFIG_CPU != TCC730 */ +#endif /* (CONFIG_CPU != TCC730) && !defined(IRIVER_IFP7XX_SERIES) */ diff --git a/firmware/sound.c b/firmware/sound.c index 41212e72b9..7c961afc97 100644 --- a/firmware/sound.c +++ b/firmware/sound.c @@ -471,6 +471,9 @@ void sound_set_volume(int value) #elif (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 || defined HAVE_WM8975 current_volume = value * 10; /* tenth of dB */ set_prescaled_volume(); +#elif CONFIG_CPU == PNX0101 + /* TODO: implement for iFP */ + (void)value; #endif } @@ -484,6 +487,9 @@ void sound_set_balance(int value) #elif CONFIG_CODEC == MAS3507D || defined HAVE_UDA1380 || defined HAVE_WM8975 current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */ set_prescaled_volume(); +#elif CONFIG_CPU == PNX0101 + /* TODO: implement for iFP */ + (void)value; #endif } @@ -506,6 +512,9 @@ void sound_set_bass(int value) current_bass = value * 10; wm8975_set_bass(value); set_prescaled_volume(); +#elif CONFIG_CPU == PNX0101 + /* TODO: implement for iFP */ + (void)value; #endif } @@ -528,6 +537,9 @@ void sound_set_treble(int value) wm8975_set_treble(value); current_treble = value * 10; set_prescaled_volume(); +#elif CONFIG_CPU == PNX0101 + /* TODO: implement for iFP */ + (void)value; #endif } diff --git a/firmware/timer.c b/firmware/timer.c index cdbd928d67..d4ce069637 100644 --- a/firmware/timer.c +++ b/firmware/timer.c @@ -56,8 +56,8 @@ static bool timer_set(long cycles, bool start) int phi = 0; /* bits for the prescaler */ int prescale = 1; -#if CONFIG_CPU==PP5020 - /* TODO: Implement for iPod */ +#if (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101) + /* TODO: Implement for iPod and iFP */ (void)start; (void)phi; #endif @@ -162,7 +162,7 @@ bool timer_register(int reg_prio, void (*unregister_callback)(void), if (reg_prio <= timer_prio || cycles == 0) return false; -#if CONFIG_CPU==PP5020 +#if (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101) /* TODO: Implement for iPod */ (void)int_prio; #endif