devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13006 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-04-03 18:06:13 +00:00
parent bbe1eaf89e
commit 323d75d25f
7 changed files with 2 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugin.c
View file

@ -81,7 +81,7 @@ static const struct plugin_api rockbox_api = {
lcd_putc, lcd_putc,
lcd_put_cursor, lcd_put_cursor,
lcd_remove_cursor, lcd_remove_cursor,
PREFIX(lcd_icon), lcd_icon,
lcd_double_height, lcd_double_height,
#else #else
lcd_set_drawmode, lcd_set_drawmode,

2
apps/plugin.h
View file

@ -149,7 +149,7 @@ struct plugin_api {
void (*lcd_putc)(int x, int y, unsigned long ucs); void (*lcd_putc)(int x, int y, unsigned long ucs);
void (*lcd_put_cursor)(int x, int y, unsigned long ucs); void (*lcd_put_cursor)(int x, int y, unsigned long ucs);
void (*lcd_remove_cursor)(void); 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); void (*lcd_double_height)(bool on);
#else #else
void (*lcd_set_drawmode)(int mode); void (*lcd_set_drawmode)(int mode);

8
apps/screen_access.c
View file

@ -81,11 +81,7 @@ void screen_init(struct screen * screen, enum screen_type screen_type)
screen->putc=&lcd_remote_putc; screen->putc=&lcd_remote_putc;
screen->get_locked_pattern=&lcd_remote_get_locked_pattern; screen->get_locked_pattern=&lcd_remote_get_locked_pattern;
screen->define_pattern=&lcd_remote_define_pattern; screen->define_pattern=&lcd_remote_define_pattern;
#ifdef SIMULATOR
screen->icon=&sim_lcd_remote_icon;
#else
screen->icon=&lcd_remote_icon; screen->icon=&lcd_remote_icon;
#endif
#endif /* 0 */ #endif /* 0 */
screen->init=&lcd_remote_init; 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->putc=&lcd_putc;
screen->get_locked_pattern=&lcd_get_locked_pattern; screen->get_locked_pattern=&lcd_get_locked_pattern;
screen->define_pattern=&lcd_define_pattern; screen->define_pattern=&lcd_define_pattern;
#ifdef SIMULATOR
screen->icon=&sim_lcd_icon;
#else
screen->icon=&lcd_icon; screen->icon=&lcd_icon;
#endif
#endif /* HAVE_LCD_CHARCELLS */ #endif /* HAVE_LCD_CHARCELLS */
screen->init=&lcd_init; screen->init=&lcd_init;

1
firmware/export/lcd.h
View file

@ -28,7 +28,6 @@
#define STYLE_INVERT 1 #define STYLE_INVERT 1
#ifdef SIMULATOR #ifdef SIMULATOR
#define lcd_icon(x,y) sim_lcd_icon(x,y)
#ifndef MAX_PATH #ifndef MAX_PATH
#define MAX_PATH 260 #define MAX_PATH 260
#endif #endif

3
firmware/usb.c
View file

@ -298,9 +298,6 @@ static void usb_thread(void)
waiting_for_ack = true; waiting_for_ack = true;
DEBUGF("USB extracted. Waiting for ack from %d threads...\n", DEBUGF("USB extracted. Waiting for ack from %d threads...\n",
num_acks_to_expect); num_acks_to_expect);
#ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_USB, false);
#endif
break; break;
case SYS_USB_DISCONNECTED_ACK: case SYS_USB_DISCONNECTED_ACK:

2
uisimulator/common/sim_icons.c
View file

@ -19,8 +19,6 @@
#include "config.h" #include "config.h"
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
#include "sim_icons.h"
#include <lcd.h> #include <lcd.h>
#include <kernel.h> #include <kernel.h>
#include <sprintf.h> #include <sprintf.h>

27
uisimulator/common/sim_icons.h
View file

@ -1,27 +0,0 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2002 Mats Lidell <matsl@contactor.se>
*
* All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement.
*
* This software is distributed on an "AS IS" basis, WITH OUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#ifndef SIM_ICONS
#define SIM_ICONS
#include <stdbool.h>
extern void sim_lcd_icon(int icon, bool enable);
#endif /* SIM_ICONS */