From 91647264f8b05bf0fe5c58926a2e886b5fd85fe6 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Fri, 19 Mar 2010 15:13:29 +0000 Subject: lcd-ssd1303 (all Clips) : move model specific code in their own files git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25248 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 11 +- firmware/target/arm/as3525/lcd-ssd1303.c | 295 ++++++++++++++ firmware/target/arm/as3525/sansa-clip/lcd-clip.c | 89 ++++ firmware/target/arm/as3525/sansa-clip/lcd-clip.h | 28 ++ .../target/arm/as3525/sansa-clip/lcd-ssd1303.c | 447 --------------------- .../arm/as3525/sansa-clipplus/lcd-clip-plus.c | 66 +++ .../target/arm/as3525/sansa-clipplus/lcd-clip.h | 26 ++ firmware/target/arm/as3525/sansa-clipv2/lcd-clip.h | 26 ++ .../target/arm/as3525/sansa-clipv2/lcd-clipv2.c | 85 ++++ 9 files changed, 622 insertions(+), 451 deletions(-) create mode 100644 firmware/target/arm/as3525/lcd-ssd1303.c create mode 100644 firmware/target/arm/as3525/sansa-clip/lcd-clip.c create mode 100644 firmware/target/arm/as3525/sansa-clip/lcd-clip.h delete mode 100644 firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c create mode 100644 firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c create mode 100644 firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h create mode 100644 firmware/target/arm/as3525/sansa-clipv2/lcd-clip.h create mode 100644 firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c diff --git a/firmware/SOURCES b/firmware/SOURCES index c347ad7903..5ecad19bba 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1208,7 +1208,8 @@ target/arm/tcc77x/c100/audio-c100.c #ifdef SANSA_CLIPPLUS #ifndef SIMULATOR -target/arm/as3525/sansa-clip/lcd-ssd1303.c +target/arm/as3525/lcd-ssd1303.c +target/arm/as3525/sansa-clipplus/lcd-clip-plus.c target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S target/arm/as3525/sansa-clipplus/button-clip.c target/arm/as3525/sansa-clipplus/backlight-clip.c @@ -1221,8 +1222,9 @@ target/arm/as3525/sansa-clip/powermgmt-clip.c #ifdef SANSA_CLIPV2 #ifndef SIMULATOR -target/arm/as3525/sansa-clip/lcd-ssd1303.c -target/arm/as3525/sansa-clip/lcd-as-clip.S +target/arm/as3525/lcd-ssd1303.c +target/arm/as3525/sansa-clipv2/lcd-clipv2.c +target/arm/as3525/sansa-clip/lcd-as-clip.S /* TODO for clipv2 */ target/arm/as3525/sansa-clipv2/button-clip.c target/arm/as3525/sansa-clipv2/backlight-clip.c #ifndef BOOTLOADER @@ -1234,7 +1236,8 @@ target/arm/as3525/sansa-clip/powermgmt-clip.c #ifdef SANSA_CLIP #ifndef SIMULATOR -target/arm/as3525/sansa-clip/lcd-ssd1303.c +target/arm/as3525/lcd-ssd1303.c +target/arm/as3525/sansa-clip/lcd-clip.c target/arm/as3525/sansa-clip/lcd-as-clip.S target/arm/as3525/sansa-clip/button-clip.c target/arm/as3525/sansa-clip/backlight-clip.c diff --git a/firmware/target/arm/as3525/lcd-ssd1303.c b/firmware/target/arm/as3525/lcd-ssd1303.c new file mode 100644 index 0000000000..e4437e70ca --- /dev/null +++ b/firmware/target/arm/as3525/lcd-ssd1303.c @@ -0,0 +1,295 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Alan Korr + * Copyright (C) 2008 François Dinel + * Copyright (C) 2008-2009 Rafaël Carré + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" + +#include "kernel.h" +#include "lcd.h" +#include "system.h" +#include "cpu.h" +#include "string.h" + +#include "lcd-clip.h" + +/*** definitions ***/ + +#define LCD_SET_LOWER_COLUMN_ADDRESS ((char)0x00) +#define LCD_SET_HIGHER_COLUMN_ADDRESS ((char)0x10) +#define LCD_SET_DISPLAY_START_LINE ((char)0x40) +#define LCD_SET_CONTRAST_CONTROL_REGISTER ((char)0x81) +#define LCD_SET_SEGMENT_REMAP ((char)0xA0) +#define LCD_SET_SEGMENT_REMAP_INV ((char)0xA1) +#define LCD_SET_ENTIRE_DISPLAY_OFF ((char)0xA4) +#define LCD_SET_ENTIRE_DISPLAY_ON ((char)0xA5) +#define LCD_SET_NORMAL_DISPLAY ((char)0xA6) +#define LCD_SET_REVERSE_DISPLAY ((char)0xA7) +#define LCD_SET_MULTIPLEX_RATIO ((char)0xA8) +#define LCD_SET_DC_DC ((char)0xAD) +#define LCD_SET_DC_DC_PART2 ((char)0x8A) +#define LCD_SET_DISPLAY_OFF ((char)0xAE) +#define LCD_SET_DISPLAY_ON ((char)0xAF) +#define LCD_SET_PAGE_ADDRESS ((char)0xB0) +#define LCD_SET_COM_OUTPUT_SCAN_DIRECTION ((char)0xC0) +#define LCD_SET_COM_OUTPUT_SCAN_DIRECTION_INV ((char)0xC8) +#define LCD_SET_DISPLAY_CLOCK_AND_OSC_FREQ ((char)0xD5) +#define LCD_SET_VCOM_DESELECT_LEVEL ((char)0xDB) +#define LCD_SET_PRECHARGE_PERIOD ((char)0xD9) +#define LCD_NOP ((char)0xE3) + +/* LCD command codes */ +#define LCD_CNTL_CONTRAST 0x81 /* Contrast */ +#define LCD_CNTL_OUTSCAN 0xc8 /* Output scan direction */ +#define LCD_CNTL_SEGREMAP 0xa1 /* Segment remap */ +#define LCD_CNTL_DISPON 0xaf /* Display on */ + +#define LCD_CNTL_PAGE 0xb0 /* Page address */ +#define LCD_CNTL_HIGHCOL 0x10 /* Upper column address */ +#define LCD_CNTL_LOWCOL 0x00 /* Lower column address */ + +/** globals **/ + +static bool display_on; /* used by lcd_enable */ + +/*** hardware configuration ***/ + +int lcd_default_contrast(void) +{ + return DEFAULT_CONTRAST_SETTING; +} + +void lcd_set_contrast(int val) +{ + lcd_write_command(LCD_CNTL_CONTRAST); + lcd_write_command(val); +} + +void lcd_set_invert_display(bool yesno) +{ + if (yesno) + lcd_write_command(LCD_SET_REVERSE_DISPLAY); + else + lcd_write_command(LCD_SET_NORMAL_DISPLAY); +} + +/* turn the display upside down (call lcd_update() afterwards) */ +void lcd_set_flip(bool yesno) +{ + if (yesno) + { + lcd_write_command(LCD_SET_SEGMENT_REMAP); + lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION); + } + else + { + lcd_write_command(LCD_SET_SEGMENT_REMAP_INV); + lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION_INV); + } +} + +#ifdef HAVE_LCD_ENABLE +void lcd_enable(bool enable) +{ + if(display_on == enable) + return; + + if( (display_on = enable) ) /* simple '=' is not a typo ! */ + { + lcd_enable_power(enable); + lcd_write_command(LCD_SET_DISPLAY_ON); + send_event(LCD_EVENT_ACTIVATION, NULL); + } + else + { + lcd_write_command(LCD_SET_DISPLAY_OFF); + lcd_enable_power(enable); + } +} + +bool lcd_active(void) +{ + return display_on; +} + +#endif + +/* LCD init, largely based on what OF does */ +void lcd_init_device(void) +{ + int i; +#define LCD_FULLSCREEN (128+4) + fb_data p_bytes[LCD_FULLSCREEN]; /* framebuffer used to clear the screen */ + + lcd_hw_init(); + + /* Set display clock (divide ratio = 1) and oscillator frequency (1) */ + lcd_write_command(LCD_SET_DISPLAY_CLOCK_AND_OSC_FREQ); + lcd_write_command(0x10); + + /* Set VCOM deselect level to 0.76V */ + lcd_write_command(LCD_SET_VCOM_DESELECT_LEVEL); + lcd_write_command(0x34); + + /* Set pre-charge period (p1period is 2 dclk and p2period is 5 dclk) */ + lcd_write_command(LCD_SET_PRECHARGE_PERIOD); + lcd_write_command(0x25); + + /* Set contrast register to 12% */ + lcd_set_contrast(lcd_default_contrast()); + + /* Disable DC-DC */ + lcd_write_command(LCD_SET_DC_DC); + lcd_write_command(LCD_SET_DC_DC_PART2/*|0*/); + + /* Set starting line as 0 */ + lcd_write_command(LCD_SET_DISPLAY_START_LINE /*|(0 & 0x3f)*/); + + /* Column 131 is remapped to SEG0 */ + lcd_write_command(LCD_SET_SEGMENT_REMAP_INV); + + /* Invert COM scan direction (N-1 to 0) */ + lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION_INV); + + /* Set normal display mode (not every pixel ON) */ + lcd_write_command(LCD_SET_ENTIRE_DISPLAY_OFF); + + /* Set normal display mode (not inverted) */ + lcd_write_command(LCD_SET_NORMAL_DISPLAY); + + /* Clear whole framebuffer, including "overscan" + * We don't need to handle that out of screen columns in lcd_clear_display() + * since we will never write into it anymore + */ + lcd_write_command (LCD_SET_HIGHER_COLUMN_ADDRESS /*| 0*/); + lcd_write_command (LCD_SET_LOWER_COLUMN_ADDRESS /*| 0*/); + + memset(p_bytes, 0, sizeof(p_bytes)); /* fills with 0 : pixel off */ + + for(i = 0; i < 8; i++) + { + lcd_write_command (LCD_SET_PAGE_ADDRESS | (i /*& 0xf*/)); + lcd_write_data(p_bytes, LCD_FULLSCREEN /* overscan */); + } + + lcd_enable(true); + + lcd_update(); +} + +/*** Update functions ***/ + +/* Performance function that works with an external buffer + note that by and bheight are in 8-pixel units! */ +void lcd_blit_mono(const unsigned char *data, int x, int by, int width, + int bheight, int stride) +{ + if(!display_on) + return; + + /* Copy display bitmap to hardware */ + while (bheight--) + { + lcd_write_command (LCD_CNTL_PAGE | (by++ & 0xf)); + lcd_write_command (LCD_CNTL_HIGHCOL | (((x+2)>>4) & 0xf)); + lcd_write_command (LCD_CNTL_LOWCOL | ((x+2) & 0xf)); + + lcd_write_data(data, width); + data += stride; + } +} + +/* Helper function for lcd_grey_phase_blit(). */ +void lcd_grey_data(unsigned char *values, unsigned char *phases, int count); + +/* Performance function that works with an external buffer + note that by and bheight are in 8-pixel units! */ +void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases, + int x, int by, int width, int bheight, int stride) +{ + if(!display_on) + return; + + stride <<= 3; /* 8 pixels per block */ + /* Copy display bitmap to hardware */ + while (bheight--) + { + lcd_write_command (LCD_CNTL_PAGE | (by++ & 0xf)); + lcd_write_command (LCD_CNTL_HIGHCOL | (((x+2)>>4) & 0xf)); + lcd_write_command (LCD_CNTL_LOWCOL | ((x+2) & 0xf)); + + lcd_grey_data(values, phases, width); + + values += stride; + phases += 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; + + if(!display_on) + return; + + /* Copy display bitmap to hardware */ + for (y = 0; y < LCD_FBHEIGHT; y++) + { + lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); + lcd_write_command (LCD_CNTL_HIGHCOL | ((2 >> 4) & 0xf)); + lcd_write_command (LCD_CNTL_LOWCOL | (2 & 0xf)); + + 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; + + if(!display_on) + return; + + /* The Y coordinates have to work on even 8 pixel rows */ + ymax = (y + height-1) >> 3; + y >>= 3; + + 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_FBHEIGHT) + ymax = LCD_FBHEIGHT-1; + + /* Copy specified rectange bitmap to hardware */ + for (; y <= ymax; y++) + { + lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); + lcd_write_command (LCD_CNTL_HIGHCOL | (((x+2) >> 4) & 0xf)); + lcd_write_command (LCD_CNTL_LOWCOL | ((x+2) & 0xf)); + + lcd_write_data (&lcd_framebuffer[y][x], width); + } +} diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-clip.c b/firmware/target/arm/as3525/sansa-clip/lcd-clip.c new file mode 100644 index 0000000000..9df006ac69 --- /dev/null +++ b/firmware/target/arm/as3525/sansa-clip/lcd-clip.c @@ -0,0 +1,89 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 François Dinel + * Copyright (C) 2008-2009 Rafaël Carré + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" + +#include "lcd.h" +#include "system.h" +#include "cpu.h" + +void lcd_hw_init(void) +{ +/* DBOP initialisation, do what OF does */ + CGU_DBOP = (1<<3) | AS3525_DBOP_DIV; + + GPIOB_AFSEL = 0x08; /* DBOP on pin 3 */ + GPIOC_AFSEL = 0x0f; /* DBOP on pins 3:0 */ + + DBOP_CTRL = 0x51008; + DBOP_TIMPOL_01 = 0x6E167; + DBOP_TIMPOL_23 = 0xA167E06F; + + GPIOA_DIR |= 0x33; /* pins 5:4 and 1:0 out */ + GPIOB_DIR |= 0x40; /* pin 6 out */ + + GPIOA_PIN(1) = (1<<1); + GPIOA_PIN(0) = (1<<0); + GPIOA_PIN(4) = 0; + GPIOB_PIN(6) = (1<<6); +} + +#define LCD_DELAY 1 + +void lcd_write_command(int byte) +{ + volatile int i = 0; + while(i ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008-2009 Rafaël Carré + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "ascodec.h" + +void lcd_hw_init(void); +static inline void lcd_enable_power(bool onoff) +{ + ascodec_write(AS3514_DCDC15, onoff ? 1 : 0); +} diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c deleted file mode 100644 index dba5b9c3d7..0000000000 --- a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c +++ /dev/null @@ -1,447 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Alan Korr - * Copyright (C) 2008 François Dinel - * Copyright (C) 2008-2009 Rafaël Carré - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "config.h" - -#include "hwcompat.h" -#include "kernel.h" -#include "lcd.h" -#include "system.h" -#include "cpu.h" -#include "string.h" - -/*** AS3525 specifics ***/ -#ifdef SANSA_CLIPV2 -#include "as3525v2.h" -#else -#include "as3525.h" -#endif - -#include "ascodec.h" - -/*** definitions ***/ - -#define LCD_SET_LOWER_COLUMN_ADDRESS ((char)0x00) -#define LCD_SET_HIGHER_COLUMN_ADDRESS ((char)0x10) -#define LCD_SET_DISPLAY_START_LINE ((char)0x40) -#define LCD_SET_CONTRAST_CONTROL_REGISTER ((char)0x81) -#define LCD_SET_SEGMENT_REMAP ((char)0xA0) -#define LCD_SET_SEGMENT_REMAP_INV ((char)0xA1) -#define LCD_SET_ENTIRE_DISPLAY_OFF ((char)0xA4) -#define LCD_SET_ENTIRE_DISPLAY_ON ((char)0xA5) -#define LCD_SET_NORMAL_DISPLAY ((char)0xA6) -#define LCD_SET_REVERSE_DISPLAY ((char)0xA7) -#define LCD_SET_MULTIPLEX_RATIO ((char)0xA8) -#define LCD_SET_DC_DC ((char)0xAD) -#define LCD_SET_DC_DC_PART2 ((char)0x8A) -#define LCD_SET_DISPLAY_OFF ((char)0xAE) -#define LCD_SET_DISPLAY_ON ((char)0xAF) -#define LCD_SET_PAGE_ADDRESS ((char)0xB0) -#define LCD_SET_COM_OUTPUT_SCAN_DIRECTION ((char)0xC0) -#define LCD_SET_COM_OUTPUT_SCAN_DIRECTION_INV ((char)0xC8) -#define LCD_SET_DISPLAY_CLOCK_AND_OSC_FREQ ((char)0xD5) -#define LCD_SET_VCOM_DESELECT_LEVEL ((char)0xDB) -#define LCD_SET_PRECHARGE_PERIOD ((char)0xD9) -#define LCD_NOP ((char)0xE3) - -/* LCD command codes */ -#define LCD_CNTL_CONTRAST 0x81 /* Contrast */ -#define LCD_CNTL_OUTSCAN 0xc8 /* Output scan direction */ -#define LCD_CNTL_SEGREMAP 0xa1 /* Segment remap */ -#define LCD_CNTL_DISPON 0xaf /* Display on */ - -#define LCD_CNTL_PAGE 0xb0 /* Page address */ -#define LCD_CNTL_HIGHCOL 0x10 /* Upper column address */ -#define LCD_CNTL_LOWCOL 0x00 /* Lower column address */ - - -static void lcd_hw_init(void) -{ -#if defined(SANSA_CLIP) -/* DBOP initialisation, do what OF does */ - CGU_DBOP = (1<<3) | AS3525_DBOP_DIV; - - GPIOB_AFSEL = 0x08; /* DBOP on pin 3 */ - GPIOC_AFSEL = 0x0f; /* DBOP on pins 3:0 */ - - DBOP_CTRL = 0x51008; - DBOP_TIMPOL_01 = 0x6E167; - DBOP_TIMPOL_23 = 0xA167E06F; -#elif defined(SANSA_CLIPV2) -/* DBOP initialisation, do what OF does */ - CCU_IO |= (1<<12); /* ?? */ - CGU_DBOP |= /*(1<<3)*/ 0x18 | AS3525_DBOP_DIV; - - DBOP_CTRL = 0x51004; - DBOP_TIMPOL_01 = 0x36A12F; - DBOP_TIMPOL_23 = 0xE037E037; -#elif defined(SANSA_CLIPPLUS) - CGU_PERI |= CGU_SSP_CLOCK_ENABLE; - - SSP_CPSR = AS3525_SSP_PRESCALER; /* OF = 0x10 */ - SSP_CR0 = (1<<7) | (1<<6) | 7; /* Motorola SPI frame format, 8 bits */ - SSP_CR1 = (1<<3) | (1<<1); /* SSP Operation enabled */ - SSP_IMSC = 0; /* No interrupts */ -#endif -} - -#ifdef SANSA_CLIP -#define LCD_DELAY 1 -#else /* SANSA_CLIPV2 */ -#define LCD_DELAY 10 -#endif - -#if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) -void lcd_write_command(int byte) -{ - volatile int i = 0; - while(i>4) & 0xf)); - lcd_write_command (LCD_CNTL_LOWCOL | ((x+2) & 0xf)); - - lcd_write_data(data, width); - data += stride; - } -} - -/* Helper function for lcd_grey_phase_blit(). */ -void lcd_grey_data(unsigned char *values, unsigned char *phases, int count); - -/* Performance function that works with an external buffer - note that by and bheight are in 8-pixel units! */ -void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases, - int x, int by, int width, int bheight, int stride) -{ - if(!display_on) - return; - - stride <<= 3; /* 8 pixels per block */ - /* Copy display bitmap to hardware */ - while (bheight--) - { - lcd_write_command (LCD_CNTL_PAGE | (by++ & 0xf)); - lcd_write_command (LCD_CNTL_HIGHCOL | (((x+2)>>4) & 0xf)); - lcd_write_command (LCD_CNTL_LOWCOL | ((x+2) & 0xf)); - - lcd_grey_data(values, phases, width); - - values += stride; - phases += 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; - - if(!display_on) - return; - - /* Copy display bitmap to hardware */ - for (y = 0; y < LCD_FBHEIGHT; y++) - { - lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); - lcd_write_command (LCD_CNTL_HIGHCOL | ((2 >> 4) & 0xf)); - lcd_write_command (LCD_CNTL_LOWCOL | (2 & 0xf)); - - 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; - - if(!display_on) - return; - - /* The Y coordinates have to work on even 8 pixel rows */ - ymax = (y + height-1) >> 3; - y >>= 3; - - 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_FBHEIGHT) - ymax = LCD_FBHEIGHT-1; - - /* Copy specified rectange bitmap to hardware */ - for (; y <= ymax; y++) - { - lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); - lcd_write_command (LCD_CNTL_HIGHCOL | (((x+2) >> 4) & 0xf)); - lcd_write_command (LCD_CNTL_LOWCOL | ((x+2) & 0xf)); - - lcd_write_data (&lcd_framebuffer[y][x], width); - } -} diff --git a/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c new file mode 100644 index 0000000000..66e4de98ed --- /dev/null +++ b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c @@ -0,0 +1,66 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 François Dinel + * Copyright (C) 2008-2009 Rafaël Carré + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" + +#include "lcd.h" +#include "system.h" +#include "cpu.h" + +void lcd_hw_init(void) +{ + CGU_PERI |= CGU_SSP_CLOCK_ENABLE; + + SSP_CPSR = AS3525_SSP_PRESCALER; /* OF = 0x10 */ + SSP_CR0 = (1<<7) | (1<<6) | 7; /* Motorola SPI frame format, 8 bits */ + SSP_CR1 = (1<<3) | (1<<1); /* SSP Operation enabled */ + SSP_IMSC = 0; /* No interrupts */ + + GPIOA_DIR |= (1<<5); + GPIOB_DIR |= (1<<2) | (1<<7); + GPIOB_PIN(7) = 0; + GPIOA_PIN(5) = (1<<5); +} + +void lcd_write_command(int byte) +{ + while(SSP_SR & (1<<4)) /* BSY flag */ + ; + + GPIOB_PIN(2) = 0; + SSP_DATA = byte; + + while(SSP_SR & (1<<4)) /* BSY flag */ + ; +} + +void lcd_write_data(const fb_data* p_bytes, int count) +{ + GPIOB_PIN(2) = (1<<2); + + while (count--) + { + while(!(SSP_SR & (1<<1))) /* wait until transmit FIFO is not full */ + ; + + SSP_DATA = *p_bytes++; + } +} diff --git a/firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h new file mode 100644 index 0000000000..753759638e --- /dev/null +++ b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h @@ -0,0 +1,26 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008-2009 Rafaël Carré + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +void lcd_hw_init(void); +static inline void lcd_enable_power(bool onoff) +{ + (void) onoff; +} diff --git a/firmware/target/arm/as3525/sansa-clipv2/lcd-clip.h b/firmware/target/arm/as3525/sansa-clipv2/lcd-clip.h new file mode 100644 index 0000000000..753759638e --- /dev/null +++ b/firmware/target/arm/as3525/sansa-clipv2/lcd-clip.h @@ -0,0 +1,26 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008-2009 Rafaël Carré + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +void lcd_hw_init(void); +static inline void lcd_enable_power(bool onoff) +{ + (void) onoff; +} diff --git a/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c new file mode 100644 index 0000000000..e405036b63 --- /dev/null +++ b/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c @@ -0,0 +1,85 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 François Dinel + * Copyright (C) 2008-2009 Rafaël Carré + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" + +#include "lcd.h" +#include "system.h" +#include "cpu.h" + +void lcd_hw_init(void) +{ +/* DBOP initialisation, do what OF does */ + CCU_IO |= (1<<12); /* ?? */ + CGU_DBOP |= /*(1<<3)*/ 0x18 | AS3525_DBOP_DIV; + + DBOP_CTRL = 0x51004; + DBOP_TIMPOL_01 = 0x36A12F; + DBOP_TIMPOL_23 = 0xE037E037; + + GPIOB_DIR |= (1<<2)|(1<<5); + GPIOB_PIN(5) = (1<<5); +} + +#define LCD_DELAY 10 + +void lcd_write_command(int byte) +{ + volatile int i = 0; + while(i