All-new greyscale library, replacing the old one. Features: (1) Drawing/updating is faster than the old grayscale lib at full depth. (2) Always 129 shades instead of 2..33 shades. (3) No graininess caused by frequent updates (mpegplayer, doom, ...). (4) Needs less memory than the old grayscale lib at full depth. * The tradeoff is slightly higher CPU load in the ISR (frames are calculated 'live') and an extra function in the core. * Ported all plugins which used the graylib to use the new one. * Some slight optimisations for archos and H1x0 LCD update.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15998 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 92 insertions, 16 deletions

diff --git a/firmware/target/coldfire/iaudio/m5/lcd-as-m5.S b/firmware/target/coldfire/iaudio/m5/lcd-as-m5.S
index 4a88dc92b0..7e89815ec8 100644
--- a/firmware/target/coldfire/iaudio/m5/lcd-as-m5.S
+++ b/firmware/target/coldfire/iaudio/m5/lcd-as-m5.S
@@ -41,18 +41,18 @@ lcd_write_command:
 lcd_write_command_ex:
     lea.l   0xf0008000, %a0
 
-    move.l  (4, %sp), %d0   /* Command */
-    move.w  %d0, (%a0)+     /* Write to LCD, set A0 = 1 */
+    move.l  (4, %sp), %d0       /* Command */
+    move.w  %d0, (%a0)+         /* Write to LCD, set A0 = 1 */
 
-    move.l  (8, %sp), %d0   /* Data */
-    cmp.l   #-1, %d0        /* -1? */
+    move.l  (8, %sp), %d0       /* Data */
+    cmp.l   #-1, %d0            /* -1? */
     beq.b   .last
-    move.w  %d0, (%a0)      /* Write to LCD */
+    move.w  %d0, (%a0)          /* Write to LCD */
 
-    move.l  (12, %sp), %d0  /* Data */
-    cmp.l   #-1, %d0        /* -1? */
+    move.l  (12, %sp), %d0      /* Data */
+    cmp.l   #-1, %d0            /* -1? */
     beq.b   .last
-    move.w  %d0, (%a0)      /* Write to LCD */
+    move.w  %d0, (%a0)          /* Write to LCD */
 
 .last:
     rts
@@ -65,19 +65,80 @@ lcd_write_command_ex:
     .type       lcd_write_data,@function
 
 lcd_write_data:
-    move.l  (4,%sp), %a0    /* Data pointer */
-    move.l  (8,%sp), %d0    /* Length */
-
+    movem.l (4, %sp), %a0-%a1   /* Data pointer */
+    move.l  %a1, %d0            /* Length */
     lea     0xf0008002, %a1
+
 .loop:
     /* When running in IRAM, this loop takes 10 cycles plus the LCD write.
        The 10 cycles are necessary to follow the LCD timing specs
        at 140MHz */
-    nop                     /* 3(0/0) */
-    move.b  (%a0)+, %d1     /* 3(1/0) */
-    move.w  %d1, (%a1)      /* 1(0/1) */
-    subq.l  #1, %d0         /* 1(0/0) */
-    bne     .loop           /* 2(0/0) */
+    nop                         /* 3(0/0) */
+    move.b  (%a0)+, %d1         /* 3(1/0) */
+    move.w  %d1, (%a1)          /* 1(0/1) */
+    subq.l  #1, %d0             /* 1(0/0) */
+    bne     .loop               /* 2(0/0) */
     rts
 .wd_end:
     .size   lcd_write_data,.wd_end-lcd_write_data
