Moved ipod LCD code to target tree.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12479 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-02-25 13:11:02 +00:00
parent b7486fb4a9
commit 2906c36df3
4 changed files with 286 additions and 255 deletions

View file

@ -480,7 +480,6 @@ target/arm/usb-pp.c
#ifdef IPOD_4G
#ifndef SIMULATOR
drivers/lcd-ipod.c
drivers/pcf50605.c
target/arm/wmcodec-pp.c
target/arm/i2s-pp.c
@ -489,6 +488,7 @@ target/arm/ata-pp5020.c
target/arm/ipod/adc-ipod.c
target/arm/ipod/backlight-4g_color.c
target/arm/ipod/button-clickwheel.c
target/arm/ipod/lcd-gray.c
target/arm/ipod/power-ipod.c
target/arm/usb-pp.c
#endif /* SIMULATOR */
@ -496,7 +496,6 @@ target/arm/usb-pp.c
#ifdef IPOD_COLOR
#ifndef SIMULATOR
drivers/lcd-ipod.c
drivers/pcf50605.c
target/arm/ata-as-arm.S
target/arm/ata-pp5020.c
@ -505,6 +504,7 @@ target/arm/i2s-pp.c
target/arm/ipod/adc-ipod.c
target/arm/ipod/backlight-4g_color.c
target/arm/ipod/button-clickwheel.c
target/arm/ipod/lcd-color_nano.c
target/arm/ipod/power-ipod.c
target/arm/usb-pp.c
#endif /* SIMULATOR */
@ -512,7 +512,6 @@ target/arm/usb-pp.c
#ifdef IPOD_NANO
#ifndef SIMULATOR
drivers/lcd-ipod.c
drivers/pcf50605.c
target/arm/ata-as-arm.S
target/arm/ata-pp5020.c
@ -521,6 +520,7 @@ target/arm/i2s-pp.c
target/arm/ipod/adc-ipod.c
target/arm/ipod/backlight-nano_video.c
target/arm/ipod/button-clickwheel.c
target/arm/ipod/lcd-color_nano.c
target/arm/ipod/power-ipod.c
target/arm/usb-pp.c
#endif /* SIMULATOR */
@ -528,7 +528,6 @@ target/arm/usb-pp.c
#ifdef IPOD_VIDEO
#ifndef SIMULATOR
drivers/lcd-ipodvideo.c
drivers/pcf50605.c
target/arm/ata-as-arm.S
target/arm/ata-pp5020.c
@ -538,13 +537,13 @@ target/arm/ipod/adc-ipod.c
target/arm/ipod/backlight-nano_video.c
target/arm/ipod/button-clickwheel.c
target/arm/ipod/power-ipod.c
target/arm/ipod/video/lcd-video.c
target/arm/usb-pp.c
#endif /* SIMULATOR */
#endif /* IPOD_VIDEO */
#ifdef IPOD_3G
#ifndef SIMULATOR
drivers/lcd-ipod.c
drivers/pcf50605.c
target/arm/ata-pp5002.c
target/arm/wmcodec-pp.c
@ -552,6 +551,7 @@ target/arm/i2s-pp.c
target/arm/ipod/adc-ipod.c
target/arm/ipod/3g/backlight-3g.c
target/arm/ipod/3g/button-3g.c
target/arm/ipod/lcd-gray.c
target/arm/ipod/power-ipod.c
target/arm/usb-pp.c
#endif /* SIMULATOR */
@ -559,7 +559,6 @@ target/arm/usb-pp.c
#ifdef IPOD_MINI
#ifndef SIMULATOR
drivers/lcd-ipod.c
drivers/pcf50605.c
target/arm/ata-as-arm.S
target/arm/ata-pp5020.c
@ -568,6 +567,7 @@ target/arm/i2s-pp.c
target/arm/ipod/adc-ipod.c
target/arm/ipod/backlight-mini1g_mini2g.c
target/arm/ipod/button-mini1g.c
target/arm/ipod/lcd-gray.c
target/arm/ipod/power-ipod.c
target/arm/usb-pp.c
#endif /* SIMULATOR */
@ -575,7 +575,6 @@ target/arm/usb-pp.c
#ifdef IPOD_MINI2G
#ifndef SIMULATOR
drivers/lcd-ipod.c
drivers/pcf50605.c
target/arm/ata-as-arm.S
target/arm/ata-pp5020.c
@ -584,6 +583,7 @@ target/arm/i2s-pp.c
target/arm/ipod/adc-ipod.c
target/arm/ipod/backlight-mini1g_mini2g.c
target/arm/ipod/button-clickwheel.c
target/arm/ipod/lcd-gray.c
target/arm/ipod/power-ipod.c
target/arm/usb-pp.c
#endif /* SIMULATOR */

