PP LCD drivers: * Optimised and cleaned up PP colour LCD drivers. Immeasurable speedup on iPod Color, huge speedup on small H10 (a factor of 3). Should be a bit faster on big H10 too. * Big H10 changed bitmap format, so needs reconfiguring + full rebuild. * Better register naming for the mono LCD bridge. Register names for the colour LCD bridge.

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

1 files changed, 21 insertions, 4 deletions

diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index 2c939300ab..5654a7de63 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -407,16 +407,33 @@
 /* Note: didn't bother to see of levels 0 and 16 actually work */
 
 /* First ("mono") LCD bridge */
-#define LCD1_BASE  (*(volatile unsigned long *)(0x70003000))
-#define LCD1_CMD   (*(volatile unsigned long *)(0x70003008))
-#define LCD1_DATA  (*(volatile unsigned long *)(0x70003010))
+#define LCD1_BASE           0x70003000
 
-#define LCD1_BUSY_MASK  0x8000
+#define LCD1_CONTROL        (*(volatile unsigned long *)(0x70003000))
+#define LCD1_CMD            (*(volatile unsigned long *)(0x70003008))
+#define LCD1_DATA           (*(volatile unsigned long *)(0x70003010))
+
+#define LCD1_BUSY_MASK      0x8000
 
 /* Serial Controller */
 #define SERIAL0             (*(volatile unsigned long*)(0x70006000))
 #define SERIAL1             (*(volatile unsigned long*)(0x70006040))
 
+/* Second ("color") LCD bridge */
+#define LCD2_BASE           0x70008a00
+
+#define LCD2_PORT           (*(volatile unsigned long*)(0x70008a0c))
+#define LCD2_BLOCK_CTRL     (*(volatile unsigned long*)(0x70008a20))
+#define LCD2_BLOCK_CONFIG   (*(volatile unsigned long*)(0x70008a24))
+#define LCD2_BLOCK_DATA     (*(volatile unsigned long*)(0x70008b00))
+
+#define LCD2_BUSY_MASK      0x80000000
+#define LCD2_CMD_MASK       0x80000000
+#define LCD2_DATA_MASK      0x81000000
+
+#define LCD2_BLOCK_READY    0x04000000
+#define LCD2_BLOCK_TXOK     0x01000000
+
 /* I2C */
 #define I2C_BASE            0x7000c000