+
+
+    .align      2
+    .global     lcd_grey_data
+    .type       lcd_grey_data,@function
+
+lcd_grey_data:
+    lea.l   (-4*4, %sp), %sp
+    movem.l %d2-%d5, (%sp)
+    movem.l (4*4+4, %sp), %a0-%a1 /* Data pointer */
+    move.l  %a1, %d0            /* Length */
+    lea     0xf0008002, %a1     /* LCD data port */
+    move.l  #0xff00ff00, %d2    /* mask for splitting value/phase pairs */
+
+.greyloop:
+    movem.l (%a0), %d4-%d5      /* fetch 4 pixel phase/value pairs at once */
+                                /* %d4 = p0v0p1v1, %d5 = p2v2p3v3 */
+    move.l  %d2, %d3            /* copy mask */
+    and.l   %d4, %d3            /* %d3 = p0--p1-- */
+    eor.l   %d3, %d4            /* %d4 = --v0--v1 */
+    lsr.l   #8, %d3             /* %d3 = --p0--p1 */
+
+    bclr.l  #23, %d3            /* Z = !(p0 & 0x80); p0 &= ~0x80; */
+    seq.b   %d1                 /* %d1 = ........................00000000 */
+    lsl.l   #2, %d1             /* %d1 = ......................00000000.. */
+    bclr.l  #7, %d3             /* Z = !(p1 & 0x80); p1 &= ~0x80; */
+    seq.b   %d1                 /* %d1 = ......................0011111111 */
+    lsl.l   #2, %d1             /* %d1 = ....................0011111111.. */
+    
+    add.l   %d4, %d3            /* p0 += v0; p1 += v1; */
+    move.b  %d3, (2, %a0)       /* store p1 */
+    swap    %d3
+    move.b  %d3, (%a0)          /* store p0 */
+
+    move.l  %d2, %d3            /* copy mask */
+    and.l   %d5, %d3            /* %d3 = p2--p3-- */
+    eor.l   %d3, %d5            /* %d5 = --v2--v3 */
+    lsr.l   #8, %d3             /* %d3 = --p2--p3 */
+
+    bclr.l  #23, %d3            /* Z = !(p2 & 0x80); p2 &= ~0x80; */
+    seq.b   %d1                 /* %d1 = ....................001122222222 */
+    lsl.l   #2, %d1             /* %d1 = ..................001122222222.. */
+    bclr.l  #7, %d3             /* Z = !(p3 & 0x80); p3 &= ~0x80; */
+    seq.b   %d1                 /* %d1 = ..................00112233333333 */
+    lsr.l   #6, %d1             /* %d1 = ........................00112233 */
+
+    add.l   %d5, %d3            /* p2 += v2; p3 += v3; */
+    move.b  %d3, (6, %a0)       /* store p3 */
+    swap    %d3
+    move.b  %d3, (4, %a0)       /* store p2 */
+
+    move.w  %d1, (%a1)          /* write pixel block */
+    addq.l  #8, %a0             /* advance address pointer */
+    subq.l  #1, %d0             /* any blocks left? */
+    bne.b   .greyloop
+
+    movem.l (%sp), %d2-%d5
+    lea.l   (4*4, %sp), %sp
+    rts
+.gd_end:
+    .size   lcd_grey_data,.gd_end-lcd_grey_data
diff --git a/firmware/target/coldfire/iaudio/m5/lcd-m5.c b/firmware/target/coldfire/iaudio/m5/lcd-m5.c
index 2af46b3145..4f963795c7 100644
--- a/firmware/target/coldfire/iaudio/m5/lcd-m5.c
+++ b/firmware/target/coldfire/iaudio/m5/lcd-m5.c
@@ -171,6 +171,21 @@ void lcd_blit(const unsigned char* data, int x, int by, int width,
     }
 }
 
+/* Performance function that works with an external buffer
+   note that by and bheight are in 4-pixel units! */
+void lcd_grey_phase_blit(const struct grey_data *data, int x, int by, 
+                         int width, int bheight, int stride)
+{
+    stride <<= 2; /* 4 pixels per block */
+    while (bheight--)
+    {
+        lcd_write_command_ex(LCD_CNTL_PAGE, by++, -1);
+        lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1);
+        lcd_write_command(LCD_CNTL_DATA_WRITE);
+        lcd_grey_data(data, width);
+        data += stride;
+    }
+}
 
 /* Update the display.
    This must be called after all other LCD functions that change the display. */