diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/main_menu.c | 6 | ||||
| -rw-r--r-- | apps/menu.c | 10 | ||||
| -rw-r--r-- | apps/tree.c | 6 |
3 files changed, 9 insertions, 13 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index de51b57701..cf31e74961 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c @@ -16,7 +16,7 @@ * KIND, either express or implied. * ****************************************************************************/ - +#include "config.h" #include "options.h" #include "menu.h" @@ -107,9 +107,7 @@ int show_logo( void ) #else char *rockbox = " ROCKbox!"; lcd_clear_display(); -#ifdef HAVE_NEW_CHARCELL_LCD lcd_double_height(true); -#endif lcd_puts(0, 0, rockbox); lcd_puts(0, 1, appsversion); #endif @@ -123,7 +121,7 @@ bool show_credits(void) int btn; show_logo(); -#ifdef HAVE_NEW_CHARCELL_LCD +#ifdef HAVE_LCD_CHARCELLS lcd_double_height(false); #endif diff --git a/apps/menu.c b/apps/menu.c index eee1052d65..7051850a49 100644 --- a/apps/menu.c +++ b/apps/menu.c @@ -18,6 +18,7 @@ ****************************************************************************/ #include <stdbool.h> +#include "hwcompat.h" #include "lcd.h" #include "font.h" #include "backlight.h" @@ -80,11 +81,8 @@ struct menu { #endif /* HAVE_LCD_BITMAP */ -#ifdef HAVE_NEW_CHARCELL_LCD -#define CURSOR_CHAR 0x7e -#else -#define CURSOR_CHAR 0x89 -#endif +#define NEW_CURSOR_CHAR 0x7e +#define OLD_CURSOR_CHAR 0x89 static struct menu menus[MAX_MENUS]; static bool inuse[MAX_MENUS] = { false }; @@ -108,7 +106,7 @@ void put_cursorxy(int x, int y, bool on) lcd_bitmap ( bitmap_icons_6x8[Cursor], xpos, ypos, 4, 8, true); #else - lcd_putc(x, y, CURSOR_CHAR); + lcd_putc(x, y, has_new_lcd()?NEW_CURSOR_CHAR:OLD_CURSOR_CHAR); #endif } else { diff --git a/apps/tree.c b/apps/tree.c index b026211f3c..1b19b04bba 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -303,7 +303,7 @@ static int showdir(char *path, int start) qsort(dircache,filesindir,sizeof(struct entry),compare); if ( dir_buffer_full || filesindir == MAX_FILES_IN_DIR ) { -#ifdef HAVE_NEW_CHARCELL_LCD +#ifdef HAVE_LCD_CHARCELLS lcd_double_height(false); #endif lcd_clear_display(); @@ -347,7 +347,7 @@ static int showdir(char *path, int start) } lcd_stop_scroll(); -#ifdef HAVE_NEW_CHARCELL_LCD +#ifdef HAVE_LCD_CHARCELLS lcd_double_height(false); #endif lcd_clear_display(); @@ -446,7 +446,7 @@ static int showdir(char *path, int start) bool ask_resume(void) { -#ifdef HAVE_NEW_CHARCELL_LCD +#ifdef HAVE_LCD_CHARCELLS lcd_double_height(false); #endif |