diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2007-04-03 18:06:13 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-03 18:06:13 +0000 |
| commit | 323d75d25f58f6e13c91fe1c42e974cc6fb54c19 (patch) | |
| tree | 2779a96fdde5a9b10cd06eb2b7c1c4980a858320 /apps | |
| parent | bbe1eaf89ed2345af0ad5d865dcb1d2f58bf40bd (diff) | |
| download | rockbox-323d75d25f58f6e13c91fe1c42e974cc6fb54c19.zip rockbox-323d75d25f58f6e13c91fe1c42e974cc6fb54c19.tar.gz rockbox-323d75d25f58f6e13c91fe1c42e974cc6fb54c19.tar.bz2 rockbox-323d75d25f58f6e13c91fe1c42e974cc6fb54c19.tar.xz | |
It's not necessary (anymore?) to map lcd_icon() to sim_lcd_icon() for the simulator. * Removed a stray lcd_icon() call from usb handling.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13006 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/plugin.c | 2 | ||||
| -rw-r--r-- | apps/plugin.h | 2 | ||||
| -rw-r--r-- | apps/screen_access.c | 8 |
3 files changed, 2 insertions, 10 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index 90081cc..31de9fa 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -81,7 +81,7 @@ static const struct plugin_api rockbox_api = { lcd_putc, lcd_put_cursor, lcd_remove_cursor, - PREFIX(lcd_icon), + lcd_icon, lcd_double_height, #else lcd_set_drawmode, diff --git a/apps/plugin.h b/apps/plugin.h index cb076f5..ccc8d1c 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -149,7 +149,7 @@ struct plugin_api { void (*lcd_putc)(int x, int y, unsigned long ucs); void (*lcd_put_cursor)(int x, int y, unsigned long ucs); void (*lcd_remove_cursor)(void); - void (*PREFIX(lcd_icon))(int icon, bool enable); + void (*lcd_icon)(int icon, bool enable); void (*lcd_double_height)(bool on); #else void (*lcd_set_drawmode)(int mode); diff --git a/apps/screen_access.c b/apps/screen_access.c index 89b09ad..03687a3 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c @@ -81,11 +81,7 @@ void screen_init(struct screen * screen, enum screen_type screen_type) screen->putc=&lcd_remote_putc; screen->get_locked_pattern=&lcd_remote_get_locked_pattern; screen->define_pattern=&lcd_remote_define_pattern; -#ifdef SIMULATOR - screen->icon=&sim_lcd_remote_icon; -#else screen->icon=&lcd_remote_icon; -#endif #endif /* 0 */ screen->init=&lcd_remote_init; @@ -164,11 +160,7 @@ void screen_init(struct screen * screen, enum screen_type screen_type) screen->putc=&lcd_putc; screen->get_locked_pattern=&lcd_get_locked_pattern; screen->define_pattern=&lcd_define_pattern; -#ifdef SIMULATOR - screen->icon=&sim_lcd_icon; -#else screen->icon=&lcd_icon; -#endif #endif /* HAVE_LCD_CHARCELLS */ screen->init=&lcd_init; |