From bd16e2fa9491b581df4454bcc6514ef12e06adf6 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 4 May 2002 12:27:18 +0000 Subject: [PATCH] Use the defines, we can't assume a particular LCD or keypad. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@424 a1c6a512-1295-4272-9138-f99709370657 --- uisimulator/app.c | 25 ++++++++++++++++++++++++- uisimulator/screensaver.c | 5 +++-- uisimulator/screensaver.h | 3 ++- uisimulator/tetris.c | 4 ++++ uisimulator/tree.c | 2 ++ 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/uisimulator/app.c b/uisimulator/app.c index db60099d40..790a9b7d88 100644 --- a/uisimulator/app.c +++ b/uisimulator/app.c @@ -26,6 +26,8 @@ #include "tree.h" #include "screensaver.h" +#ifdef HAVE_LCD_BITMAP + extern void tetris(void); #define MENU_ITEM_FONT 0 @@ -45,7 +47,7 @@ struct Menu_Items { struct Menu_Items items[] = { { Tetris, "Tetris", tetris }, { Screen_Saver, "Screen Saver", screensaver }, - { Browse, "Browse", dirbrowse }, + { Browse, "Browse", browse_root }, }; @@ -154,5 +156,26 @@ void app_main(void) } } +#else +void app_main(void) +{ + int key; + int cursor = 0; + lcd_puts(0,0, "Mooo!"); + lcd_puts(1,1, " Rockbox!"); + + while(1) { + key = button_get(); + + if(!key) { + sleep(1); + continue; + } + + } + +} + +#endif diff --git a/uisimulator/screensaver.c b/uisimulator/screensaver.c index 8613967691..a4166f20b4 100644 --- a/uisimulator/screensaver.c +++ b/uisimulator/screensaver.c @@ -17,6 +17,8 @@ * ****************************************************************************/ +#ifdef HAVE_LCD_BITMAP + #include "screensaver.h" #include "types.h" #include "lcd.h" @@ -125,5 +127,4 @@ void screensaver(void) ss_loop(); } - - +#endif diff --git a/uisimulator/screensaver.h b/uisimulator/screensaver.h index 539a14afbf..5c67b83b56 100644 --- a/uisimulator/screensaver.h +++ b/uisimulator/screensaver.h @@ -23,4 +23,5 @@ void ss_loop(void); void screensaver(void); -#endif __SCREEN_SAVER_H__ +#endif /*__SCREEN_SAVER_H__ */ + diff --git a/uisimulator/tetris.c b/uisimulator/tetris.c index 18cf36a575..2f02e042d4 100644 --- a/uisimulator/tetris.c +++ b/uisimulator/tetris.c @@ -19,6 +19,8 @@ * ****************************************************************************/ +#ifdef HAVE_LCD_BITMAP + #include "types.h" #include "lcd.h" #include "button.h" @@ -356,3 +358,5 @@ void tetris(void) new_block(); game_loop(); } + +#endif diff --git a/uisimulator/tree.c b/uisimulator/tree.c index ff040e2ddf..b6342c67f5 100644 --- a/uisimulator/tree.c +++ b/uisimulator/tree.c @@ -46,6 +46,7 @@ bool dirbrowse(char *root) if(!dir) return TRUE; /* failure */ +#ifdef HAVE_LCD_BITMAP lcd_clearrect(0, 0, LCD_WIDTH, LCD_HEIGHT); lcd_puts(0,0, "[Browse]", 0); @@ -97,6 +98,7 @@ bool dirbrowse(char *root) break; } } +#endif return FALSE; }