View file

@ -36,252 +36,6 @@ static inline bool timer_check(int clock_start, int usecs)
return ((int)(USEC_TIMER - clock_start)) >= usecs;
}
#if (CONFIG_LCD == LCD_IPOD2BPP) || (CONFIG_LCD == LCD_IPODMINI)
/*** hardware configuration ***/
#if CONFIG_CPU == PP5002
#define IPOD_LCD_BASE 0xc0001000
#define IPOD_LCD_BUSY_MASK 0x80000000
#else /* PP5020 */
#define IPOD_LCD_BASE 0x70003000
#define IPOD_LCD_BUSY_MASK 0x00008000
#endif
/* LCD command codes for HD66753 */
#define LCD_CMD 0x08
#define LCD_DATA 0x10
#define R_START_OSC 0x00
#define R_DRV_OUTPUT_CONTROL 0x01
#define R_DRV_WAVEFORM_CONTROL 0x02
#define R_POWER_CONTROL 0x03
#define R_CONTRAST_CONTROL 0x04
#define R_ENTRY_MODE 0x05
#define R_ROTATION 0x06
#define R_DISPLAY_CONTROL 0x07
#define R_CURSOR_CONTROL 0x08
#define R_HORIZONTAL_CURSOR_POS 0x0b
#define R_VERTICAL_CURSOR_POS 0x0c
#define R_1ST_SCR_DRV_POS 0x0d
#define R_2ND_SCR_DRV_POS 0x0e
#define R_RAM_WRITE_MASK 0x10
#define R_RAM_ADDR_SET 0x11
#define R_RAM_DATA 0x12
/* needed for flip */
static int addr_offset;
#if defined(IPOD_MINI) || defined(IPOD_MINI2G)
static int pix_offset;
#endif
static const unsigned char dibits[16] ICONST_ATTR = {
0x00, 0x03, 0x0C, 0x0F, 0x30, 0x33, 0x3C, 0x3F,
0xC0, 0xC3, 0xCC, 0xCF, 0xF0, 0xF3, 0xFC, 0xFF
};
/* wait for LCD with timeout */
static inline 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(unsigned data)
{
lcd_wait_write();
#ifdef IPOD_MINI2G
outl((inl(IPOD_LCD_BASE) & ~0x1f00000) | 0x1700000, IPOD_LCD_BASE);
outl(data | 0x760000, IPOD_LCD_BASE+8);
#else
outl(data >> 8, IPOD_LCD_BASE + LCD_DATA);
lcd_wait_write();
outl(data & 0xff, IPOD_LCD_BASE + LCD_DATA);
#endif
}
/* send LCD command */
static void lcd_prepare_cmd(unsigned cmd)
{
lcd_wait_write();
#ifdef IPOD_MINI2G
outl((inl(IPOD_LCD_BASE) & ~0x1f00000) | 0x1700000, IPOD_LCD_BASE);
outl(cmd | 0x740000, IPOD_LCD_BASE+8);
#else
outl(0x0, IPOD_LCD_BASE + LCD_CMD);
lcd_wait_write();
outl(cmd, IPOD_LCD_BASE + LCD_CMD);
#endif
}
/* send LCD command and data */
static void lcd_cmd_and_data(unsigned cmd, unsigned data)
{
lcd_prepare_cmd(cmd);
lcd_send_data(data);
}
/* LCD init */
void lcd_init_device(void)
{
lcd_cmd_and_data(R_DISPLAY_CONTROL, 0x0009);
lcd_set_flip(false);
lcd_cmd_and_data(R_ENTRY_MODE, 0x0000);
#ifdef IPOD_4G
outl(inl(0x6000d004) | 0x4, 0x6000d004); /* B02 enable */
outl(inl(0x6000d004) | 0x8, 0x6000d004); /* B03 enable */
outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */
outl(inl(0x70000080) | 0x2000000, 0x70000080); /* D01 =1 */
outl(inl(0x6000600c) | 0x20000, 0x6000600c); /* PWM enable */
#endif
}
/*** hardware configuration ***/
int lcd_default_contrast(void)
{
#if defined(IPOD_MINI) || defined(IPOD_MINI2G) || defined(IPOD_3G)
return 42;
#else
return 35;
#endif
}
/* Rockbox stores the contrast as 0..63 - we add 64 to it */
void lcd_set_contrast(int val)
{
if (val < 0) val = 0;
else if (val > 63) val = 63;
lcd_cmd_and_data(R_CONTRAST_CONTROL, 0x400 | (val + 64));
}
void lcd_set_invert_display(bool yesno)
{
if (yesno)
lcd_cmd_and_data(R_DISPLAY_CONTROL, 0x0023);
else
lcd_cmd_and_data(R_DISPLAY_CONTROL, 0x0009);
}
/* turn the display upside down (call lcd_update() afterwards) */
void lcd_set_flip(bool yesno)
{
#if defined(IPOD_MINI) || defined(IPOD_MINI2G)
if (yesno) {
/* 168x112, inverse COM order */
lcd_cmd_and_data(R_DRV_OUTPUT_CONTROL, 0x020d);
lcd_cmd_and_data(R_1ST_SCR_DRV_POS, 0x8316); /* 22..131 */
addr_offset = (22 << 5) | (20 - 4);
pix_offset = -2;
} else {
/* 168x112, inverse SEG order */
lcd_cmd_and_data(R_DRV_OUTPUT_CONTROL, 0x010d);
lcd_cmd_and_data(R_1ST_SCR_DRV_POS, 0x6d00); /* 0..109 */
addr_offset = 20;
pix_offset = 0;
}
#else
if (yesno) {
/* 168x128, inverse SEG & COM order */
lcd_cmd_and_data(R_DRV_OUTPUT_CONTROL, 0x030f);
lcd_cmd_and_data(R_1ST_SCR_DRV_POS, 0x8304); /* 4..131 */
addr_offset = (4 << 5) | (20 - 1);
} else {
/* 168x128 */
lcd_cmd_and_data(R_DRV_OUTPUT_CONTROL, 0x000f);
lcd_cmd_and_data(R_1ST_SCR_DRV_POS, 0x7f00); /* 0..127 */
addr_offset = 20;
}
#endif
}
/*** update functions ***/
/* Performance function that works with an external buffer
note that x, bwidtht and stride are in 8-pixel units! */
void lcd_blit(const unsigned char* data, int bx, int y, int bwidth,
int height, int stride)
{
const unsigned char *src, *src_end;
while (height--) {
src = data;
src_end = data + bwidth;
lcd_cmd_and_data(R_RAM_ADDR_SET, (y++ << 5) + addr_offset - bx);
lcd_prepare_cmd(R_RAM_DATA);
do {
unsigned byte = *src++;
lcd_send_data((dibits[byte>>4] << 8) | dibits[byte&0x0f]);
} while (src < src_end);
data += stride;
}
}
void lcd_update_rect(int x, int y, int width, int height)
{
int xmax, ymax;
if (x + width > LCD_WIDTH)
width = LCD_WIDTH - x;
if (width <= 0)
return;
ymax = y + height - 1;
if (ymax >= LCD_HEIGHT)
ymax = LCD_HEIGHT - 1;
#if defined(IPOD_MINI) || defined(IPOD_MINI2G)
x += pix_offset;
#endif
/* writing is done in 16-bit units (8 pixels) */
xmax = (x + width - 1) >> 3;
x >>= 3;
width = xmax - x + 1;
for (; y <= ymax; y++) {
unsigned char *data, *data_end;
lcd_cmd_and_data(R_RAM_ADDR_SET, (y << 5) + addr_offset - x);
lcd_prepare_cmd(R_RAM_DATA);
data = &lcd_framebuffer[y][2*x];
data_end = data + 2 * width;
#if defined(IPOD_MINI) || defined(IPOD_MINI2G)
if (pix_offset == -2) {
unsigned cur_word = *data++;
do {
cur_word = (cur_word << 8) | *data++;
cur_word = (cur_word << 8) | *data++;
lcd_send_data((cur_word >> 4) & 0xffff);
} while (data <= data_end);
} else
#endif
{
do {
unsigned highbyte = *data++;
lcd_send_data((highbyte << 8) | *data++);
} while (data < data_end);
}
}
}
/* Update the display. */
void lcd_update(void)
{
lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
}
#else
#define IPOD_LCD_BASE 0x70008a0c
#define IPOD_LCD_BUSY_MASK 0x80000000
@ -745,5 +499,3 @@ void lcd_update(void)
{
lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
}
#endif

