Added weird circumvention macros for SIMULATOR builds. When we build a

charcell LCD simulator, we keep the bitmap LCD functions too, as we use
the bitmap functionality to put characters on screen. But since the charcell
LCD api and the bitmap LCD api use the same function names for a few
functions, we include redef and undef files to fix that...


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

2 files changed, 22 insertions, 2 deletions

diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c
index 6df3f28ffd..66b1c682e7 100644
--- a/firmware/drivers/lcd.c
+++ b/firmware/drivers/lcd.c
@@ -325,6 +325,7 @@ static const unsigned char lcd_ascii[] = {
 };
 #endif /* HAVE_NEW_CHARCELL_LCD */
 
+#ifndef SIMULATOR
 void lcd_clear_display(void)
 {
     int i;
@@ -347,8 +348,14 @@ void lcd_define_pattern (int which,char *pattern,int length)
     for (i=0;i<length;i++)
         lcd_write(FALSE,pattern[i]);
 }
+#endif
 
-#elif HAVE_LCD_BITMAP /* not CHARCELLS */
+#endif
+#if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) /* not CHARCELLS */
+
+#if defined(HAVE_LCD_CHARCELLS) && defined(SIMULATOR)
+#include <chardef.h>
+#endif
 
 /*
  * All bitmaps have this format:
@@ -681,6 +688,10 @@ void lcd_fontsize(char font, char *width, char *height)
     }
 }
 
+#if defined(HAVE_LCD_CHARCELLS) && defined(SIMULATOR)
+#include <charundef.h>
+#endif
+
 #else
 /* no LCD defined, no code to use */
 #endif
diff --git a/firmware/drivers/lcd.h b/firmware/drivers/lcd.h
index 7e0495cd99..21da38188a 100644
--- a/firmware/drivers/lcd.h
+++ b/firmware/drivers/lcd.h
@@ -63,7 +63,12 @@ extern void lcd_backlight(bool on);
 extern void lcd_puts(int x, int y, char *string);
 extern void lcd_define_pattern (int which,char *pattern,int length);
 
-#elif HAVE_LCD_BITMAP
+#endif
+#if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
+
+#if defined(HAVE_LCD_CHARCELLS) && defined(SIMULATOR)
+#include <chardef.h>
+#endif
 
 #define LCD_WIDTH       112   /* Display width in pixels */
 #define LCD_HEIGHT      64    /* Display height in pixels */
@@ -82,6 +87,10 @@ extern void lcd_clearpixel(int x, int y);
 
 void lcd_fontsize(char font, char *width, char *height);
 
+#if defined(HAVE_LCD_CHARCELLS) && defined(SIMULATOR)
+#include <charundef.h>
+#endif
+
 #endif /* CHARCELLS / BITMAP */
 
 #endif /* __LCD_H__ */