More exodus to the target tree for ColdFire and a bonus sorting of firmware/SOURCES.

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

2 files changed, 1723 insertions, 0 deletions

diff --git a/firmware/target/coldfire/iriver/h100/lcd-h100.c b/firmware/target/coldfire/iriver/h100/lcd-h100.c
new file mode 100644
index 0000000000..9ed63661a0
--- /dev/null
+++ b/firmware/target/coldfire/iriver/h100/lcd-h100.c
@@ -0,0 +1,1298 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2004 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+
+#include "cpu.h"
+#include "lcd.h"
+#include "kernel.h"
+#include "thread.h"
+#include <string.h>
+#include <stdlib.h>
+#include "file.h"
+#include "debug.h"
+#include "system.h"
+#include "font.h"
+#include "rbunicode.h"
+#include "bidi.h"
+
+/*** definitions ***/
+
+/* LCD command codes */
+#define LCD_CNTL_POWER_CONTROL          0x25
+#define LCD_CNTL_VOLTAGE_SELECT         0x2b
+#define LCD_CNTL_LINE_INVERT_DRIVE      0x36
+#define LCD_CNTL_GRAY_SCALE_PATTERN     0x39
+#define LCD_CNTL_TEMP_GRADIENT_SELECT   0x4e
+#define LCD_CNTL_OSC_FREQUENCY          0x5f
+#define LCD_CNTL_ON_OFF                 0xae
+#define LCD_CNTL_OSC_ON_OFF             0xaa
+#define LCD_CNTL_OFF_MODE               0xbe
+#define LCD_CNTL_REVERSE                0xa6
+#define LCD_CNTL_ALL_LIGHTING           0xa4
+#define LCD_CNTL_COMMON_OUTPUT_STATUS   0xc4
+#define LCD_CNTL_COLUMN_ADDRESS_DIR     0xa0
+#define LCD_CNTL_NLINE_ON_OFF           0xe4
+#define LCD_CNTL_DISPLAY_MODE           0x66
+#define LCD_CNTL_DUTY_SET               0x6d
+#define LCD_CNTL_ELECTRONIC_VOLUME      0x81
+#define LCD_CNTL_DATA_INPUT_DIR         0x84
+#define LCD_CNTL_DISPLAY_START_LINE     0x8a
+#define LCD_CNTL_AREA_SCROLL            0x10
+
+#define LCD_CNTL_PAGE                   0xb1
+#define LCD_CNTL_COLUMN                 0x13
+#define LCD_CNTL_DATA_WRITE             0x1d
+
+#define SCROLLABLE_LINES 26
+
+/*** globals ***/
+
+fb_data lcd_framebuffer[LCD_HEIGHT/4][LCD_WIDTH] IBSS_ATTR;
+
+static const unsigned char dibits[16] ICONST_ATTR = {
+    0x00, 0x03, 0x0C, 0x0F, 0x30, 0x33, 0x3C, 0x3F,
+    0xC0, 0xC3, 0xCC, 0xCF, 0xF0, 0xF3, 0xFC, 0xFF
+};
+
+static const unsigned char pixmask[4] ICONST_ATTR = {
+    0x03, 0x0C, 0x30, 0xC0
+};
+
+static unsigned fg_pattern IDATA_ATTR = 0xFF; /* initially black */
+static unsigned bg_pattern IDATA_ATTR = 0x00; /* initially white */
+static int drawmode = DRMODE_SOLID;
+static int xmargin = 0;
+static int ymargin = 0;
+static int curfont = FONT_SYSFIXED;
+
+/* scrolling */
+static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */
+static void scroll_thread(void);
+static long scroll_stack[DEFAULT_STACK_SIZE/sizeof(long)];
+static const char scroll_name[] = "scroll";
+static int scroll_ticks = 12; /* # of ticks between updates*/
+static int scroll_delay = HZ/2; /* ticks delay before start */
+static int scroll_step = 6;  /* pixels per scroll step */
+static int bidir_limit = 50;  /* percent */
+static struct scrollinfo scroll[SCROLLABLE_LINES];
+
+static const char scroll_tick_table[16] = {
+ /* Hz values:
+    1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33 */
+    100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3
+};
+
+/*** driver code is in lcd.S ***/
+
+/*** hardware configuration ***/
+
+#ifndef SIMULATOR
+
+int lcd_default_contrast(void)
+{
+    return 28;
+}
+
+void lcd_set_contrast(int val)
+{
+    lcd_write_command_ex(LCD_CNTL_ELECTRONIC_VOLUME, val, -1);
+}
+
+void lcd_set_invert_display(bool yesno)
+{
+    lcd_write_command(LCD_CNTL_REVERSE | (yesno?1:0));
+}
+
+/* turn the display upside down (call lcd_update() afterwards) */
+void lcd_set_flip(bool yesno)
+{
+    if (yesno) 
+    {
+        lcd_write_command(LCD_CNTL_COLUMN_ADDRESS_DIR | 1);
+        lcd_write_command(LCD_CNTL_COMMON_OUTPUT_STATUS | 0);
+        lcd_write_command_ex(LCD_CNTL_DUTY_SET, 0x20, 0);
+    }
+    else
+    {
+        lcd_write_command(LCD_CNTL_COLUMN_ADDRESS_DIR | 0);
+        lcd_write_command(LCD_CNTL_COMMON_OUTPUT_STATUS | 1);
+        lcd_write_command_ex(LCD_CNTL_DUTY_SET, 0x20, 1);
+    }
+}
+
+#endif /* !SIMULATOR */
+
+/* LCD init */
+#ifdef SIMULATOR
+
+void lcd_init(void)
+{
+    create_thread(scroll_thread, scroll_stack,
+                  sizeof(scroll_stack), scroll_name IF_PRIO(, PRIORITY_USER_INTERFACE));
+}
+#else
+
+void lcd_init(void)
+{
+    /* GPO35 is the LCD A0 pin
+       GPO46 is LCD RESET */
+    or_l(0x00004008, &GPIO1_OUT);
+    or_l(0x00004008, &GPIO1_ENABLE);
+    or_l(0x00004008, &GPIO1_FUNCTION);
+
+    /* Reset LCD */
+    sleep(1);
+    and_l(~0x00004000, &GPIO1_OUT);
+    sleep(1);
+    or_l(0x00004000, &GPIO1_OUT);
+    sleep(1);
+
+    lcd_write_command(LCD_CNTL_COLUMN_ADDRESS_DIR | 0);   /* Normal */
+    lcd_write_command(LCD_CNTL_COMMON_OUTPUT_STATUS | 1); /* Reverse dir */
+    lcd_write_command(LCD_CNTL_REVERSE | 0); /* Reverse OFF */
+    lcd_write_command(LCD_CNTL_ALL_LIGHTING | 0); /* Normal */
+    lcd_write_command_ex(LCD_CNTL_DUTY_SET, 0x20, 1);
+    lcd_write_command(LCD_CNTL_OFF_MODE | 1); /* OFF -> VCC on drivers */
+    lcd_write_command_ex(LCD_CNTL_VOLTAGE_SELECT, 3, -1);
+    lcd_write_command_ex(LCD_CNTL_ELECTRONIC_VOLUME, 0x1c, -1);
+    lcd_write_command_ex(LCD_CNTL_TEMP_GRADIENT_SELECT, 0, -1);
+
+    lcd_write_command_ex(LCD_CNTL_LINE_INVERT_DRIVE, 0x10, -1);
+    lcd_write_command(LCD_CNTL_NLINE_ON_OFF | 1); /* N-line ON */
+
+    lcd_write_command_ex(LCD_CNTL_OSC_FREQUENCY, 3, -1);
+    lcd_write_command(LCD_CNTL_OSC_ON_OFF | 1); /* Oscillator ON */
+
+    lcd_write_command_ex(LCD_CNTL_POWER_CONTROL, 0x16, -1);
+    sleep(HZ/10);                               /* 100 ms pause */
+    lcd_write_command_ex(LCD_CNTL_POWER_CONTROL, 0x17, -1);
+
+    lcd_write_command_ex(LCD_CNTL_DISPLAY_START_LINE, 0, -1);
+    lcd_write_command_ex(LCD_CNTL_GRAY_SCALE_PATTERN, 0x32, -1);
+    lcd_write_command_ex(LCD_CNTL_DISPLAY_MODE, 0, -1); /* Greyscale mode */
+    lcd_write_command(LCD_CNTL_DATA_INPUT_DIR | 0); /* Column mode */
+    
+    lcd_clear_display();
+    lcd_update();
+    lcd_write_command(LCD_CNTL_ON_OFF | 1); /* LCD ON */
+
+    create_thread(scroll_thread, scroll_stack,
+                  sizeof(scroll_stack), scroll_name IF_PRIO(, PRIORITY_USER_INTERFACE));
+}
+
+/*** update functions ***/
+
+/* 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)
+{
+    const unsigned char *src, *src_end;
+    unsigned char *dst_u, *dst_l;
+    static unsigned char upper[LCD_WIDTH] IBSS_ATTR;
+    static unsigned char lower[LCD_WIDTH] IBSS_ATTR;
+    unsigned int byte;
+
+    by *= 2;
+
+    while (bheight--)
+    {
+        src = data;
+        src_end = data + width;
+        dst_u = upper;
+        dst_l = lower;
+        do
+        {
+            byte = *src++;
+            *dst_u++ = dibits[byte & 0x0F];
+            byte >>= 4;
+            *dst_l++ = dibits[byte & 0x0F];
+        }
+        while (src < src_end);
+
+        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_write_data(upper, width);
+
+        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_write_data(lower, width);
+
+        data += stride;
+    }
+}
+
+
+/* Update the display.
+   This must be called after all other LCD functions that change the display. */
+void lcd_update(void) ICODE_ATTR;
+void lcd_update(void)
+{
+    int y;
+
+    /* Copy display bitmap to hardware */
+    for (y = 0; y < LCD_HEIGHT/4; y++)
+    {
+        lcd_write_command_ex(LCD_CNTL_PAGE, y, -1);
+        lcd_write_command_ex(LCD_CNTL_COLUMN, 0, -1);
+
+        lcd_write_command(LCD_CNTL_DATA_WRITE);
+        lcd_write_data (lcd_framebuffer[y], LCD_WIDTH);
+    }
+}
+
+/* Update a fraction of the display. */
+void lcd_update_rect(int, int, int, int) ICODE_ATTR;
+void lcd_update_rect(int x, int y, int width, int height)
+{
+    int ymax;
+
+    /* The Y coordinates have to work on even 8 pixel rows */
+    ymax = (y + height-1) >> 2;
+    y >>= 2;
+
+    if(x + width > LCD_WIDTH)
+        width = LCD_WIDTH - x;
+    if (width <= 0)
+        return; /* nothing left to do, 0 is harmful to lcd_write_data() */
+    if(ymax >= LCD_HEIGHT/4)
+        ymax = LCD_HEIGHT/4-1;
+
+    /* Copy specified rectange bitmap to hardware */
+    for (; y <= ymax; y++)
+    {
+        lcd_write_command_ex(LCD_CNTL_PAGE, y, -1);
+        lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1);
+
+        lcd_write_command(LCD_CNTL_DATA_WRITE);
+        lcd_write_data (&lcd_framebuffer[y][x], width);
+    }
+}
+#endif /* !SIMULATOR */
+
+/*** parameter handling ***/
+
+void lcd_set_drawmode(int mode)
+{
+    drawmode = mode & (DRMODE_SOLID|DRMODE_INVERSEVID);
+}
+
+int lcd_get_drawmode(void)
+{
+    return drawmode;
+}
+
+void lcd_set_foreground(unsigned brightness)
+{
+    fg_pattern = 0x55 * (~brightness & 3);
+}
+
+unsigned lcd_get_foreground(void)
+{
+    return ~fg_pattern & 3;
+}
+
+void lcd_set_background(unsigned brightness)
+{
+    bg_pattern = 0x55 * (~brightness & 3);
+}
+
+unsigned lcd_get_background(void)
+{
+    return ~bg_pattern & 3;
+}
+
+void lcd_set_drawinfo(int mode, unsigned fg_brightness, unsigned bg_brightness)
+{
+    lcd_set_drawmode(mode);
+    lcd_set_foreground(fg_brightness);
+    lcd_set_background(bg_brightness);
+}
+
+void lcd_setmargins(int x, int y)
+{
+    xmargin = x;
+    ymargin = y;
+}
+
+int lcd_getxmargin(void)
+{
+    return xmargin;
+}
+
+int lcd_getymargin(void)
+{
+    return ymargin;
+}
+
+void lcd_setfont(int newfont)
+{
+    curfont = newfont;
+}
+
+int lcd_getstringsize(const unsigned char *str, int *w, int *h)
+{
+    return font_getstringsize(str, w, h, curfont);
+}
+
+/*** low-level drawing functions ***/
+
+static void setpixel(int x, int y)
+{
+    unsigned mask = pixmask[y & 3];
+    fb_data *address = &lcd_framebuffer[y>>2][x];
+    unsigned data = *address;
+
+    *address = data ^ ((data ^ fg_pattern) & mask);
+}
+
+static void clearpixel(int x, int y)
+{
+    unsigned mask = pixmask[y & 3];
+    fb_data *address = &lcd_framebuffer[y>>2][x];
+    unsigned data = *address;
+
+    *address = data ^ ((data ^ bg_pattern) & mask);
+}
+
+static void flippixel(int x, int y)
+{
+    unsigned mask = pixmask[y & 3];
+    fb_data *address = &lcd_framebuffer[y>>2][x];
+
+    *address ^= mask;
+}
+
+static void nopixel(int x, int y)
+{
+    (void)x;
+    (void)y;
+}
+
+lcd_pixelfunc_type* const lcd_pixelfuncs[8] = {
+    flippixel, nopixel, setpixel, setpixel,
+    nopixel, clearpixel, nopixel, clearpixel
+};
+
+/* 'mask' and 'bits' contain 2 bits per pixel */
+static void flipblock(fb_data *address, unsigned mask, unsigned bits)
+                      ICODE_ATTR;
+static void flipblock(fb_data *address, unsigned mask, unsigned bits)
+{
+    *address ^= bits & mask;
+}
+
+static void bgblock(fb_data *address, unsigned mask, unsigned bits)
+                    ICODE_ATTR;
+static void bgblock(fb_data *address, unsigned mask, unsigned bits)
+{
+    unsigned data = *address;
+
+    *address = data ^ ((data ^ bg_pattern) & mask & ~bits);
+}
+
+static void fgblock(fb_data *address, unsigned mask, unsigned bits)
+                    ICODE_ATTR;
+static void fgblock(fb_data *address, unsigned mask, unsigned bits)
+{
+    unsigned data = *address;
+
+    *address = data ^ ((data ^ fg_pattern) & mask & bits);
+}
+
+static void solidblock(fb_data *address, unsigned mask, unsigned bits)
+                       ICODE_ATTR;
+static void solidblock(fb_data *address, unsigned mask, unsigned bits)
+{
+    unsigned data = *address;
+    unsigned bgp  = bg_pattern;
+    
+    bits     = bgp  ^ ((bgp ^ fg_pattern) & bits);
+    *address = data ^ ((data ^ bits) & mask);
+}
+
+static void flipinvblock(fb_data *address, unsigned mask, unsigned bits)
+                         ICODE_ATTR;
+static void flipinvblock(fb_data *address, unsigned mask, unsigned bits)
+{
+    *address ^= ~bits & mask;
+}
+
+static void bginvblock(fb_data *address, unsigned mask, unsigned bits)
+                       ICODE_ATTR;
+static void bginvblock(fb_data *address, unsigned mask, unsigned bits)
+{
+    unsigned data = *address;
+
+    *address = data ^ ((data ^ bg_pattern) & mask & bits);
+}
+
+static void fginvblock(fb_data *address, unsigned mask, unsigned bits)
+                       ICODE_ATTR;
+static void fginvblock(fb_data *address, unsigned mask, unsigned bits)
+{
+    unsigned data = *address;
+
+    *address = data ^ ((data ^ fg_pattern) & mask & ~bits);
+}
+
+static void solidinvblock(fb_data *address, unsigned mask, unsigned bits)
+                          ICODE_ATTR;
+static void solidinvblock(fb_data *address, unsigned mask, unsigned bits)
+{
+    unsigned data = *address;
+    unsigned fgp  = fg_pattern;
+    
+    bits     = fgp  ^ ((fgp ^ bg_pattern) & bits);
+    *address = data ^ ((data ^ bits) & mask);
+}
+
+lcd_blockfunc_type* const lcd_blockfuncs[8] = {
+    flipblock, bgblock, fgblock, solidblock,
+    flipinvblock, bginvblock, fginvblock, solidinvblock
+};
+
+static inline void setblock(fb_data *address, unsigned mask, unsigned bits)
+{
+    unsigned data = *address;
+
+    bits    ^= data;
+    *address = data ^ (bits & mask);
+}
+
+/*** drawing functions ***/
+
+/* Clear the whole display */
+void lcd_clear_display(void)
+{
+    unsigned bits = (drawmode & DRMODE_INVERSEVID) ? fg_pattern : bg_pattern;
+
+    memset(lcd_framebuffer, bits, sizeof lcd_framebuffer);
+    scrolling_lines = 0;
+}
+
+/* Set a single pixel */
+void lcd_drawpixel(int x, int y)
+{
+    if (((unsigned)x < LCD_WIDTH) && ((unsigned)y < LCD_HEIGHT))
+        lcd_pixelfuncs[drawmode](x, y);
+}
+
+/* Draw a line */
+void lcd_drawline(int x1, int y1, int x2, int y2)
+{
+    int numpixels;
+    int i;
+    int deltax, deltay;
+    int d, dinc1, dinc2;
+    int x, xinc1, xinc2;
+    int y, yinc1, yinc2;
+    lcd_pixelfunc_type *pfunc = lcd_pixelfuncs[drawmode];
+
+    deltax = abs(x2 - x1);
+    deltay = abs(y2 - y1);
+    xinc2 = 1;
+    yinc2 = 1;
+
+    if (deltax >= deltay)
+    {
+        numpixels = deltax;
+        d = 2 * deltay - deltax;
+        dinc1 = deltay * 2;
+        dinc2 = (deltay - deltax) * 2;
+        xinc1 = 1;
+        yinc1 = 0;
+    }
+    else
+    {
+        numpixels = deltay;
+        d = 2 * deltax - deltay;
+        dinc1 = deltax * 2;
+        dinc2 = (deltax - deltay) * 2;
+        xinc1 = 0;
+        yinc1 = 1;
+    }
+    numpixels++; /* include endpoints */
+
+    if (x1 > x2)
+    {
+        xinc1 = -xinc1;
+        xinc2 = -xinc2;
+    }
+
+    if (y1 > y2)
+    {
+        yinc1 = -yinc1;
+        yinc2 = -yinc2;
+    }
+
+    x = x1;
+    y = y1;
+
+    for (i = 0; i < numpixels; i++)
+    {
+        if (((unsigned)x < LCD_WIDTH) && ((unsigned)y < LCD_HEIGHT))
+            pfunc(x, y);
+
+        if (d < 0)
+        {
+            d += dinc1;
+            x += xinc1;
+            y += yinc1;
+        }
+        else
+        {
+            d += dinc2;
+            x += xinc2;
+            y += yinc2;
+        }
+    }
+}
+
+/* Draw a horizontal line (optimised) */
+void lcd_hline(int x1, int x2, int y)
+{
+    int x;
+    fb_data *dst, *dst_end;
+    unsigned mask;
+    lcd_blockfunc_type *bfunc;
+
+    /* direction flip */
+    if (x2 < x1)
+    {
+        x = x1;
+        x1 = x2;
+        x2 = x;
+    }
+    
+    /* nothing to draw? */
+    if (((unsigned)y >= LCD_HEIGHT) || (x1 >= LCD_WIDTH) || (x2 < 0))
+        return;  
+    
+    /* clipping */
+    if (x1 < 0)
+        x1 = 0;
+    if (x2 >= LCD_WIDTH)
+        x2 = LCD_WIDTH-1;
+        
+    bfunc = lcd_blockfuncs[drawmode];
+    dst   = &lcd_framebuffer[y>>2][x1];
+    mask  = pixmask[y & 3];
+
+    dst_end = dst + x2 - x1;
+    do
+        bfunc(dst++, mask, 0xFFu);
+    while (dst <= dst_end);
+}
+
+/* Draw a vertical line (optimised) */
+void lcd_vline(int x, int y1, int y2)
+{
+    int ny;
+    fb_data *dst;
+    unsigned mask, mask_bottom;
+    lcd_blockfunc_type *bfunc;
+
+    /* direction flip */
+    if (y2 < y1)
+    {
+        ny = y1;
+        y1 = y2;
+        y2 = ny;
+    }
+
+    /* nothing to draw? */
+    if (((unsigned)x >= LCD_WIDTH) || (y1 >= LCD_HEIGHT) || (y2 < 0))
+        return;  
+    
+    /* clipping */
+    if (y1 < 0)
+        y1 = 0;
+    if (y2 >= LCD_HEIGHT)
+        y2 = LCD_HEIGHT-1;
+        
+    bfunc = lcd_blockfuncs[drawmode];
+    dst   = &lcd_framebuffer[y1>>2][x];
+    ny    = y2 - (y1 & ~3);
+    mask  = 0xFFu << (2 * (y1 & 3));
+    mask_bottom = 0xFFu >> (2 * (~ny & 3));
+
+    for (; ny >= 4; ny -= 4)
+    {
+        bfunc(dst, mask, 0xFFu);
+        dst += LCD_WIDTH;
+        mask = 0xFFu;
+    }
+    mask &= mask_bottom;
+    bfunc(dst, mask, 0xFFu);
+}
+
+/* Draw a rectangular box */
+void lcd_drawrect(int x, int y, int width, int height)
+{
+    if ((width <= 0) || (height <= 0))
+        return;
+
+    int x2 = x + width - 1;
+    int y2 = y + height - 1;
+
+    lcd_vline(x, y, y2);
+    lcd_vline(x2, y, y2);
+    lcd_hline(x, x2, y);
+    lcd_hline(x, x2, y2);
+}
+
+/* Fill a rectangular area */
+void lcd_fillrect(int x, int y, int width, int height)
+{
+    int ny;
+    fb_data *dst, *dst_end;
+    unsigned mask, mask_bottom;
+    unsigned bits = 0;
+    lcd_blockfunc_type *bfunc;
+    bool fillopt = false;
+
+    /* nothing to draw? */
+    if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || (y >= LCD_HEIGHT)
+        || (x + width <= 0) || (y + height <= 0))
+        return;
+
+    /* clipping */
+    if (x < 0)
+    {
+        width += x;
+        x = 0;
+    }
+    if (y < 0)
+    {
+        height += y;
+        y = 0;
+    }
+    if (x + width > LCD_WIDTH)
+        width = LCD_WIDTH - x;
+    if (y + height > LCD_HEIGHT)
+        height = LCD_HEIGHT - y;
+    
+    if (drawmode & DRMODE_INVERSEVID)
+    {
+        if (drawmode & DRMODE_BG)
+        {
+            fillopt = true;
+            bits = bg_pattern;
+        }
+    }
+    else
+    {
+        if (drawmode & DRMODE_FG)
+        {
+            fillopt = true;
+            bits = fg_pattern;
+        }
+    }
+    bfunc = lcd_blockfuncs[drawmode];
+    dst   = &lcd_framebuffer[y>>2][x];
+    ny    = height - 1 + (y & 3);
+    mask  = 0xFFu << (2 * (y & 3));
+    mask_bottom = 0xFFu >> (2 * (~ny & 3));
+
+    for (; ny >= 4; ny -= 4)
+    {
+        if (fillopt && (mask == 0xFFu))
+            memset(dst, bits, width);
+        else
+        {
+            fb_data *dst_row = dst;
+
+            dst_end = dst_row + width;
+            do
+                bfunc(dst_row++, mask, 0xFFu);
+            while (dst_row < dst_end);
+        }
+
+        dst += LCD_WIDTH;
+        mask = 0xFFu;
+    }
+    mask &= mask_bottom;
+
+    if (fillopt && (mask == 0xFFu))
+        memset(dst, bits, width);
+    else
+    {
+        dst_end = dst + width;
+        do
+            bfunc(dst++, mask, 0xFFu);
+        while (dst < dst_end);
+    }
+}
+
+/* About Rockbox' internal monochrome bitmap format:
+ *
+ * A bitmap contains one bit for every pixel that defines if that pixel is
+ * black (1) or white (0). Bits within a byte are arranged vertically, LSB
+ * at top.
+ * The bytes are stored in row-major order, with byte 0 being top left,
+ * byte 1 2nd from left etc. The first row of bytes defines pixel rows
+ * 0..7, the second row defines pixel row 8..15 etc.
+ *
+ * This is similar to the internal lcd hw format. */
+
+/* Draw a partial monochrome bitmap */
+void lcd_mono_bitmap_part(const unsigned char *src, int src_x, int src_y,
+                          int stride, int x, int y, int width, int height)
+                          ICODE_ATTR;
+void lcd_mono_bitmap_part(const unsigned char *src, int src_x, int src_y,
+                          int stride, int x, int y, int width, int height)
+{
+    int shift, ny;
+    fb_data *dst, *dst_end;
+    unsigned mask, mask_bottom;
+    lcd_blockfunc_type *bfunc;
+
+    /* nothing to draw? */
+    if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || (y >= LCD_HEIGHT)
+        || (x + width <= 0) || (y + height <= 0))
+        return;
+        
+    /* clipping */
+    if (x < 0)
+    {
+        width += x;
+        src_x -= x;
+        x = 0;
+    }
+    if (y < 0)
+    {
+        height += y;
+        src_y -= y;
+        y = 0;
+    }
+    if (x + width > LCD_WIDTH)
+        width = LCD_WIDTH - x;
+    if (y + height > LCD_HEIGHT)
+        height = LCD_HEIGHT - y;
+
+    src    += stride * (src_y >> 3) + src_x; /* move starting point */
+    src_y  &= 7;
+    y      -= src_y;
+    dst    = &lcd_framebuffer[y>>2][x];
+    shift  = y & 3;
+    ny     = height - 1 + shift + src_y;
+
+    bfunc  = lcd_blockfuncs[drawmode];
+    mask   = 0xFFu << (shift + src_y);
+    mask_bottom = 0xFFu >> (~ny & 7);
+    
+    if (shift == 0)
+    {
+        unsigned dmask1, dmask2, data;
+
+        for (; ny >= 8; ny -= 8)
+        {
+            const unsigned char *src_row = src;
+            fb_data *dst_row = dst + LCD_WIDTH;
+            
+            dmask1 = dibits[mask&0x0F];
+            dmask2 = dibits[(mask>>4)&0x0F];
+            dst_end = dst_row + width;
+
+            if (dmask1 != 0)
+            {
+                do
+                {
+                    data = *src_row++;
+                    bfunc(dst_row - LCD_WIDTH, dmask1, dibits[data&0x0F]);
+                    bfunc(dst_row++, dmask2, dibits[(data>>4)&0x0F]);
+                }
+                while (dst_row < dst_end);
+            }
+            else
+            {
+                do
+                    bfunc(dst_row++, dmask2, dibits[((*src_row++)>>4)&0x0F]);
+                while (dst_row < dst_end);
+            }
+            src += stride;
+            dst += 2*LCD_WIDTH;
+            mask = 0xFFu;
+        }
+        mask &= mask_bottom;
+        dmask1 = dibits[mask&0x0F];
+        dmask2 = dibits[(mask>>4)&0x0F];
+        dst_end = dst + width;
+        
+        if (dmask1 != 0)
+        {
+            if (dmask2 != 0)
+            {
+                do
+                {
+                    data = *src++;
+                    bfunc(dst, dmask1, dibits[data&0x0F]);
+                    bfunc((dst++) + LCD_WIDTH, dmask2, dibits[(data>>4)&0x0F]);
+                }
+                while (dst < dst_end);
+            }
+            else
+            {
+                do
+                    bfunc(dst++, dmask1, dibits[(*src++)&0x0F]);
+                while (dst < dst_end);
+            }
+        }
+        else
+        {
+            do
+                bfunc((dst++) + LCD_WIDTH, dmask2, dibits[((*src++)>>4)&0x0F]);
+            while (dst < dst_end);
+        }
+    }
+    else
+    {
+        dst_end = dst + width;
+        do
+        {
+            const unsigned char *src_col = src++;
+            fb_data *dst_col = dst++;
+            unsigned mask_col = mask;
+            unsigned data = 0;
+            
+            for (y = ny; y >= 8; y -= 8)                    
+            {
+                data |= *src_col << shift;
+
+                if (mask_col & 0xFFu)
+                {
+                    if (mask_col & 0x0F)
+                        bfunc(dst_col, dibits[mask_col&0x0F], dibits[data&0x0F]);
+                    bfunc(dst_col + LCD_WIDTH, dibits[(mask_col>>4)&0x0F],
+                          dibits[(data>>4)&0x0F]);
+                    mask_col = 0xFFu;
+                }
+                else
+                    mask_col >>= 8;
+
+                src_col += stride;
+                dst_col += 2*LCD_WIDTH;
+                data >>= 8;
+            }
+            data |= *src_col << shift;
+            mask_bottom &= mask_col;
+            if (mask_bottom & 0x0F)
+                bfunc(dst_col, dibits[mask_bottom&0x0F], dibits[data&0x0F]);
+            if (mask_bottom & 0xF0)
+                bfunc(dst_col + LCD_WIDTH, dibits[(mask_bottom&0xF0)>>4],
+                      dibits[(data>>4)&0x0F]);
+        }
+        while (dst < dst_end);
+    }
+}
+
+/* Draw a full monochrome bitmap */
+void lcd_mono_bitmap(const unsigned char *src, int x, int y, int width, int height)
+{
+    lcd_mono_bitmap_part(src, 0, 0, width, x, y, width, height);
+}
+
+/* About Rockbox' internal native bitmap format:
+ *
+ * A bitmap contains two bits for every pixel. 00 = white, 01 = light grey,
+ * 10 = dark grey, 11 = black. Bits within a byte are arranged vertically, LSB
+ * at top.
+ * The bytes are stored in row-major order, with byte 0 being top left,
+ * byte 1 2nd from left etc. The first row of bytes defines pixel rows
+ * 0..3, the second row defines pixel row 4..7 etc.
+ *
+ * This is the same as the internal lcd hw format. */
+
+/* Draw a partial native bitmap */
+void lcd_bitmap_part(const fb_data *src, int src_x, int src_y,
+                     int stride, int x, int y, int width, int height)
+                     ICODE_ATTR;
+void lcd_bitmap_part(const fb_data *src, int src_x, int src_y,
+                     int stride, int x, int y, int width, int height)
+{
+    int shift, ny;
+    fb_data *dst, *dst_end;
+    unsigned mask, mask_bottom;
+
+    /* nothing to draw? */
+    if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || (y >= LCD_HEIGHT)
+        || (x + width <= 0) || (y + height <= 0))
+        return;
+        
+    /* clipping */
+    if (x < 0)
+    {
+        width += x;
+        src_x -= x;
+        x = 0;
+    }
+    if (y < 0)
+    {
+        height += y;
+        src_y -= y;
+        y = 0;
+    }
+    if (x + width > LCD_WIDTH)
+        width = LCD_WIDTH - x;
+    if (y + height > LCD_HEIGHT)
+        height = LCD_HEIGHT - y;
+
+    src   += stride * (src_y >> 2) + src_x; /* move starting point */
+    src_y &= 3;
+    y     -= src_y;
+    dst    = &lcd_framebuffer[y>>2][x];
+    shift  = y & 3;
+    ny     = height - 1 + shift + src_y;
+
+    mask   = 0xFFu << (2 * (shift + src_y));
+    mask_bottom = 0xFFu >> (2 * (~ny & 3));
+    
+    if (shift == 0)
+    {
+        for (; ny >= 4; ny -= 4)
+        {
+            if (mask == 0xFFu)
+                memcpy(dst, src, width);
+            else
+            {
+                const fb_data *src_row = src;
+                fb_data *dst_row = dst;
+                
+                dst_end = dst_row + width;
+                do 
+                    setblock(dst_row++, mask, *src_row++);
+                while (dst_row < dst_end);
+            }
+            src += stride;
+            dst += LCD_WIDTH;
+            mask = 0xFFu;
+        }
+        mask &= mask_bottom;
+
+        if (mask == 0xFFu)
+            memcpy(dst, src, width);
+        else
+        {
+            dst_end = dst + width;
+            do
+                setblock(dst++, mask, *src++);
+            while (dst < dst_end);
+        }
+    }
+    else
+    {
+        shift *= 2;
+        dst_end = dst + width;
+        do
+        {
+            const fb_data *src_col = src++;
+            fb_data *dst_col = dst++;
+            unsigned mask_col = mask;
+            unsigned data = 0;
+            
+            for (y = ny; y >= 4; y -= 4)
+            {
+                data |= *src_col << shift;
+
+                if (mask_col & 0xFFu)
+                {
+                    setblock(dst_col, mask_col, data);
+                    mask_col = 0xFFu;
+                }
+                else
+                    mask_col >>= 8;
+
+                src_col += stride;
+                dst_col += LCD_WIDTH;
+                data >>= 8;
+            }
+            data |= *src_col << shift;
+            setblock(dst_col, mask_col & mask_bottom, data);
+        }
+        while (dst < dst_end);
+    }
+}
+
+/* Draw a full native bitmap */
+void lcd_bitmap(const fb_data *src, int x, int y, int width, int height)
+{
+    lcd_bitmap_part(src, 0, 0, width, x, y, width, height);
+}
+
+/* put a string at a given pixel position, skipping first ofs pixel columns */
+static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
+{
+    unsigned short ch;
+    unsigned short *ucs;
+    struct font* pf = font_get(curfont);
+
+    ucs = bidi_l2v(str, 1);
+
+    while ((ch = *ucs++) != 0 && x < LCD_WIDTH)
+    {
+        int width;
+        const unsigned char *bits;
+
+        /* get proportional width and glyph bits */
+        width = font_get_width(pf,ch);
+
+        if (ofs > width)
+        {
+            ofs -= width;
+            continue;
+        }
+
+        bits = font_get_bits(pf, ch);
+
+        lcd_mono_bitmap_part(bits, ofs, 0, width, x, y, width - ofs,
+                             pf->height);
+        
+        x += width - ofs;
+        ofs = 0;
+    }
+}
+
+/* put a string at a given pixel position */
+void lcd_putsxy(int x, int y, const unsigned char *str)
+{
+    lcd_putsxyofs(x, y, 0, str);
+}
+
+/*** line oriented text output ***/
+
+/* put a string at a given char position */
+void lcd_puts(int x, int y, const unsigned char *str)
+{
+    lcd_puts_style_offset(x, y, str, STYLE_DEFAULT, 0);
+}
+
+void lcd_puts_style(int x, int y, const unsigned char *str, int style)
+{
+    lcd_puts_style_offset(x, y, str, style, 0);
+}
+
+void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
+{
+    lcd_puts_style_offset(x, y, str, STYLE_DEFAULT, offset);
+}
+
+/* put a string at a given char position, style, and pixel position,
+ * skipping first offset pixel columns */
+void lcd_puts_style_offset(int x, int y, const unsigned char *str,
+                           int style, int offset)
+{
+    int xpos,ypos,w,h,xrect;
+    int lastmode = drawmode;
+
+    /* make sure scrolling is turned off on the line we are updating */
+    scrolling_lines &= ~(1 << y);
+
+    if(!str || !str[0])
+        return;
+
+    lcd_getstringsize(str, &w, &h);
+    xpos = xmargin + x*w / utf8length((char *)str);
+    ypos = ymargin + y*h;
+    drawmode = (style & STYLE_INVERT) ?
+               (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
+    lcd_putsxyofs(xpos, ypos, offset, str);
+    drawmode ^= DRMODE_INVERSEVID;
+    xrect = xpos + MAX(w - offset, 0);
+    lcd_fillrect(xrect, ypos, LCD_WIDTH - xrect, h);
+    drawmode = lastmode;
+}
+
+/*** scrolling ***/
+
+/* Reverse the invert setting of the scrolling line (if any) at given char
+   position.  Setting will go into affect next time line scrolls. */
+void lcd_invertscroll(int x, int y)
+{
+    struct scrollinfo* s;
+
+    (void)x;
+
+    s = &scroll[y];
+    s->invert = !s->invert;
+}
+
+void lcd_stop_scroll(void)
+{
+    scrolling_lines=0;
+}
+
+void lcd_scroll_speed(int speed)
+{
+    scroll_ticks = scroll_tick_table[speed];
+}
+
+void lcd_scroll_step(int step)
+{
+    scroll_step = step;
+}
+
+void lcd_scroll_delay(int ms)
+{
+    scroll_delay = ms / (HZ / 10);
+}
+
+void lcd_bidir_scroll(int percent)
+{
+    bidir_limit = percent;
+}
+
+void lcd_puts_scroll(int x, int y, const unsigned char *string)
+{
+    lcd_puts_scroll_style(x, y, string, STYLE_DEFAULT);
+}
+
+void lcd_puts_scroll_style(int x, int y, const unsigned char *string, int style)
+{
+     lcd_puts_scroll_style_offset(x, y, string, style, 0);
+}
+
+void lcd_puts_scroll_offset(int x, int y, const unsigned char *string, int offset)
+{
+     lcd_puts_scroll_style_offset(x, y, string, STYLE_DEFAULT, offset);
+}          
+   
+void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string,
+                                         int style, int offset)
+{
+    struct scrollinfo* s;
+    int w, h;
+
+    s = &scroll[y];
+
+    s->start_tick = current_tick + scroll_delay;
+    s->invert = false;
+    if (style & STYLE_INVERT) {
+        s->invert = true;
+        lcd_puts_style_offset(x,y,string,STYLE_INVERT,offset);
+    }
+    else
+        lcd_puts_offset(x,y,string,offset);
+
+    lcd_getstringsize(string, &w, &h);
+
+    if (LCD_WIDTH - x * 8 - xmargin < w) {
+        /* prepare scroll line */
+        char *end;
+
+        memset(s->line, 0, sizeof s->line);
+        strcpy(s->line, (char *)string);
+
+        /* get width */
+        s->width = lcd_getstringsize((unsigned char *)s->line, &w, &h);
+
+        /* scroll bidirectional or forward only depending on the string
+           width */
+        if ( bidir_limit ) {
+            s->bidir = s->width < (LCD_WIDTH - xmargin) *
+                (100 + bidir_limit) / 100;
+        }
+        else
+            s->bidir = false;
+
+        if (!s->bidir) { /* add spaces if scrolling in the round */
+            strcat(s->line, "   ");
+            /* get new width incl. spaces */
+            s->width = lcd_getstringsize((unsigned char *)s->line, &w, &h);
+        }
+
+        end = strchr(s->line, '\0');
+        strncpy(end, (char *)string, LCD_WIDTH/2);
+
+        s->len = utf8length((char *)string);
+        s->offset = offset;
+        s->startx = xmargin + x * s->width / s->len;
+        s->backward = false;
+        scrolling_lines |= (1<<y);
+    }
+    else
+        /* force a bit switch-off since it doesn't scroll */
+        scrolling_lines &= ~(1<<y);
+}
+
+static void scroll_thread(void)
+{
+    struct font* pf;
+    struct scrollinfo* s;
+    int index;
+    int xpos, ypos;
+    int lastmode;
+
+    /* initialize scroll struct array */
+    scrolling_lines = 0;
+
+    while ( 1 ) {
+        for ( index = 0; index < SCROLLABLE_LINES; index++ ) {
+            /* really scroll? */
+            if ( !(scrolling_lines&(1<<index)) )
+                continue;
+
+            s = &scroll[index];
+
+            /* check pause */
+            if (TIME_BEFORE(current_tick, s->start_tick))
+                continue;
+
+            if (s->backward)
+                s->offset -= scroll_step;
+            else
+                s->offset += scroll_step;
+
+            pf = font_get(curfont);
+            xpos = s->startx;
+            ypos = ymargin + index * pf->height;
+
+            if (s->bidir) { /* scroll bidirectional */
+                if (s->offset <= 0) {
+                    /* at beginning of line */
+                    s->offset = 0;
+                    s->backward = false;
+                    s->start_tick = current_tick + scroll_delay * 2;
+                }
+                if (s->offset >= s->width - (LCD_WIDTH - xpos)) {
+                    /* at end of line */
+                    s->offset = s->width - (LCD_WIDTH - xpos);
+                    s->backward = true;
+                    s->start_tick = current_tick + scroll_delay * 2;
+                }
+            }
+            else {
+                /* scroll forward the whole time */
+                if (s->offset >= s->width)
+                    s->offset %= s->width;
+            }
+
+            lastmode = drawmode;
+            drawmode = s->invert ?
+                       (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
+            lcd_putsxyofs(xpos, ypos, s->offset, s->line);
+            drawmode = lastmode;
+            lcd_update_rect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
+        }
+
+        sleep(scroll_ticks);
+    }
+}
diff --git a/firmware/target/coldfire/iriver/h300/lcd-h300.c b/firmware/target/coldfire/iriver/h300/lcd-h300.c
new file mode 100644
index 0000000000..3e5642e35d
--- /dev/null
+++ b/firmware/target/coldfire/iriver/h300/lcd-h300.c
@@ -0,0 +1,425 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2004 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+
+#include "cpu.h"
+#include "lcd.h"
+#include "kernel.h"
+#include "thread.h"
+#include <string.h>
+#include <stdlib.h>
+#include "file.h"
+#include "debug.h"
+#include "system.h"
+#include "font.h"
+#include "bidi.h"
+
+static bool display_on = false; /* is the display turned on? */
+static bool display_flipped = false;
+static int xoffset = 0; /* needed for flip */
+
+/* register defines */
+#define R_START_OSC             0x00
+#define R_DRV_OUTPUT_CONTROL    0x01
+#define R_DRV_WAVEFORM_CONTROL  0x02
+#define R_ENTRY_MODE            0x03
+#define R_COMPARE_REG1          0x04
+#define R_COMPARE_REG2          0x05
+
+#define R_DISP_CONTROL1     0x07
+#define R_DISP_CONTROL2     0x08
+#define R_DISP_CONTROL3     0x09
+
+#define R_FRAME_CYCLE_CONTROL 0x0b
+#define R_EXT_DISP_IF_CONTROL 0x0c
+
+#define R_POWER_CONTROL1    0x10
+#define R_POWER_CONTROL2    0x11
+#define R_POWER_CONTROL3    0x12
+#define R_POWER_CONTROL4    0x13
+
+#define R_RAM_ADDR_SET  0x21
+#define R_WRITE_DATA_2_GRAM 0x22
+
+#define R_GAMMA_FINE_ADJ_POS1   0x30
+#define R_GAMMA_FINE_ADJ_POS2   0x31
+#define R_GAMMA_FINE_ADJ_POS3   0x32
+#define R_GAMMA_GRAD_ADJ_POS    0x33
+
+#define R_GAMMA_FINE_ADJ_NEG1   0x34
+#define R_GAMMA_FINE_ADJ_NEG2   0x35
+#define R_GAMMA_FINE_ADJ_NEG3   0x36
+#define R_GAMMA_GRAD_ADJ_NEG    0x37
+
+#define R_GAMMA_AMP_ADJ_RES_POS     0x38
+#define R_GAMMA_AMP_AVG_ADJ_RES_NEG 0x39 
+
+#define R_GATE_SCAN_POS         0x40
+#define R_VERT_SCROLL_CONTROL   0x41
+#define R_1ST_SCR_DRV_POS       0x42
+#define R_2ND_SCR_DRV_POS       0x43
+#define R_HORIZ_RAM_ADDR_POS    0x44
+#define R_VERT_RAM_ADDR_POS     0x45
+
+#define LCD_CMD  (*(volatile unsigned short *)0xf0000000)
+#define LCD_DATA (*(volatile unsigned short *)0xf0000002)
+
+/* called very frequently - inline! */
+static inline void lcd_write_reg(int reg, int val)
+{
+    LCD_CMD = reg;
+    LCD_DATA = val;
+}
+
+/* called very frequently - inline! */
+static inline void lcd_begin_write_gram(void)
+{
+    LCD_CMD = R_WRITE_DATA_2_GRAM;
+}
+
+/*** hardware configuration ***/
+
+void lcd_set_contrast(int val)
+{
+    (void)val;
+}
+
+void lcd_set_invert_display(bool yesno)
+{
+    (void)yesno;
+}
+
+static void flip_lcd(bool yesno)
+{
+    if (yesno)
+    {
+        lcd_write_reg(R_DRV_OUTPUT_CONTROL, 0x031b); /* 224 lines, GS=SS=1 */
+        lcd_write_reg(R_GATE_SCAN_POS, 0x0002);      /* 16 lines offset */
+        lcd_write_reg(R_1ST_SCR_DRV_POS, 0xdf04);    /* 4..223 */
+    }
+    else
+    {
+        lcd_write_reg(R_DRV_OUTPUT_CONTROL, 0x001b); /* 224 lines, GS=SS=0 */
+        lcd_write_reg(R_GATE_SCAN_POS, 0x0000);
+        lcd_write_reg(R_1ST_SCR_DRV_POS, 0xdb00);    /* 0..219 */
+    }
+}
+
+/* turn the display upside down (call lcd_update() afterwards) */
+void lcd_set_flip(bool yesno)
+{
+    display_flipped = yesno;
+    xoffset = yesno ? 4 : 0;
+
+    if (display_on)
+        flip_lcd(yesno);
+}
+
+static void _display_on(void)
+{
+    /** Sequence according to datasheet, p. 132 **/
+    
+    lcd_write_reg(R_START_OSC, 0x0001); /* Start Oscilation */
+    sleep(1);
+
+    /* zero everything*/
+    lcd_write_reg(R_POWER_CONTROL1, 0x0000); /* STB = 0, SLP = 0 */
+    lcd_write_reg(R_DISP_CONTROL1, 0x0000);  /* GON = 0, DTE = 0, D1-0 = 00b */
+    lcd_write_reg(R_POWER_CONTROL3, 0x0000); /* PON = 0 */
+    lcd_write_reg(R_POWER_CONTROL4, 0x0000); /* VCOMG = 0 */
+    sleep(1);
+
+    /* initialise power supply */
+    
+    /* DC12-10 = 000b: Step-up1 = clock/8,
+     * DC02-00 = 000b: Step-up2 = clock/16,
+     * VC2-0   = 010b: VciOUT = 0.87 * VciLVL */
+    lcd_write_reg(R_POWER_CONTROL2, 0x0002); 
+    
+    /* VRH3-0 = 1000b: Vreg1OUT = REGP * 1.90 */
+    lcd_write_reg(R_POWER_CONTROL3, 0x0008);
+    
+    /* VDV4-0 = 00110b: VcomA = Vreg1OUT * 0.76,
+     * VCM4-0 = 10000b: VcomH = Vreg1OUT * 0.70*/
+    lcd_write_reg(R_POWER_CONTROL4, 0x0610);     
+
+    lcd_write_reg(R_POWER_CONTROL1, 0x0044); /* AP2-0 = 100b, DK = 1 */
+    lcd_write_reg(R_POWER_CONTROL3, 0x0018); /* PON = 1 */
+
+    sleep(4); /* Step-up circuit stabilising time */
+    
+    /* start power supply */
+
+    lcd_write_reg(R_POWER_CONTROL1, 0x0540); /* BT2-0 = 101b, DK = 0 */
+    lcd_write_reg(R_POWER_CONTROL4, 0x2610); /* VCOMG = 1 */
+
+    /* other settings */
+
+    /* B/C = 1: n-line inversion form
+     * EOR = 1: polarity inversion occurs by applying an EOR to odd/even
+     *          frame select signal and an n-line inversion signal.
+     * FLD = 01b: 1 field interlaced scan, external display iface */
+    lcd_write_reg(R_DRV_WAVEFORM_CONTROL, 0x0700);
+
+    /* Address counter updated in vertical direction; left to right;
+     * vertical increment horizontal increment.
+     * data format for 8bit transfer or spi = 65k (5,6,5)
+     * Reverse order of RGB to BGR for 18bit data written to GRAM
+     * Replace data on writing to GRAM */
+    lcd_write_reg(R_ENTRY_MODE, 0x7038);
+
+    flip_lcd(display_flipped);
+
+    lcd_write_reg(R_2ND_SCR_DRV_POS, 0x0000);
+    lcd_write_reg(R_VERT_SCROLL_CONTROL, 0x0000);
+
+    /* 19 clocks,no equalization */
+    lcd_write_reg(R_FRAME_CYCLE_CONTROL, 0x0002);
+
+    /* Transfer mode for RGB interface disabled
+     * internal clock operation;
+     * System interface/VSYNC interface */
+    lcd_write_reg(R_EXT_DISP_IF_CONTROL, 0x0003);
+
+    /* Front porch lines: 8; Back porch lines: 8; */
+    lcd_write_reg(R_DISP_CONTROL2, 0x0808);
+
+    /* Scan mode by the gate driver in the non-display area: disabled;
+     * Cycle of scan by the gate driver - set to 31frames(518ms), 
+     * disabled by above setting */
+    lcd_write_reg(R_DISP_CONTROL3, 0x003f);
+
+    lcd_write_reg(R_GAMMA_FINE_ADJ_POS1, 0x0003);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_POS2, 0x0707);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_POS3, 0x0007);
+    lcd_write_reg(R_GAMMA_GRAD_ADJ_POS, 0x0705);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG1, 0x0007);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG2, 0x0000);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG3, 0x0407);
+    lcd_write_reg(R_GAMMA_GRAD_ADJ_NEG, 0x0507);
+    lcd_write_reg(R_GAMMA_AMP_ADJ_RES_POS, 0x1d09);
+    lcd_write_reg(R_GAMMA_AMP_AVG_ADJ_RES_NEG, 0x0303);
+
+    display_on=true;  /* must be done before calling lcd_update() */
+    lcd_update();
+    
+    sleep(4); /* op-amp stabilising time */
+ 
+    /** Sequence according to datasheet, p. 130 **/
+
+    lcd_write_reg(R_POWER_CONTROL1, 0x4540); /* SAP2-0=100, BT2-0=101, AP2-0=100 */
+    lcd_write_reg(R_DISP_CONTROL1, 0x0005);  /* GON=0, DTE=0, REV=1, D1-0=01 */
+    sleep(2);
+    
+    lcd_write_reg(R_DISP_CONTROL1, 0x0025);  /* GON=1, DTE=0, REV=1, D1-0=01 */
+    lcd_write_reg(R_DISP_CONTROL1, 0x0027);  /* GON=1, DTE=0, REV=1, D1-0=11 */
+    sleep(2);
+
+    lcd_write_reg(R_DISP_CONTROL1, 0x0037);  /* GON=1, DTE=1, REV=1, D1-0=11 */
+}
+
+/* LCD init */
+void lcd_init_device(void)
+{
+    /* GPO46 is LCD RESET */
+    or_l(0x00004000, &GPIO1_OUT);
+    or_l(0x00004000, &GPIO1_ENABLE);
+    or_l(0x00004000, &GPIO1_FUNCTION);
+
+    /* Reset LCD */
+    and_l(~0x00004000, &GPIO1_OUT);
+    sleep(1);
+    or_l(0x00004000, &GPIO1_OUT);
+    sleep(1);
+
+    _display_on();
+}
+
+void lcd_enable(bool on)
+{
+    if(display_on!=on)
+    {
+        if(on)
+        {
+            _display_on();
+        }
+        else
+        {
+            /** Off sequence according to datasheet, p. 130 **/
+
+            lcd_write_reg(R_FRAME_CYCLE_CONTROL, 0x0002); /* EQ=0, 18 clks/line */
+            lcd_write_reg(R_DISP_CONTROL1, 0x0036);  /* GON=1, DTE=1, REV=1, D1-0=10 */
+            sleep(2);
+
+            lcd_write_reg(R_DISP_CONTROL1, 0x0026);  /* GON=1, DTE=0, REV=1, D1-0=10 */
+            sleep(2);
+
+            lcd_write_reg(R_DISP_CONTROL1, 0x0000);  /* GON=0, DTE=0, D1-0=00 */
+
+            lcd_write_reg(R_POWER_CONTROL1, 0x0000); /* SAP2-0=000, AP2-0=000 */
+            lcd_write_reg(R_POWER_CONTROL3, 0x0000); /* PON=0 */
+            lcd_write_reg(R_POWER_CONTROL4, 0x0000); /* VCOMG=0 */
+            
+            /* datasheet p. 131 */
+            lcd_write_reg(R_POWER_CONTROL1, 0x0001); /* STB=1: standby mode */
+
+            display_on=false;
+        }
+    }
+}
+
+/*** 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.
+ * bu and rv should contain the Cb and Cr data for the two lines of Y.
+ * Needs EMAC set to saturated, signed integer mode.
+ */
+extern void lcd_write_yuv420_lines(const unsigned char *y,
+                                   const unsigned char *bu,
+                                   const unsigned char *rv, int width);
+
+/* Performance function to blit a YUV bitmap directly to the LCD
+ * src_x, src_y, width and height should be even
+ * x, y, width and height have to be within LCD bounds
+ */
+void lcd_yuv_blit(unsigned char * const src[3],
+                  int src_x, int src_y, int stride,
+                  int x, int y, int width, int height)
+{
+    /* IRAM Y, Cb and Cb buffers. */
+    unsigned char y_ibuf[LCD_WIDTH*2];
+    unsigned char bu_ibuf[LCD_WIDTH/2];
+    unsigned char rv_ibuf[LCD_WIDTH/2];
+    const unsigned char *ysrc, *usrc, *vsrc;
+    const unsigned char *ysrc_max;
+
+    if (!display_on)
+        return;
+
+    width &= ~1;  /* stay on the safe side */
+    height &= ~1;
+
+    /* Set start position and window */
+    lcd_write_reg(R_VERT_RAM_ADDR_POS,((x+xoffset+width-1) << 8) | (x+xoffset));
+    lcd_write_reg(R_RAM_ADDR_SET, ((x+xoffset) << 8) | y);
+
+    lcd_begin_write_gram();
+
+    ysrc = src[0] + src_y * stride + src_x;
+    usrc = src[1] + (src_y * stride >> 2) + (src_x >> 1);
+    vsrc = src[2] + (src_y * stride >> 2) + (src_x >> 1);
+    ysrc_max = ysrc + height * stride;
+
+    coldfire_set_macsr(EMAC_SATURATE);
+    do
+    {
+        memcpy(y_ibuf, ysrc, width);
+        memcpy(y_ibuf + width, ysrc + stride, width);
+        memcpy(bu_ibuf, usrc, width >> 1);
+        memcpy(rv_ibuf, vsrc, width >> 1);
+        lcd_write_yuv420_lines(y_ibuf, bu_ibuf, rv_ibuf, width);
+        ysrc += 2 * stride;
+        usrc += stride >> 1;
+        vsrc += stride >> 1;
+    }
+    while (ysrc < ysrc_max);
+}
+
+/* Update the display.
+   This must be called after all other LCD functions that change the display. */
+void lcd_update(void) ICODE_ATTR;
+void lcd_update(void)
+{
+    if(display_on){
+        /* reset update window */
+        lcd_write_reg(R_VERT_RAM_ADDR_POS,((xoffset+219)<<8) | xoffset);
+
+        /* Copy display bitmap to hardware */
+        lcd_write_reg(R_RAM_ADDR_SET, xoffset << 8);
+        lcd_begin_write_gram();
+
+        DAR3 = 0xf0000002;
+        SAR3 = (unsigned long)lcd_framebuffer;
+        BCR3 = LCD_WIDTH*LCD_HEIGHT*2;
+        DCR3 = DMA_AA | DMA_BWC(1)
+             | DMA_SINC | DMA_SSIZE(DMA_SIZE_LINE) 
+             | DMA_DSIZE(DMA_SIZE_WORD) | DMA_START;
+
+        while (!(DSR3 & 1));
+        DSR3 = 1;
+    }
+}
+
+
+/* Update a fraction of the display. */
+void lcd_update_rect(int, int, int, int) ICODE_ATTR;
+void lcd_update_rect(int x, int y, int width, int height)
+{
+    unsigned long dma_addr;
+
+    if(display_on) {
+
+        if(x + width > LCD_WIDTH)
+            width = LCD_WIDTH - x;
+        if(width <= 0) /* nothing to do */
+            return;
+        if(y + height > LCD_HEIGHT)
+            height = LCD_HEIGHT - y;
+
+        /* set update window */
+
+        lcd_write_reg(R_VERT_RAM_ADDR_POS,((x+xoffset+width-1) << 8) | (x+xoffset));
+        lcd_write_reg(R_RAM_ADDR_SET, ((x+xoffset) << 8) | y);
+        lcd_begin_write_gram();
+        
+        DAR3 = 0xf0000002;
+        dma_addr = (unsigned long)&lcd_framebuffer[y][x];
+        width *= 2;
+
+        for (; height > 0; height--)
+        {
+            SAR3 = dma_addr;
+            BCR3 = width;
+            DCR3 = DMA_AA | DMA_BWC(1)
+                 | DMA_SINC | DMA_SSIZE(DMA_SIZE_LINE)
+                 | DMA_DSIZE(DMA_SIZE_WORD) | DMA_START;
+
+            dma_addr += LCD_WIDTH*2;
+
+            while (!(DSR3 & 1));
+            DSR3 = 1;
+        }
+    }
+}