Make the measured LCD scanrates from the greylib known to the scanrate test plugin.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16938 a1c6a512-1295-4272-9138-f99709370657

10 files changed, 40 insertions, 11 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index b1e5cce75d..15a59d6acc 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -75,6 +75,7 @@ gui/backdrop.c
 #endif
 
 #ifdef HAVE_LCD_CHARCELLS
+player/bmp.c
 player/icons.c
 player/keyboard.c
 #endif
@@ -129,6 +130,7 @@ metadata/mp4.c
 metadata/mpc.c
 metadata/ogg.c
 metadata/sid.c
+metadata/mod.c
 metadata/spc.c
 metadata/vorbis.c
 metadata/wave.c
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index 5a65341d02..7c066d284d 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -47,6 +47,7 @@ all: $(LINKCODEC) $(ROCKS)
 ifndef SIMVER
 $(BUILDDIR)/%.a : % $(CODECDEPS)
 
+$(OBJDIR)/mod.elf : $(OBJDIR)/mod.o $(OBJDIR)/codec_crt0.o
 $(OBJDIR)/wav.elf : $(OBJDIR)/wav.o $(OBJDIR)/codec_crt0.o
 $(OBJDIR)/sid.elf : $(OBJDIR)/sid.o $(OBJDIR)/codec_crt0.o
 $(OBJDIR)/adx.elf : $(OBJDIR)/adx.o $(OBJDIR)/codec_crt0.o
diff --git a/apps/codecs/SOURCES b/apps/codecs/SOURCES
index a93cb6c0cc..3c0118c1ce 100644
--- a/apps/codecs/SOURCES
+++ b/apps/codecs/SOURCES
@@ -13,6 +13,7 @@ wma.c
 aac.c
 #endif
 ape.c
+mod.c
 shorten.c
 aiff.c
 speex.c
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 5c8a7f965f..9dff553c08 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1144,7 +1144,7 @@ bool dbg_ports(void)
 
     while(1)
     {
-        line = 0;
+        line = 0;             
         lcd_puts(0, line++, "GPIO STATES:");
         snprintf(buf, sizeof(buf), "A: %02x  E: %02x  I: %02x",
                                    (unsigned int)GPIOA_INPUT_VAL,
diff --git a/apps/filetypes.c b/apps/filetypes.c
index 1ef136d5ce..694bb0a7cf 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -69,6 +69,7 @@ const struct filetype inbuilt_filetypes[] = {
     { "m4a", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
     { "m4b", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
     { "mp4", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "mod", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
     { "shn", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
     { "aif", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
     { "aiff",FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
diff --git a/apps/metadata.c b/apps/metadata.c
index 3abbd74c35..303fafc070 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -183,6 +183,14 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname)
 
         break;
 
+    case AFMT_MOD:
+        if (!get_mod_metadata(fd, id3))
+        {
+            return false;
+        }
+
+        break;
+
     case AFMT_SHN:
         id3->vbr = true;
         id3->filesize = filesize(fd);
diff --git a/apps/metadata/metadata_parsers.h b/apps/metadata/metadata_parsers.h
index c3265f8a43..b34d09fe4c 100644
--- a/apps/metadata/metadata_parsers.h
+++ b/apps/metadata/metadata_parsers.h
@@ -25,6 +25,7 @@ bool get_mp4_metadata(int fd, struct mp3entry* id3);
 bool get_monkeys_metadata(int fd, struct mp3entry* id3);
 bool get_musepack_metadata(int fd, struct mp3entry *id3);
 bool get_sid_metadata(int fd, struct mp3entry* id3);
+bool get_mod_metadata(int fd, struct mp3entry* id3);
 bool get_spc_metadata(int fd, struct mp3entry* id3);
 bool get_ogg_metadata(int fd, struct mp3entry* id3);
 bool get_wave_metadata(int fd, struct mp3entry* id3);
diff --git a/apps/plugins/CATEGORIES b/apps/plugins/CATEGORIES
index 4b267c162b..c2ad75e0c7 100644
--- a/apps/plugins/CATEGORIES
+++ b/apps/plugins/CATEGORIES
@@ -80,6 +80,7 @@ stopwatch,apps
 test_codec,viewers
 test_disk,apps
 test_fps,apps
+test_grey,apps
 test_sampr,apps
 test_scanrate,apps
 test_viewports,apps
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index b6603a44c0..fbfb38047d 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -19,6 +19,7 @@ stats.c
 stopwatch.c
 vbrfix.c
 viewer.c
+test_disk.c
 
 #ifdef OLYMPUS_MROBE_500
 /* remove these once the plugins before it are compileable */
@@ -47,6 +48,9 @@ flipit.c
 brickmania.c
 maze.c
 mazezam.c      
+greyscale.c
+test_fps.c
+test_scanrate.c
 text_editor.c
 wavview.c
 robotfindskitten.c
@@ -57,6 +61,10 @@ jpeg.c
 mandelbrot.c
 plasma.c
 
+#if LCD_DEPTH < 4
+test_grey.c
+#endif
+
 blackjack.c
 bounce.c
 bubbles.c
@@ -116,6 +124,7 @@ nim.c
 
 #if CONFIG_CODEC == SWCODEC        /* software codec platforms */
 mp3_encoder.c
+test_codec.c
 wav2wv.c
 #else                              /* hardware codec platforms */
 #ifndef HAVE_MMC                   /* not for Ondio, has no remote control pin */
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c
index 63ab97d89d..aabc623d9f 100644
--- a/apps/plugins/test_scanrate.c
+++ b/apps/plugins/test_scanrate.c
@@ -56,24 +56,29 @@ PLUGIN_HEADER
 #endif
 
 /* Default refresh rates in 1/10 Hz */
-#if CONFIG_LCD == LCD_SSD1815
+#if defined ARCHOS_RECORDER   || defined ARCHOS_FMRECORDER  \
+ || defined ARCHOS_RECORDERV2 || defined ARCHOS_ONDIOFM     \
+ || defined ARCHOS_ONDIOSP
 #define DEFAULT_SCAN_RATE 670
-#elif CONFIG_LCD == LCD_S1D15E06
-#define DEFAULT_SCAN_RATE 700
-#elif CONFIG_LCD == LCD_IPOD2BPP
-#define DEFAULT_SCAN_RATE 800
-#elif CONFIG_LCD == LCD_IPODMINI
-#define DEFAULT_SCAN_RATE 880
-#elif CONFIG_LCD == LCD_TL0350A
-#define DEFAULT_SCAN_RATE 1480
+#elif defined IAUDIO_M3
+#define DEFAULT_SCAN_RATE 1500
 #define HORIZ_SCAN /* LCD controller updates the panel sideways */
 #define NEED_BOOST
+#elif defined IAUDIO_M5
+#define DEFAULT_SCAN_RATE 730
+#elif defined IPOD_1G2G
+#define DEFAULT_SCAN_RATE 960
+#elif defined IPOD_MINI2G  || defined IPOD_MINI  \
+   || defined IPOD_3G      || defined IPOD_4G
+#define DEFAULT_SCAN_RATE 870
+#elif defined IRIVER_H100_SERIES
+#define DEFAULT_SCAN_RATE 700
 #else
 #define DEFAULT_SCAN_RATE 700
 #warning Generic default scanrate
 #endif
 
-#ifdef HORIZ_SCAN 
+#ifdef HORIZ_SCAN
 #define TEXT_X 0
 #if LCD_PIXELFORMAT == HORIZONTAL_PACKING
 #define BUF_WIDTH  ((LCD_WIDTH+7)/8)