View file

@ -0,0 +1,279 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Rockbox driver for iPod LCDs
*
* Based on code from the ipodlinux project - http://ipodlinux.org/
* Adapted for Rockbox in November 2005
*
* Original file: linux/arch/armnommu/mach-ipod/fb.c
*
* Copyright (c) 2003-2005 Bernard Leach (leachbj@bouncycastle.org)
*
* 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 "system.h"
/* check if number of useconds has past */
static inline bool timer_check(int clock_start, int usecs)
{
return ((int)(USEC_TIMER - clock_start)) >= usecs;
}
/*** hardware configuration ***/
#if CONFIG_CPU == PP5002
#define IPOD_LCD_BASE 0xc0001000
#define IPOD_LCD_BUSY_MASK 0x80000000
#else /* PP5020 */
#define IPOD_LCD_BASE 0x70003000
#define IPOD_LCD_BUSY_MASK 0x00008000
#endif
/* LCD command codes for HD66753 */
#define LCD_CMD 0x08
#define LCD_DATA 0x10
#define R_START_OSC 0x00
#define R_DRV_OUTPUT_CONTROL 0x01
#define R_DRV_WAVEFORM_CONTROL 0x02
#define R_POWER_CONTROL 0x03
#define R_CONTRAST_CONTROL 0x04
#define R_ENTRY_MODE 0x05
#define R_ROTATION 0x06
#define R_DISPLAY_CONTROL 0x07
#define R_CURSOR_CONTROL 0x08
#define R_HORIZONTAL_CURSOR_POS 0x0b
#define R_VERTICAL_CURSOR_POS 0x0c
#define R_1ST_SCR_DRV_POS 0x0d
#define R_2ND_SCR_DRV_POS 0x0e
#define R_RAM_WRITE_MASK 0x10
#define R_RAM_ADDR_SET 0x11
#define R_RAM_DATA 0x12
/* needed for flip */
static int addr_offset;
#if defined(IPOD_MINI) || defined(IPOD_MINI2G)
static int pix_offset;
#endif
static const unsigned char dibits[16] ICONST_ATTR = {
0x00, 0x03, 0x0C, 0x0F, 0x30, 0x33, 0x3C, 0x3F,
0xC0, 0xC3, 0xCC, 0xCF, 0xF0, 0xF3, 0xFC, 0xFF
};
/* wait for LCD with timeout */
static inline 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(unsigned data)
{
lcd_wait_write();
#ifdef IPOD_MINI2G
outl((inl(IPOD_LCD_BASE) & ~0x1f00000) | 0x1700000, IPOD_LCD_BASE);
outl(data | 0x760000, IPOD_LCD_BASE+8);
#else
outl(data >> 8, IPOD_LCD_BASE + LCD_DATA);
lcd_wait_write();
outl(data & 0xff, IPOD_LCD_BASE + LCD_DATA);
#endif
}
/* send LCD command */
static void lcd_prepare_cmd(unsigned cmd)
{
lcd_wait_write();
#ifdef IPOD_MINI2G
outl((inl(IPOD_LCD_BASE) & ~0x1f00000) | 0x1700000, IPOD_LCD_BASE);
outl(cmd | 0x740000, IPOD_LCD_BASE+8);
#else
outl(0x0, IPOD_LCD_BASE + LCD_CMD);
lcd_wait_write();
outl(cmd, IPOD_LCD_BASE + LCD_CMD);
#endif
}
/* send LCD command and data */
static void lcd_cmd_and_data(unsigned cmd, unsigned data)
{
lcd_prepare_cmd(cmd);
lcd_send_data(data);
}
/* LCD init */
void lcd_init_device(void)
{
lcd_cmd_and_data(R_DISPLAY_CONTROL, 0x0009);
lcd_set_flip(false);
lcd_cmd_and_data(R_ENTRY_MODE, 0x0000);
#ifdef IPOD_4G
outl(inl(0x6000d004) | 0x4, 0x6000d004); /* B02 enable */
outl(inl(0x6000d004) | 0x8, 0x6000d004); /* B03 enable */
outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */
outl(inl(0x70000080) | 0x2000000, 0x70000080); /* D01 =1 */
outl(inl(0x6000600c) | 0x20000, 0x6000600c); /* PWM enable */
#endif
}
/*** hardware configuration ***/
int lcd_default_contrast(void)
{
#if defined(IPOD_MINI) || defined(IPOD_MINI2G) || defined(IPOD_3G)
return 42;
#else
return 35;
#endif
}
/* Rockbox stores the contrast as 0..63 - we add 64 to it */
void lcd_set_contrast(int val)
{
if (val < 0) val = 0;
else if (val > 63) val = 63;
lcd_cmd_and_data(R_CONTRAST_CONTROL, 0x400 | (val + 64));
}
void lcd_set_invert_display(bool yesno)
{
if (yesno)
lcd_cmd_and_data(R_DISPLAY_CONTROL, 0x0023);
else
lcd_cmd_and_data(R_DISPLAY_CONTROL, 0x0009);
}
/* turn the display upside down (call lcd_update() afterwards) */
void lcd_set_flip(bool yesno)
{
#if defined(IPOD_MINI) || defined(IPOD_MINI2G)
if (yesno) {
/* 168x112, inverse COM order */
lcd_cmd_and_data(R_DRV_OUTPUT_CONTROL, 0x020d);
lcd_cmd_and_data(R_1ST_SCR_DRV_POS, 0x8316); /* 22..131 */
addr_offset = (22 << 5) | (20 - 4);
pix_offset = -2;
} else {
/* 168x112, inverse SEG order */
lcd_cmd_and_data(R_DRV_OUTPUT_CONTROL, 0x010d);
lcd_cmd_and_data(R_1ST_SCR_DRV_POS, 0x6d00); /* 0..109 */
addr_offset = 20;
pix_offset = 0;
}
#else
if (yesno) {
/* 168x128, inverse SEG & COM order */
lcd_cmd_and_data(R_DRV_OUTPUT_CONTROL, 0x030f);
lcd_cmd_and_data(R_1ST_SCR_DRV_POS, 0x8304); /* 4..131 */
addr_offset = (4 << 5) | (20 - 1);
} else {
/* 168x128 */
lcd_cmd_and_data(R_DRV_OUTPUT_CONTROL, 0x000f);
lcd_cmd_and_data(R_1ST_SCR_DRV_POS, 0x7f00); /* 0..127 */
addr_offset = 20;
}
#endif
}
/*** update functions ***/
/* Performance function that works with an external buffer
note that x, bwidtht and stride are in 8-pixel units! */
void lcd_blit(const unsigned char* data, int bx, int y, int bwidth,
int height, int stride)
{
const unsigned char *src, *src_end;
while (height--) {
src = data;
src_end = data + bwidth;
lcd_cmd_and_data(R_RAM_ADDR_SET, (y++ << 5) + addr_offset - bx);
lcd_prepare_cmd(R_RAM_DATA);
do {
unsigned byte = *src++;
lcd_send_data((dibits[byte>>4] << 8) | dibits[byte&0x0f]);
} while (src < src_end);
data += stride;
}
}
void lcd_update_rect(int x, int y, int width, int height)
{
int xmax, ymax;
if (x + width > LCD_WIDTH)
width = LCD_WIDTH - x;
if (width <= 0)
return;
ymax = y + height - 1;
if (ymax >= LCD_HEIGHT)
ymax = LCD_HEIGHT - 1;
#if defined(IPOD_MINI) || defined(IPOD_MINI2G)
x += pix_offset;
#endif
/* writing is done in 16-bit units (8 pixels) */
xmax = (x + width - 1) >> 3;
x >>= 3;
width = xmax - x + 1;
for (; y <= ymax; y++) {
unsigned char *data, *data_end;
lcd_cmd_and_data(R_RAM_ADDR_SET, (y << 5) + addr_offset - x);
lcd_prepare_cmd(R_RAM_DATA);
data = &lcd_framebuffer[y][2*x];
data_end = data + 2 * width;
#if defined(IPOD_MINI) || defined(IPOD_MINI2G)
if (pix_offset == -2) {
unsigned cur_word = *data++;
do {
cur_word = (cur_word << 8) | *data++;
cur_word = (cur_word << 8) | *data++;
lcd_send_data((cur_word >> 4) & 0xffff);
} while (data <= data_end);
} else
#endif
{
do {
unsigned highbyte = *data++;
lcd_send_data((highbyte << 8) | *data++);
} while (data < data_end);
}
}
}
/* Update the display. */
void lcd_update(void)
{
lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
}