From 4f879766778ea4d1051db036e939a17ddb3e532a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= <nils@rockbox.org>
Date: Wed, 19 Aug 2009 21:48:17 +0000
Subject: Slight cleanup in lcd.h: kill fixme and remove useless include, add
 some includes elsewhere and add a stub for sims instead of ifdef

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22431 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/bitmap/list.c          |  1 +
 apps/gui/charcell/list.c        |  1 +
 firmware/export/lcd.h           | 14 --------------
 firmware/export/scroll_engine.h |  1 +
 uisimulator/common/stubs.c      |  4 ++++
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index e47c46c..8e4cd44 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -30,6 +30,7 @@
 #include "settings.h"
 #include "kernel.h"
 #include "system.h"
+#include "file.h"
 
 #include "action.h"
 #include "screen_access.h"
diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c
index 285cd3e..8d91c2f 100644
--- a/apps/gui/charcell/list.c
+++ b/apps/gui/charcell/list.c
@@ -30,6 +30,7 @@
 #include "settings.h"
 #include "kernel.h"
 #include "system.h"
+#include "file.h"
 
 #include "list.h"
 #include "screen_access.h"
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 11fcc98..5846fae 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -62,14 +62,6 @@ struct viewport {
 #define NUMLN_UNPACK(x)  ((unsigned char)((x) & STYLE_MAXLN_MASK))
 #endif
 
-#ifdef SIMULATOR
-#ifndef MAX_PATH
-#define MAX_PATH 260
-#endif
-#else
-#include "file.h"  /* for MAX_PATH; FIXME: Why does this not work for sims? */
-#endif /* SIMULATOR */
-
 #ifdef HAVE_LCD_BITMAP
 #if LCD_DEPTH <=8
 #if (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \
@@ -112,13 +104,7 @@ extern void lcd_write_command_e(int cmd, int data);
 extern void lcd_write_command_ex(int cmd, int data1, int data2);
 extern void lcd_write_data(const fb_data* p_bytes, int count);
 extern void lcd_init(void);
-
-#ifdef SIMULATOR
-/* Define a dummy device specific init for the sims */
-#define lcd_init_device()
-#else
 extern void lcd_init_device(void);
-#endif /* SIMULATOR */
 
 extern void lcd_backlight(bool on);
 extern int  lcd_default_contrast(void);
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h
index 2806dc7..762761f 100644
--- a/firmware/export/scroll_engine.h
+++ b/firmware/export/scroll_engine.h
@@ -26,6 +26,7 @@
 #define __SCROLL_ENGINE_H__
 
 #include <lcd.h>
+#include "file.h"
 
 void scroll_init(void);
 void lcd_scroll_stop(struct viewport* vp);
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index 1d0d6c5..cb208bf 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -275,6 +275,10 @@ void lcd_set_contrast( int x )
     (void)x;
 }
 
+void lcd_init_device(void)
+{
+}
+
 void mpeg_set_pitch(int pitch)
 {
     (void)pitch;
-- 
cgit v1.1