diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-05-18 12:27:20 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-05-18 12:27:20 +0000 |
commit | 6cbc701d2a9890baa49f69f1692dddebf39e30cb (patch) | |
tree | 08f098ca1eb9ab308242e3e4dc1584691152ea1b /firmware/target | |
parent | d3735578c3d957e7bb68e2838024ab57bceade68 (diff) | |
download | rockbox-6cbc701d2a9890baa49f69f1692dddebf39e30cb.tar.gz rockbox-6cbc701d2a9890baa49f69f1692dddebf39e30cb.zip |
Rename sdl lcd initialization to (remote_)lcd_init_device which enables removing two #ifdef SIMULATOR and makes it happen as on target.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26137 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/hosted/sdl/lcd-bitmap.c | 2 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/lcd-charcells.c | 2 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/lcd-remote-bitmap.c | 4 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/system-sdl.c | 6 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/system-sdl.h | 1 |
5 files changed, 6 insertions, 9 deletions
diff --git a/firmware/target/hosted/sdl/lcd-bitmap.c b/firmware/target/hosted/sdl/lcd-bitmap.c index 6dfbffff37..7058b26e8c 100644 --- a/firmware/target/hosted/sdl/lcd-bitmap.c +++ b/firmware/target/hosted/sdl/lcd-bitmap.c | |||
@@ -160,7 +160,7 @@ void sim_backlight(int value) | |||
160 | #endif /* HAVE_BACKLIGHT */ | 160 | #endif /* HAVE_BACKLIGHT */ |
161 | 161 | ||
162 | /* initialise simulator lcd driver */ | 162 | /* initialise simulator lcd driver */ |
163 | void sim_lcd_init(void) | 163 | void lcd_init_device(void) |
164 | { | 164 | { |
165 | #if LCD_DEPTH == 16 | 165 | #if LCD_DEPTH == 16 |
166 | lcd_surface = SDL_CreateRGBSurface(SDL_SWSURFACE, | 166 | lcd_surface = SDL_CreateRGBSurface(SDL_SWSURFACE, |
diff --git a/firmware/target/hosted/sdl/lcd-charcells.c b/firmware/target/hosted/sdl/lcd-charcells.c index 900cbb04dd..9ceb5de391 100644 --- a/firmware/target/hosted/sdl/lcd-charcells.c +++ b/firmware/target/hosted/sdl/lcd-charcells.c | |||
@@ -106,7 +106,7 @@ void sim_backlight(int value) | |||
106 | #endif | 106 | #endif |
107 | 107 | ||
108 | /* initialise simulator lcd driver */ | 108 | /* initialise simulator lcd driver */ |
109 | void sim_lcd_init(void) | 109 | void lcd_init_device(void) |
110 | { | 110 | { |
111 | lcd_surface = SDL_CreateRGBSurface(SDL_SWSURFACE, | 111 | lcd_surface = SDL_CreateRGBSurface(SDL_SWSURFACE, |
112 | SIM_LCD_WIDTH * display_zoom, | 112 | SIM_LCD_WIDTH * display_zoom, |
diff --git a/firmware/target/hosted/sdl/lcd-remote-bitmap.c b/firmware/target/hosted/sdl/lcd-remote-bitmap.c index 9972f3e423..86d45ef446 100644 --- a/firmware/target/hosted/sdl/lcd-remote-bitmap.c +++ b/firmware/target/hosted/sdl/lcd-remote-bitmap.c | |||
@@ -98,8 +98,10 @@ void sim_remote_backlight(int value) | |||
98 | } | 98 | } |
99 | 99 | ||
100 | /* initialise simulator lcd remote driver */ | 100 | /* initialise simulator lcd remote driver */ |
101 | void sim_lcd_remote_init(void) | 101 | void lcd_remote_init_device(void) |
102 | { | 102 | { |
103 | if (!showremote) | ||
104 | return; | ||
103 | remote_surface = SDL_CreateRGBSurface(SDL_SWSURFACE, | 105 | remote_surface = SDL_CreateRGBSurface(SDL_SWSURFACE, |
104 | LCD_REMOTE_WIDTH * display_zoom, | 106 | LCD_REMOTE_WIDTH * display_zoom, |
105 | LCD_REMOTE_HEIGHT * display_zoom, | 107 | LCD_REMOTE_HEIGHT * display_zoom, |
diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c index 9d529de37f..7ab6fd2c34 100644 --- a/firmware/target/hosted/sdl/system-sdl.c +++ b/firmware/target/hosted/sdl/system-sdl.c | |||
@@ -140,12 +140,6 @@ static int sdl_event_thread(void * param) | |||
140 | 140 | ||
141 | SDL_WM_SetCaption(UI_TITLE, NULL); | 141 | SDL_WM_SetCaption(UI_TITLE, NULL); |
142 | 142 | ||
143 | sim_lcd_init(); | ||
144 | #ifdef HAVE_REMOTE_LCD | ||
145 | if (showremote) | ||
146 | sim_lcd_remote_init(); | ||
147 | #endif | ||
148 | |||
149 | if (background && picture_surface != NULL) | 143 | if (background && picture_surface != NULL) |
150 | SDL_BlitSurface(picture_surface, NULL, gui_surface, NULL); | 144 | SDL_BlitSurface(picture_surface, NULL, gui_surface, NULL); |
151 | 145 | ||
diff --git a/firmware/target/hosted/sdl/system-sdl.h b/firmware/target/hosted/sdl/system-sdl.h index ad7aa709ab..e87f096617 100644 --- a/firmware/target/hosted/sdl/system-sdl.h +++ b/firmware/target/hosted/sdl/system-sdl.h | |||
@@ -47,6 +47,7 @@ void sys_handle_argv(int argc, char *argv[]); | |||
47 | void gui_message_loop(void); | 47 | void gui_message_loop(void); |
48 | 48 | ||
49 | extern bool background; /* True if the background image is enabled */ | 49 | extern bool background; /* True if the background image is enabled */ |
50 | extern bool showremote; | ||
50 | extern int display_zoom; | 51 | extern int display_zoom; |
51 | extern long start_tick; | 52 | extern long start_tick; |
52 | 53 | ||