(Optional) logf support

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

5 files changed, 28 insertions, 22 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 10a04da6ea..8bf0ed37db 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -1,3 +1,4 @@
+logfdisp.c
 alarm_menu.c
 bookmark.c
 credits.c
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 044e5f73e3..5f4e67f537 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -57,6 +57,7 @@
 #ifdef HAVE_MMC
 #include "ata_mmc.h"
 #endif
+#include "logfdisp.h"
 
 #ifdef IRIVER_H100
 #include "uda1380.h"
@@ -2047,6 +2048,9 @@ bool debug_menu(void)
 #ifdef CONFIG_TUNER
         { "FM Radio", dbg_fm_radio },
 #endif
+#ifdef ROCKBOX_HAS_LOGF
+        {"logf", logfdisplay },
+#endif
     };
 
     m=menu_init( items, sizeof items / sizeof(struct menu_item), NULL,
diff --git a/apps/logfdisp.c b/apps/logfdisp.c
index 510cb28b57..36c4997aa8 100644
--- a/apps/logfdisp.c
+++ b/apps/logfdisp.c
@@ -17,6 +17,8 @@
  *
  ****************************************************************************/
 #include "config.h"
+
+#ifdef ROCKBOX_HAS_LOGF
 #include <timefuncs.h>
 #include <string.h>
 #include <kernel.h>
@@ -74,4 +76,13 @@ bool logfdisplay(void)
 
     return false;
 }
-#endif
+#else /* HAVE_LCD_BITMAP */
+bool logfdisplay(void)
+
+{
+    /* TODO: implement a browser for charcell bitmaps */
+    return false;
+}
+#endif /* HAVE_LCD_BITMAP */
+
+#endif /* ROCKBOX_HAS_LOGF */
diff --git a/apps/logfdisp.h b/apps/logfdisp.h
index 58ec9b9969..1b0d8c9ddb 100644
--- a/apps/logfdisp.h
+++ b/apps/logfdisp.h
@@ -16,6 +16,9 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#ifdef HAVE_LCD_BITMAP
+#ifndef LOGFDISP_H
+#define LOGFDISP_H
 bool logfdisplay(void);
-#endif
+
+#endif /* LOGFDISP_H */
+
diff --git a/apps/main_menu.c b/apps/main_menu.c
index e1bf424d36..44321142c8 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -51,6 +51,7 @@
 #endif
 #include "misc.h"
 #include "lang.h"
+#include "logfdisp.h"
 
 #ifdef HAVE_RECORDING
 #include "recording.h"
@@ -80,25 +81,8 @@ int show_logo( void )
 #endif
 
 #ifdef HAVE_REMOTE_LCD
-         lcd_remote_bitmap(rockbox112x37,10,14,112,37, false);
-#endif
-
-#if 0
-    /*
-     * This code is not used anymore, but I kept it here since it shows
-     * one way of using the BMP reader function to display an externally
-     * providing logo.
-     */
-    unsigned char buffer[112 * 8];
-    int width, height;
-
-    int failure;
-    failure = read_bmp_file("/rockbox112.bmp", &width, &height, buffer);
-
-    debugf("read_bmp_file() returned %d, width %d height %d\n",
-           failure, width, height);
-           
-    lcd_bitmap(&buffer, 0, 10, width, height, false);
+    lcd_remote_clear_display();
+    lcd_remote_bitmap(rockbox112x37,10,14,112,37, false);
 #endif
 
     snprintf(version, sizeof(version), "Ver. %s", appsversion);
@@ -365,6 +349,9 @@ bool info_menu(void)
         { ID2P(LANG_DEBUG),              debug_menu        },
 #else
         { ID2P(LANG_USB),                simulate_usb      },
+#ifdef ROCKBOX_HAS_LOGF
+        {"logf", logfdisplay },
+#endif
 #endif
     };