summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Malesinski <tomal@rockbox.org>2006-02-03 23:14:42 +0000
committerTomasz Malesinski <tomal@rockbox.org>2006-02-03 23:14:42 +0000
commitc31d2f84b73b7f08f949cebcff0e5f4d1babd529 (patch)
treea93d2b11e185f8bdc587c4ef1e80b8ed68f47f77
parent3c17330af669c6c19b4b3b1fdcfc987e386679ce (diff)
downloadrockbox-c31d2f84b73b7f08f949cebcff0e5f4d1babd529.tar.gz
rockbox-c31d2f84b73b7f08f949cebcff0e5f4d1babd529.zip
Fixed warnings on iFP.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8550 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/lib/gray_core.c3
-rw-r--r--apps/plugins/lib/gray_draw.c6
-rw-r--r--firmware/rolo.c8
-rw-r--r--firmware/sound.c12
-rw-r--r--firmware/timer.c6
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)
233 _gray_rb->timer_register(1, NULL, CPU_FREQ / 67, 1, _timer_isr); 233 _gray_rb->timer_register(1, NULL, CPU_FREQ / 67, 1, _timer_isr);
234#elif CONFIG_LCD == LCD_S1D15E06 234#elif CONFIG_LCD == LCD_S1D15E06
235 _gray_rb->timer_register(1, NULL, CPU_FREQ / 70, 1, _timer_isr); 235 _gray_rb->timer_register(1, NULL, CPU_FREQ / 70, 1, _timer_isr);
236#elif CONFIG_LCD == LCD_IFP7XX
237 /* TODO: implement for iFP */
238 (void)_timer_isr;
236#endif 239#endif
237 _gray_rb->screen_dump_set_hook(gray_screendump_hook); 240 _gray_rb->screen_dump_set_hook(gray_screendump_hook);
238 } 241 }
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,
904 : /* clobbers */ 904 : /* clobbers */
905 "d0", "d1", "d2", "d3", "d4", "d5", "d6", "a0", "a1" 905 "d0", "d1", "d2", "d3", "d4", "d5", "d6", "a0", "a1"
906 ); 906 );
907#elif defined(CPU_ARM) && (LCD_DEPTH == 1)
908 /* TODO: implement for iFP */
909 (void)address;
910 (void)src;
911 (void)stride;
912 (void)mask;
907#endif 913#endif
908} 914}
909 915
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 @@
29#include "string.h" 29#include "string.h"
30#include "buffer.h" 30#include "buffer.h"
31 31
32#if CONFIG_CPU != TCC730 32#if (CONFIG_CPU != TCC730) && !defined(IRIVER_IFP7XX_SERIES)
33/* FIX: this doesn't work on Gmini yet */ 33/* FIX: this doesn't work on Gmini and iFP yet */
34 34
35#define IRQ0_EDGE_TRIGGER 0x80 35#define IRQ0_EDGE_TRIGGER 0x80
36 36
@@ -210,7 +210,7 @@ int rolo_load(const char* filename)
210 210
211 return 0; /* this is never reached */ 211 return 0; /* this is never reached */
212} 212}
213#else /* CONFIG_CPU != TCC730 */ 213#else /* (CONFIG_CPU != TCC730) && !defined(IRIVER_IFP7XX_SERIES) */
214int rolo_load(const char* filename) 214int rolo_load(const char* filename)
215{ 215{
216 /* dummy */ 216 /* dummy */
@@ -218,4 +218,4 @@ int rolo_load(const char* filename)
218 return 0; 218 return 0;
219} 219}
220 220
221#endif /* ! CONFIG_CPU != TCC730 */ 221#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)
471#elif (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 || defined HAVE_WM8975 471#elif (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 || defined HAVE_WM8975
472 current_volume = value * 10; /* tenth of dB */ 472 current_volume = value * 10; /* tenth of dB */
473 set_prescaled_volume(); 473 set_prescaled_volume();
474#elif CONFIG_CPU == PNX0101
475 /* TODO: implement for iFP */
476 (void)value;
474#endif 477#endif
475} 478}
476 479
@@ -484,6 +487,9 @@ void sound_set_balance(int value)
484#elif CONFIG_CODEC == MAS3507D || defined HAVE_UDA1380 || defined HAVE_WM8975 487#elif CONFIG_CODEC == MAS3507D || defined HAVE_UDA1380 || defined HAVE_WM8975
485 current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */ 488 current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */
486 set_prescaled_volume(); 489 set_prescaled_volume();
490#elif CONFIG_CPU == PNX0101
491 /* TODO: implement for iFP */
492 (void)value;
487#endif 493#endif
488} 494}
489 495
@@ -506,6 +512,9 @@ void sound_set_bass(int value)
506 current_bass = value * 10; 512 current_bass = value * 10;
507 wm8975_set_bass(value); 513 wm8975_set_bass(value);
508 set_prescaled_volume(); 514 set_prescaled_volume();
515#elif CONFIG_CPU == PNX0101
516 /* TODO: implement for iFP */
517 (void)value;
509#endif 518#endif
510} 519}
511 520
@@ -528,6 +537,9 @@ void sound_set_treble(int value)
528 wm8975_set_treble(value); 537 wm8975_set_treble(value);
529 current_treble = value * 10; 538 current_treble = value * 10;
530 set_prescaled_volume(); 539 set_prescaled_volume();
540#elif CONFIG_CPU == PNX0101
541 /* TODO: implement for iFP */
542 (void)value;
531#endif 543#endif
532} 544}
533 545
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)
56 int phi = 0; /* bits for the prescaler */ 56 int phi = 0; /* bits for the prescaler */
57 int prescale = 1; 57 int prescale = 1;
58 58
59#if CONFIG_CPU==PP5020 59#if (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101)
60 /* TODO: Implement for iPod */ 60 /* TODO: Implement for iPod and iFP */
61 (void)start; 61 (void)start;
62 (void)phi; 62 (void)phi;
63#endif 63#endif
@@ -162,7 +162,7 @@ bool timer_register(int reg_prio, void (*unregister_callback)(void),
162 if (reg_prio <= timer_prio || cycles == 0) 162 if (reg_prio <= timer_prio || cycles == 0)
163 return false; 163 return false;
164 164
165#if CONFIG_CPU==PP5020 165#if (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101)
166 /* TODO: Implement for iPod */ 166 /* TODO: Implement for iPod */
167 (void)int_prio; 167 (void)int_prio;
168#endif 168#endif