summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/CREDITS1
-rw-r--r--firmware/drivers/lcd-2bit-horz.c813
-rw-r--r--firmware/drivers/lcd-ipod.c201
3 files changed, 1002 insertions, 13 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index cd20905178..71d3480a55 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -164,3 +164,4 @@ Tim Crist
Jvo Studer
Dan Everton
Imre Herceg
+Seven Le Mesle
diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c
new file mode 100644
index 0000000000..01f5d93cf3
--- /dev/null
+++ b/firmware/drivers/lcd-2bit-horz.c
@@ -0,0 +1,813 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * LCD driver for horizontally-packed 2bpp greyscale display
+ *
+ * Based on code from the rockbox lcd's driver
+ *
+ * Copyright (c) 2006 Seven Le Mesle (sevlm@free.fr)
+ *
+ * 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"
+
+#define SCROLLABLE_LINES 26
+
+/*** globals ***/
+
+unsigned char lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH/4] 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 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
+};
+
+
+static unsigned char notmask[4] = { 0xfc, 0xf3, 0xcf, 0x3f };
+
+/* LCD init */
+void lcd_init(void)
+{
+ lcd_clear_display();
+ /* Call device specific init */
+ lcd_init_device();
+ create_thread(scroll_thread, scroll_stack,
+ sizeof(scroll_stack), scroll_name);
+}
+
+/*** 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_value(int x, int y, unsigned val)
+{
+ unsigned char *data = &lcd_framebuffer[y][x>>2];
+
+ *data = (*data & notmask[x&3]) | (val << ((x&3)<<1));
+}
+
+static void setpixel(int x, int y)
+{
+ unsigned char *data = &lcd_framebuffer[y][x>>2];
+
+ *data = (*data & notmask[x&3]) | (fg_pattern << ((x&3)<<1));
+}
+
+static void clearpixel(int x, int y)
+{
+ unsigned char *data = &lcd_framebuffer[y][x>>2];
+*data = (*data & notmask[x&3]) | (bg_pattern << ((x&3)<<1));
+}
+
+static void flippixel(int x, int y)
+{
+ lcd_framebuffer[y][x>>2] ^= 3 << (2 * (x & 3));
+}
+
+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
+};
+
+
+/*** 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;
+
+ lcd_pixelfunc_type *pfunc = lcd_pixelfuncs[drawmode];
+
+ /* 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;
+
+ while(x1 <= x2) {
+ pfunc(x1,y);
+ ++x1;
+ }
+}
+
+/* Draw a vertical line (optimised) */
+void lcd_vline(int x, int y1, int y2)
+{
+ int ny;
+
+ lcd_pixelfunc_type *pfunc = lcd_pixelfuncs[drawmode];
+
+ /* 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;
+
+
+ while(y1++ <= y2) {
+ pfunc(x, y1);
+ }
+}
+
+/* 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;
+
+
+ /* 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;
+
+ ny = y;
+ while (ny <= height)
+ {
+ lcd_hline (x, width, ny);
+ ny++;
+ }
+}
+
+/* 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 horizontally, 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 row
+ * 0, the second row defines pixel row 1 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 ny, nx, ymax;
+ const unsigned char * src_end;
+
+ /* 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;
+ src_end = src + width;
+
+ nx = x;
+ do
+ {
+ const unsigned char *src_col = src++;
+ unsigned data = *src_col >> src_y;
+ int numbits = 8 - ((int)src_y);
+
+ ymax = y + height;
+ ny = y;
+ do
+ {
+ if (data & 0x01)
+ setpixel (nx,ny);
+ else
+ clearpixel (nx,ny);
+
+ ny++;
+
+ data >>= 1;
+ if (--numbits == 0)
+ {
+ src_col += stride;
+ data = *src_col;
+ numbits = 8;
+ }
+ }
+ while (ny < ymax);
+ nx++;
+ }
+ while (src < src_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 unsigned char *src, int src_x, int src_y,
+ int stride, int x, int y, int width, int height)
+ ICODE_ATTR;
+void lcd_bitmap_part(const unsigned char *src, int src_x, int src_y,
+ int stride, int x, int y, int width, int height)
+{
+ int ny, nx, ymax;
+ const unsigned char * src_end;
+
+ /* 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;
+ src_end = src + width;
+
+ nx = x;
+ do
+ {
+ const unsigned char *src_col = src++;
+ unsigned data = *src_col >> src_y;
+ int numbits = 8 - src_y;
+
+ ymax = y + height;
+ ny = y;
+ do
+ {
+ if (data & 0x03)
+ setpixel_value (nx,ny, 0xFF);
+ else
+ if (data & 0x01)
+ setpixel_value (nx,ny, 0x3F);
+ else
+ if (data & 0x02)
+ setpixel_value (nx,ny, 0xCF);
+ else
+ setpixel_value (nx,ny, 0x00);
+
+ ny++;
+
+ data >>= 2;
+ if (--numbits == 0)
+ {
+ src_col += stride;
+ data = *src_col;
+ numbits = 4;
+ }
+ }
+ while (ny < ymax);
+ nx++;
+ }
+ while (src < src_end);
+}
+
+/* Draw a full native bitmap */
+void lcd_bitmap(const unsigned char *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;
+
+ /* check input range */
+ if (ch < pf->firstchar || ch >= pf->firstchar+pf->size)
+ ch = pf->defaultchar;
+ ch -= pf->firstchar;
+
+ /* 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 ***/
+
+void lcd_puts_style(int x, int y, const unsigned char *str, int style)
+{
+ int xpos,ypos,w,h;
+ 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;
+ lcd_putsxy(xpos, ypos, str);
+ drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID);
+ lcd_fillrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
+ if (style & STYLE_INVERT)
+ {
+ drawmode = DRMODE_COMPLEMENT;
+ lcd_fillrect(xpos, ypos, LCD_WIDTH - xpos, h);
+ }
+ drawmode = lastmode;
+}
+
+/* put a string at a given char position */
+void lcd_puts(int x, int y, const unsigned char *str)
+{
+ lcd_puts_style(x, y, str, STYLE_DEFAULT);
+}
+
+/*** 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)
+{
+ 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(x,y,string,STYLE_INVERT);
+ }
+ else
+ lcd_puts(x,y,string);
+
+ 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 = 0;
+ s->startx = x;
+ 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 = xmargin + s->startx * s->width / s->len;
+ 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 = (DRMODE_SOLID|DRMODE_INVERSEVID);
+ lcd_fillrect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
+ drawmode = DRMODE_SOLID;
+ lcd_putsxyofs(xpos, ypos, s->offset, (unsigned char *)s->line);
+ if (s->invert)
+ {
+ drawmode = DRMODE_COMPLEMENT;
+ lcd_fillrect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
+ }
+ drawmode = lastmode;
+ lcd_update_rect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
+ }
+
+ sleep(scroll_ticks);
+ }
+}
diff --git a/firmware/drivers/lcd-ipod.c b/firmware/drivers/lcd-ipod.c
index 0ff22ab9b5..2d165551e6 100644
--- a/firmware/drivers/lcd-ipod.c
+++ b/firmware/drivers/lcd-ipod.c
@@ -29,7 +29,192 @@
#include "kernel.h"
#include "system.h"
-/*** definitions ***/
+
+/* check if number of useconds has past */
+static int timer_check(int clock_start, int usecs)
+{
+ if ( ((int)(USEC_TIMER - clock_start)) >= usecs ) {
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+
+#if (CONFIG_LCD == LCD_IPOD2BPP)
+
+/*** hardware configuration ***/
+
+#define IPOD_LCD_BASE 0xc0001000
+#define IPOD_LCD_BUSY_MASK 0x80000000
+
+/* LCD command codes for HD66789R */
+
+
+#define LCD_CMD 0x08
+#define LCD_DATA 0x10
+
+static unsigned int lcd_contrast = 0x6a;
+
+
+/* wait for LCD with timeout */
+static void lcd_wait_write(void)
+{
+ int start = USEC_TIMER;
+
+ do {
+ if ((inl(IPOD_LCD_BASE) & 0x8000) == 0) break;
+ } while (timer_check(start, 1000) == 0);
+}
+
+
+/* send LCD data */
+static void lcd_send_data(int data_lo, int data_hi)
+{
+ lcd_wait_write();
+ outl(data_lo, IPOD_LCD_BASE + LCD_DATA);
+ lcd_wait_write();
+ outl(data_hi, IPOD_LCD_BASE + LCD_DATA);
+}
+
+/* send LCD command */
+static void lcd_prepare_cmd(int cmd)
+{
+ lcd_wait_write();
+
+ outl(0x0, IPOD_LCD_BASE + LCD_CMD);
+ lcd_wait_write();
+ outl(cmd, IPOD_LCD_BASE + LCD_CMD);
+
+}
+
+/* send LCD command and data */
+static void lcd_cmd_and_data(int cmd, int data_lo, int data_hi)
+{
+ lcd_prepare_cmd(cmd);
+
+ lcd_send_data(data_lo, data_hi);
+}
+
+int lcd_default_contrast(void)
+{
+ return 28;
+}
+
+/**
+ *
+ * LCD init
+ **/
+void lcd_init_device(void){
+ /* driver output control - 160x128 */
+ lcd_cmd_and_data(0x1, 0x1, 0xf);
+ lcd_cmd_and_data(0x5, 0x0, 0x10);
+}
+
+/*** update functions ***/
+/* srccopy bitblt, opcode is currently ignored*/
+
+/* Performance function that works with an external buffer
+ note that x and bwidtht are in 8-pixel units! */
+void lcd_blit(const unsigned char* data, int x, int by, int width,
+ int bheight, int stride)
+{
+ /* TODO implement this on iPod */
+ (void)data;
+ (void)x;
+ (void)by;
+ (void)width;
+ (void)bheight;
+ (void)stride;
+}
+
+/* Rolls up the lcd display by the specified amount of lines.
+ * Lines that are rolled out over the top of the screen are
+ * rolled in from the bottom again. This is a hardware
+ * remapping only and all operations on the lcd are affected.
+ * ->
+ * @param int lines - The number of lines that are rolled.
+ * The value must be 0 <= pixels < LCD_HEIGHT. */
+void lcd_roll(int lines)
+{
+ /* TODO Implement lcd_roll() */
+ lines &= LCD_HEIGHT-1;
+}
+
+/*** hardware configuration ***/
+
+/* Update the display.
+ This must be called after all other LCD functions that change the display. */
+void lcd_update(void)
+{
+ lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
+}
+
+void lcd_set_contrast(int val)
+{
+ lcd_cmd_and_data(0x4, 0x4, val);
+ lcd_contrast = val;
+}
+
+void lcd_update_rect(int x, int y, int width, int height)
+{
+ int cursor_pos, xx;
+ int ny;
+ int sx = x, sy = y, mx = width, my = height;
+
+ /* only update the ipod if we are writing to the screen */
+
+ sx >>= 3;
+ //mx = (mx+7)>>3;
+ mx >>= 3;
+
+ cursor_pos = sx + (sy << 5);
+
+ for ( ny = sy; ny <= my; ny++ ) {
+ unsigned char * img_data;
+
+
+ // move the cursor
+ lcd_cmd_and_data(0x11, cursor_pos >> 8, cursor_pos & 0xff);
+
+ // setup for printing
+ lcd_prepare_cmd(0x12);
+
+ img_data = &lcd_framebuffer[ny][sx<<1];
+
+ // 160/8 -> 20 == loops 20 times
+ // make sure we loop at least once
+ for ( xx = sx; xx <= mx; xx++ ) {
+ // display a character
+ lcd_send_data(*(img_data+1), *img_data);
+
+ img_data += 2;
+ }
+
+ // update cursor pos counter
+ cursor_pos += 0x20;
+ }
+}
+
+/** Switch on or off the backlight **/
+void lcd_enable (bool on){
+ int lcd_state;
+
+ lcd_state = inl(IPOD_LCD_BASE);
+ if (on){
+ lcd_state = lcd_state | 0x2;
+ outl(lcd_state, IPOD_LCD_BASE);
+ lcd_cmd_and_data(0x7, 0x0, 0x11);
+ }
+ else {
+ lcd_state = lcd_state & ~0x2;
+ outl(lcd_state, IPOD_LCD_BASE);
+ lcd_cmd_and_data(0x7, 0x0, 0x9);
+ }
+}
+
+#else
+
#define IPOD_LCD_BASE 0x70008a0c
#define IPOD_LCD_BUSY_MASK 0x80000000
@@ -42,17 +227,6 @@
/*** globals ***/
static int lcd_type = 1; /* 0 = "old" Color/Photo, 1 = "new" Color & Nano */
-
-/* check if number of useconds has past */
-static inline int timer_check(unsigned long clock_start, unsigned long usecs)
-{
- if ( (USEC_TIMER - clock_start) >= usecs ) {
- return 1;
- } else {
- return 0;
- }
-}
-
static void lcd_wait_write(void)
{
if ((inl(IPOD_LCD_BASE) & IPOD_LCD_BUSY_MASK) != 0) {
@@ -229,7 +403,7 @@ void lcd_update_rect(int x, int y, int width, int height)
/* start vert = max vert */
#if CONFIG_LCD == LCD_IPODCOLOR
- x0 = x1;
+ x0 = x1;
#endif
/* position cursor (set AD0-AD15) */
@@ -288,3 +462,4 @@ void lcd_update(void)
lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
}
+#endif