3 files changed, 11 insertions, 4 deletions

diff --git a/firmware/asm/SOURCES b/firmware/asm/SOURCES
index 0cd351efdd..d74d4d3c60 100644
--- a/firmware/asm/SOURCES
+++ b/firmware/asm/SOURCES
@@ -12,5 +12,9 @@ strlen.c
     defined(COWON_D2) || defined(MINI2440) || defined(SAMSUNG_YPR0) || \
     defined(SAMSUNG_YPR1) || (defined(MROBE_500) && !defined(LCD_USE_DMA))) && \
     !defined(SIMULATOR)
+#if LCD_DEPTH == 24
+lcd-as-memframe-24bit.c
+#else
 lcd-as-memframe.c
 #endif
+#endif
diff --git a/firmware/asm/lcd-as-memframe-24bit.c b/firmware/asm/lcd-as-memframe-24bit.c
new file mode 100644
index 0000000000..2cca575799
--- /dev/null
+++ b/firmware/asm/lcd-as-memframe-24bit.c
@@ -0,0 +1,3 @@
+
+/* The ASM version of lcd-as-memframe.c isn't 24bit capable */
+#include "lcd-as-memframe.c"
diff --git a/firmware/asm/lcd-as-memframe.c b/firmware/asm/lcd-as-memframe.c
index 5f4917b721..032022d7ec 100644
--- a/firmware/asm/lcd-as-memframe.c
+++ b/firmware/asm/lcd-as-memframe.c
@@ -78,7 +78,7 @@ extern void lcd_write_yuv420_lines(fb_data *dst,
             b = clamp(b, 0, 64*256-1);
         }
 
-        *dst = LCD_RGBPACK_LCD(r >> 9, g >> 8, b >> 9);
+        *dst = FB_RGBPACK(r >> 6, g >> 6, b >> 6);
 
 #if LCD_WIDTH >= LCD_HEIGHT
         dst++;
@@ -98,7 +98,7 @@ extern void lcd_write_yuv420_lines(fb_data *dst,
             b = clamp(b, 0, 64*256-1);
         }
 
-        *dst = LCD_RGBPACK_LCD(r >> 9, g >> 8, b >> 9);
+        *dst = FB_RGBPACK(r >> 6, g >> 6, b >> 6);
 
 #if LCD_WIDTH >= LCD_HEIGHT
         dst++;
@@ -143,7 +143,7 @@ extern void lcd_write_yuv420_lines(fb_data *dst,
             b = clamp(b, 0, 64*256-1);
         }
 
-        *dst = LCD_RGBPACK_LCD(r >> 9, g >> 8, b >> 9);
+        *dst = FB_RGBPACK_LCD(r >> 9, g >> 8, b >> 9);
 
 #if LCD_WIDTH >= LCD_HEIGHT
         dst++;
@@ -163,7 +163,7 @@ extern void lcd_write_yuv420_lines(fb_data *dst,
             b = clamp(b, 0, 64*256-1);
         }
 
-        *dst = LCD_RGBPACK_LCD(r >> 9, g >> 8, b >> 9);
+        *dst = FB_RGBPACK_LCD(r >> 9, g >> 8, b >> 9);
 
 #if LCD_WIDTH >= LCD_HEIGHT
         dst++;