diff options
author | Dave Chapman <dave@dchapman.com> | 2009-10-13 20:51:28 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2009-10-13 20:51:28 +0000 |
commit | 81ef39bd8d6005c09d8245ab36ed87f38a4aa95c (patch) | |
tree | a6ac4c22ac57608becd3ec9b93daf363feb28d2e | |
parent | 11bd80cd3849e71358e0efabfa5149e6ce7dc462 (diff) | |
download | rockbox-81ef39bd8d6005c09d8245ab36ed87f38a4aa95c.tar.gz rockbox-81ef39bd8d6005c09d8245ab36ed87f38a4aa95c.zip |
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
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | uisimulator/sdl/uisdl.h | 7 |
2 files changed, 9 insertions, 0 deletions
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 | |||
1320 | #endif /* MEIZU_M3 */ | 1320 | #endif /* MEIZU_M3 */ |
1321 | 1321 | ||
1322 | #ifdef IPOD_NANO2G | 1322 | #ifdef IPOD_NANO2G |
1323 | #ifndef SIMULATOR | ||
1323 | drivers/audio/wm8975.c | 1324 | drivers/audio/wm8975.c |
1324 | target/arm/ipod/button-clickwheel.c | 1325 | target/arm/ipod/button-clickwheel.c |
1325 | target/arm/s5l8700/kernel-s5l8700.c | 1326 | target/arm/s5l8700/kernel-s5l8700.c |
@@ -1339,6 +1340,7 @@ target/arm/s5l8700/ipodnano2g/nand-nano2g.c | |||
1339 | target/arm/s5l8700/ipodnano2g/pmu-nano2g.c | 1340 | target/arm/s5l8700/ipodnano2g/pmu-nano2g.c |
1340 | target/arm/s5l8700/ipodnano2g/rtc-nano2g.c | 1341 | target/arm/s5l8700/ipodnano2g/rtc-nano2g.c |
1341 | #endif | 1342 | #endif |
1343 | #endif | ||
1342 | 1344 | ||
1343 | #ifndef SIMULATOR | 1345 | #ifndef SIMULATOR |
1344 | #if CONFIG_CPU == JZ4732 | 1346 | #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 @@ | |||
116 | #define UI_LCD_POSX 13 /* x position of lcd */ | 116 | #define UI_LCD_POSX 13 /* x position of lcd */ |
117 | #define UI_LCD_POSY 14 /* y position of lcd */ | 117 | #define UI_LCD_POSY 14 /* y position of lcd */ |
118 | 118 | ||
119 | #elif defined(IPOD_NANO2G) | ||
120 | #define UI_TITLE "iPod Nano 2G" | ||
121 | #define UI_WIDTH 199 /* width of GUI window */ | ||
122 | #define UI_HEIGHT 421 /* height of GUI window */ | ||
123 | #define UI_LCD_POSX 13 /* x position of lcd */ | ||
124 | #define UI_LCD_POSY 14 /* y position of lcd */ | ||
125 | |||
119 | #elif defined(IPOD_VIDEO) | 126 | #elif defined(IPOD_VIDEO) |
120 | #define UI_TITLE "iPod Video" | 127 | #define UI_TITLE "iPod Video" |
121 | #define UI_WIDTH 350 /* width of GUI window */ | 128 | #define UI_WIDTH 350 /* width of GUI window */ |