3 files changed, 16 insertions, 0 deletions

diff --git a/uisimulator/sdl/UI-ipod4g.bmp b/uisimulator/sdl/UI-ipod4g.bmp
new file mode 100644
index 0000000000..b24c560d1c
--- /dev/null
+++ b/uisimulator/sdl/UI-ipod4g.bmp
diff --git a/uisimulator/sdl/lcd-sdl.c b/uisimulator/sdl/lcd-sdl.c
index a90efbd204..80a3c96a87 100644
--- a/uisimulator/sdl/lcd-sdl.c
+++ b/uisimulator/sdl/lcd-sdl.c
@@ -73,7 +73,11 @@ void lcd_update_rect(int x_start, int y_start, int width, int height)
 #if LCD_DEPTH == 1
             *p = ((lcd_framebuffer[y/8][x] >> (y & 7)) & 1);
 #elif LCD_DEPTH == 2
+#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
+            *p = ((lcd_framebuffer[y][x/4] >> (2 * (x & 3))) & 3);
+#else
             *p = ((lcd_framebuffer[y/4][x] >> (2 * (y & 3))) & 3);
+#endif
 #elif LCD_DEPTH == 16
 #if LCD_PIXELFORMAT == RGB565SWAPPED
             unsigned bits = lcd_framebuffer[y][x];
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index dd8e558b66..ddf0a6ff86 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -109,6 +109,18 @@
 #define UI_REMOTE_WIDTH             128
 #define UI_REMOTE_HEIGHT            64
 
+#elif defined(IPOD_4G)
+#define UI_TITLE                    "iPod 4G"
+#define UI_WIDTH                    196 // width of GUI window
+#define UI_HEIGHT                   370 // height of GUI window
+#define UI_LCD_BGCOLOR              90, 145, 90 // bkgnd color of LCD (no backlight)
+#define UI_LCD_BGCOLORLIGHT         173, 216, 230 // bkgnd color of LCD (backlight)
+#define UI_LCD_BLACK                0, 0, 0 // black
+#define UI_LCD_POSX                 19 // x position of lcd
+#define UI_LCD_POSY                 14 // y position of lcd
+#define UI_LCD_WIDTH                160
+#define UI_LCD_HEIGHT               128
+
 #elif defined(IPOD_COLOR)
 #define UI_TITLE                    "iPod Color"
 #define UI_WIDTH                    261 // width of GUI window