3 files changed, 56 insertions, 33 deletions

diff --git a/firmware/target/coldfire/iaudio/m3/lcd-m3.c b/firmware/target/coldfire/iaudio/m3/lcd-m3.c
index b1e81f91ba..ae72832a82 100644
--- a/firmware/target/coldfire/iaudio/m3/lcd-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/lcd-m3.c
@@ -289,6 +289,35 @@ void lcd_write_data(const fb_data *p_words, int count)
     CS_HI;
 }
 
+static void lcd_mono_data(const unsigned char *p_words, int count)
+{
+    unsigned data;
+    const unsigned char *p_bytes = p_words;
+    const unsigned char *p_end = p_words + count;
+
+    RS_HI;
+    CS_LO;
+    if (cpu_frequency < 50000000)
+    {
+        while (p_bytes < p_end)
+        {
+            data = *p_bytes++;
+            _write_fast(data);
+            _write_fast(data);
+        }
+    }
+    else
+    {
+        while (p_bytes < p_end)
+        {
+            data = *p_bytes++;
+            _write_byte(data);
+            _write_byte(data);
+        }
+    }
+    CS_HI;
+}
+
 int lcd_default_contrast(void)
 {
     return DEFAULT_CONTRAST_SETTING;
@@ -341,7 +370,7 @@ void lcd_on(void)
     lcd_write_command_e(LCD_SET_GRAY | 6, 0xcc);
     lcd_write_command_e(LCD_SET_GRAY | 7, 0x0c);
     
-    lcd_write_command(LCD_SET_PWM_FRC | 6); /* 4FRC + 12PWM */
+    lcd_write_command(LCD_SET_PWM_FRC | 6); /* 3FRC + 12PWM */
     
     lcd_write_command(LCD_DISPLAY_ON | 1); /* display on */
 
@@ -428,24 +457,31 @@ void lcd_init_device(void)
 #endif
 }
 
-/* TODO: implement blit functions */
-
 /* Performance function that works with an external buffer
    note that by and bheight are in 8-pixel units! */
-void lcd_blit(const fb_data *data, int x, int by, int width,
-              int bheight, int stride)
+void lcd_blit_mono(const unsigned char *data, int x, int by, int width,
+                   int bheight, int stride)
 {
-    (void)data;
-    (void)x;
-    (void)by;
-    (void)width;
-    (void)bheight;
-    (void)stride;
+    if (initialized)
+    {
+        /* COM48-COM63 are not connected, so we need to skip those */
+        while (bheight--)
+        {
+            lcd_write_command(LCD_SET_PAGE | ((by > 5 ? by + 2 : by) & 0xf));
+            lcd_write_command_e(LCD_SET_COLUMN | ((x >> 4) & 0xf), x & 0xf);
+
+            lcd_mono_data(data, width);
+            data += stride;
+            by++;
+        }
+    }
 }
 
+/* TODO: implement grey blit function */
+
 /* Performance function that works with an external buffer
    note that by and bheight are in 8-pixel units! */
-void lcd_grey_phase_blit(unsigned char *values, unsigned char *phases,
+void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases,
                          int x, int by, int width, int bheight, int stride)
 {
     (void)values;
@@ -463,7 +499,8 @@ void lcd_update(void) ICODE_ATTR;
 void lcd_update(void)
 {
     int y;
-    if(initialized) {
+    if (initialized)
+    {
         for(y = 0;y < LCD_FBHEIGHT;y++) {
             /* Copy display bitmap to hardware.
                The COM48-COM63 lines are not connected so we have to skip
@@ -480,7 +517,8 @@ void lcd_update(void)
 void lcd_update_rect(int, int, int, int) ICODE_ATTR;
 void lcd_update_rect(int x, int y, int width, int height)
 {
-    if(initialized) {
+    if (initialized)
+    {
         int ymax;
 
         /* The Y coordinates have to work on even 8 pixel rows */
diff --git a/firmware/target/coldfire/iaudio/m5/lcd-m5.c b/firmware/target/coldfire/iaudio/m5/lcd-m5.c
index be9d5a39b8..71d49f544b 100644
--- a/firmware/target/coldfire/iaudio/m5/lcd-m5.c
+++ b/firmware/target/coldfire/iaudio/m5/lcd-m5.c
@@ -131,8 +131,8 @@ void lcd_init_device(void)
 
 /* Performance function that works with an external buffer
    note that by and bheight are in 8-pixel units! */
-void lcd_blit(const unsigned char* data, int x, int by, int width,
-              int bheight, int stride)
+void lcd_blit_mono(const unsigned char *data, int x, int by, int width,
+                   int bheight, int stride)
 {
     const unsigned char *src, *src_end;
     unsigned char *dst_u, *dst_l;
@@ -176,7 +176,7 @@ void lcd_grey_data(unsigned char *values, unsigned char *phases, int count);
 
 /* Performance function that works with an external buffer
    note that by and bheight are in 4-pixel units! */
-void lcd_grey_phase_blit(unsigned char *values, unsigned char *phases,
+void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases,
                          int x, int by, int width, int bheight, int stride)
 {
     stride <<= 2; /* 4 pixels per block */
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-x5.c b/firmware/target/coldfire/iaudio/x5/lcd-x5.c
index 5ca2cb508c..19faf0474d 100644
--- a/firmware/target/coldfire/iaudio/x5/lcd-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/lcd-x5.c
@@ -407,21 +407,6 @@ void lcd_sleep(void)
 
 /*** update functions ***/
 
-/* Performance function that works with an external buffer
-   note that by and bheight are in 8-pixel units! */
-void lcd_blit(const fb_data* data, int x, int by, int width,
-              int bheight, int stride)
-{
-    /* TODO: Implement lcd_blit() */
-    (void)data;
-    (void)x;
-    (void)by;
-    (void)width;
-    (void)bheight;
-    (void)stride;
-    /*if(display_on)*/
-}
-
 /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420.
  * y should have two lines of Y back to back, 2nd line first.
  * c should contain the Cb and Cr data for the two lines of Y back to back.
@@ -434,7 +419,7 @@ extern void lcd_write_yuv420_lines(const unsigned char *y,
  * src_x, src_y, width and height should be even and within the LCD's
  * boundaries.
  */
-void lcd_yuv_blit(unsigned char * const src[3],
+void lcd_blit_yuv(unsigned char * const src[3],
                   int src_x, int src_y, int stride,
                   int x, int y, int width, int height)
 {