From 81ef39bd8d6005c09d8245ab36ed87f38a4aa95c Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Tue, 13 Oct 2009 20:51:28 +0000 Subject: Changes to make the Nano2G sim build. It is still missing a UI-ipodnano2g.bmp git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23163 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 2 ++ uisimulator/sdl/uisdl.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/firmware/SOURCES b/firmware/SOURCES index 67bb5adbe4..db468335f2 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1320,6 +1320,7 @@ target/arm/s5l8700/udacodec-meizu.c #endif /* MEIZU_M3 */ #ifdef IPOD_NANO2G +#ifndef SIMULATOR drivers/audio/wm8975.c target/arm/ipod/button-clickwheel.c target/arm/s5l8700/kernel-s5l8700.c @@ -1339,6 +1340,7 @@ target/arm/s5l8700/ipodnano2g/nand-nano2g.c target/arm/s5l8700/ipodnano2g/pmu-nano2g.c target/arm/s5l8700/ipodnano2g/rtc-nano2g.c #endif +#endif #ifndef SIMULATOR #if CONFIG_CPU == JZ4732 diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h index 52294c0587..a14c453c61 100644 --- a/uisimulator/sdl/uisdl.h +++ b/uisimulator/sdl/uisdl.h @@ -116,6 +116,13 @@ #define UI_LCD_POSX 13 /* x position of lcd */ #define UI_LCD_POSY 14 /* y position of lcd */ +#elif defined(IPOD_NANO2G) +#define UI_TITLE "iPod Nano 2G" +#define UI_WIDTH 199 /* width of GUI window */ +#define UI_HEIGHT 421 /* height of GUI window */ +#define UI_LCD_POSX 13 /* x position of lcd */ +#define UI_LCD_POSY 14 /* y position of lcd */ + #elif defined(IPOD_VIDEO) #define UI_TITLE "iPod Video" #define UI_WIDTH 350 /* width of GUI window */ -- cgit v1.2.3