summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2002-10-15 12:25:57 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2002-10-15 12:25:57 +0000
commit0a4b247080dd132e847071adbc006ad9de2ca608 (patch)
tree5eb04ea6eefba517233d9c649ce5f6c56e6d16be /apps
parent6e0a75c596a6c4ec5ec2820e1873c8527aec5007 (diff)
downloadrockbox-0a4b247080dd132e847071adbc006ad9de2ca608.tar.gz
rockbox-0a4b247080dd132e847071adbc006ad9de2ca608.zip
The player firmware now autodetects the LCD type. No need for two player versions anymore
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2658 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/main_menu.c6
-rw-r--r--apps/menu.c10
-rw-r--r--apps/tree.c6
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