diff options
-rw-r--r-- | apps/plugin.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 2 | ||||
-rw-r--r-- | apps/screen_access.c | 8 | ||||
-rw-r--r-- | firmware/export/lcd.h | 1 | ||||
-rw-r--r-- | firmware/usb.c | 3 | ||||
-rw-r--r-- | uisimulator/common/sim_icons.c | 2 | ||||
-rw-r--r-- | uisimulator/common/sim_icons.h | 27 |
7 files changed, 2 insertions, 43 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index 90081cc07d..31de9fa56f 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -81,7 +81,7 @@ static const struct plugin_api rockbox_api = { | |||
81 | lcd_putc, | 81 | lcd_putc, |
82 | lcd_put_cursor, | 82 | lcd_put_cursor, |
83 | lcd_remove_cursor, | 83 | lcd_remove_cursor, |
84 | PREFIX(lcd_icon), | 84 | lcd_icon, |
85 | lcd_double_height, | 85 | lcd_double_height, |
86 | #else | 86 | #else |
87 | lcd_set_drawmode, | 87 | lcd_set_drawmode, |
diff --git a/apps/plugin.h b/apps/plugin.h index cb076f5b85..ccc8d1c3af 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -149,7 +149,7 @@ struct plugin_api { | |||
149 | void (*lcd_putc)(int x, int y, unsigned long ucs); | 149 | void (*lcd_putc)(int x, int y, unsigned long ucs); |
150 | void (*lcd_put_cursor)(int x, int y, unsigned long ucs); | 150 | void (*lcd_put_cursor)(int x, int y, unsigned long ucs); |
151 | void (*lcd_remove_cursor)(void); | 151 | void (*lcd_remove_cursor)(void); |
152 | void (*PREFIX(lcd_icon))(int icon, bool enable); | 152 | void (*lcd_icon)(int icon, bool enable); |
153 | void (*lcd_double_height)(bool on); | 153 | void (*lcd_double_height)(bool on); |
154 | #else | 154 | #else |
155 | void (*lcd_set_drawmode)(int mode); | 155 | void (*lcd_set_drawmode)(int mode); |
diff --git a/apps/screen_access.c b/apps/screen_access.c index 89b09ad959..03687a3dbb 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) | |||
81 | screen->putc=&lcd_remote_putc; | 81 | screen->putc=&lcd_remote_putc; |
82 | screen->get_locked_pattern=&lcd_remote_get_locked_pattern; | 82 | screen->get_locked_pattern=&lcd_remote_get_locked_pattern; |
83 | screen->define_pattern=&lcd_remote_define_pattern; | 83 | screen->define_pattern=&lcd_remote_define_pattern; |
84 | #ifdef SIMULATOR | ||
85 | screen->icon=&sim_lcd_remote_icon; | ||
86 | #else | ||
87 | screen->icon=&lcd_remote_icon; | 84 | screen->icon=&lcd_remote_icon; |
88 | #endif | ||
89 | #endif /* 0 */ | 85 | #endif /* 0 */ |
90 | 86 | ||
91 | screen->init=&lcd_remote_init; | 87 | screen->init=&lcd_remote_init; |
@@ -164,11 +160,7 @@ void screen_init(struct screen * screen, enum screen_type screen_type) | |||
164 | screen->putc=&lcd_putc; | 160 | screen->putc=&lcd_putc; |
165 | screen->get_locked_pattern=&lcd_get_locked_pattern; | 161 | screen->get_locked_pattern=&lcd_get_locked_pattern; |
166 | screen->define_pattern=&lcd_define_pattern; | 162 | screen->define_pattern=&lcd_define_pattern; |
167 | #ifdef SIMULATOR | ||
168 | screen->icon=&sim_lcd_icon; | ||
169 | #else | ||
170 | screen->icon=&lcd_icon; | 163 | screen->icon=&lcd_icon; |
171 | #endif | ||
172 | #endif /* HAVE_LCD_CHARCELLS */ | 164 | #endif /* HAVE_LCD_CHARCELLS */ |
173 | 165 | ||
174 | screen->init=&lcd_init; | 166 | screen->init=&lcd_init; |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 68f0961a5c..40e5129ad3 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -28,7 +28,6 @@ | |||
28 | #define STYLE_INVERT 1 | 28 | #define STYLE_INVERT 1 |
29 | 29 | ||
30 | #ifdef SIMULATOR | 30 | #ifdef SIMULATOR |
31 | #define lcd_icon(x,y) sim_lcd_icon(x,y) | ||
32 | #ifndef MAX_PATH | 31 | #ifndef MAX_PATH |
33 | #define MAX_PATH 260 | 32 | #define MAX_PATH 260 |
34 | #endif | 33 | #endif |
diff --git a/firmware/usb.c b/firmware/usb.c index f5deed4da6..aa6981ddf2 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -298,9 +298,6 @@ static void usb_thread(void) | |||
298 | waiting_for_ack = true; | 298 | waiting_for_ack = true; |
299 | DEBUGF("USB extracted. Waiting for ack from %d threads...\n", | 299 | DEBUGF("USB extracted. Waiting for ack from %d threads...\n", |
300 | num_acks_to_expect); | 300 | num_acks_to_expect); |
301 | #ifdef HAVE_LCD_CHARCELLS | ||
302 | lcd_icon(ICON_USB, false); | ||
303 | #endif | ||
304 | break; | 301 | break; |
305 | 302 | ||
306 | case SYS_USB_DISCONNECTED_ACK: | 303 | case SYS_USB_DISCONNECTED_ACK: |
diff --git a/uisimulator/common/sim_icons.c b/uisimulator/common/sim_icons.c index e60182fa63..f24fce2ca5 100644 --- a/uisimulator/common/sim_icons.c +++ b/uisimulator/common/sim_icons.c | |||
@@ -19,8 +19,6 @@ | |||
19 | #include "config.h" | 19 | #include "config.h" |
20 | #ifdef HAVE_LCD_CHARCELLS | 20 | #ifdef HAVE_LCD_CHARCELLS |
21 | 21 | ||
22 | #include "sim_icons.h" | ||
23 | |||
24 | #include <lcd.h> | 22 | #include <lcd.h> |
25 | #include <kernel.h> | 23 | #include <kernel.h> |
26 | #include <sprintf.h> | 24 | #include <sprintf.h> |
diff --git a/uisimulator/common/sim_icons.h b/uisimulator/common/sim_icons.h deleted file mode 100644 index 4555b65189..0000000000 --- a/uisimulator/common/sim_icons.h +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 Mats Lidell <matsl@contactor.se> | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITH OUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | |||
20 | #ifndef SIM_ICONS | ||
21 | #define SIM_ICONS | ||
22 | |||
23 | #include <stdbool.h> | ||
24 | |||
25 | extern void sim_lcd_icon(int icon, bool enable); | ||
26 | |||
27 | #endif /* SIM_ICONS */ | ||