summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2018-03-04 20:50:08 +0100
committerMarcin Bukat <marcin.bukat@gmail.com>2018-06-12 10:31:15 +0200
commitd5889b3d94c0ff2403c2c6c9c89500b85e050bca (patch)
treef0dea7d5ff9806b2e8c0b139bc21fa9f3cc371c2
parentfbb6a2ff6d751adaaef73a86a98700f91571d0a1 (diff)
downloadrockbox-d5889b3d94c0ff2403c2c6c9c89500b85e050bca.tar.gz
rockbox-d5889b3d94c0ff2403c2c6c9c89500b85e050bca.zip
Agptek Rocker: Make simulator compile and run
There are some things to fix left but at least it starts and you can navigate. Change-Id: I76084bfc50334deeb55f46a10e97b5d6639815ac
-rw-r--r--firmware/SOURCES2
-rw-r--r--firmware/target/hosted/sdl/lcd-bitmap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 96d5d3dcec..b85111af44 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -483,7 +483,7 @@ target/hosted/pcm-alsa.c
483drivers/audio/nwzlinux-codec.c 483drivers/audio/nwzlinux-codec.c
484target/hosted/alsa-controls.c 484target/hosted/alsa-controls.c
485target/hosted/pcm-alsa.c 485target/hosted/pcm-alsa.c
486#elif defined(HAVE_ROCKER_CODEC) 486#elif defined(HAVE_ROCKER_CODEC) && !defined(SIMULATOR)
487drivers/audio/rocker_codec.c 487drivers/audio/rocker_codec.c
488#elif defined(HAVE_SDL_AUDIO) 488#elif defined(HAVE_SDL_AUDIO)
489drivers/audio/sdl.c 489drivers/audio/sdl.c
diff --git a/firmware/target/hosted/sdl/lcd-bitmap.c b/firmware/target/hosted/sdl/lcd-bitmap.c
index 5add2367a0..5f895d802d 100644
--- a/firmware/target/hosted/sdl/lcd-bitmap.c
+++ b/firmware/target/hosted/sdl/lcd-bitmap.c
@@ -112,7 +112,7 @@ static unsigned long get_lcd_pixel(int x, int y)
112#else 112#else
113 return *FBADDR(x, y); 113 return *FBADDR(x, y);
114#endif 114#endif
115#elif LCD_DEPTH == 24 115#elif LCD_DEPTH >= 24
116 return FB_UNPACK_SCALAR_LCD(*FBADDR(x, y)); 116 return FB_UNPACK_SCALAR_LCD(*FBADDR(x, y));
117#endif 117#endif
118} 118}