yep.. I really cant spell
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17287 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
a6100fb5ee
commit
c741ecc68a
6 changed files with 11 additions and 11 deletions
|
@ -54,7 +54,7 @@
|
||||||
#define CONFIG_LCD LCD_CREATIVEZVM
|
#define CONFIG_LCD LCD_CREATIVEZVM
|
||||||
|
|
||||||
/* choose the lcd orientation. both work */
|
/* choose the lcd orientation. both work */
|
||||||
#define CONFIG_ORIENTATION SCREEN_PORTAIT
|
#define CONFIG_ORIENTATION SCREEN_PORTRAIT
|
||||||
|
|
||||||
#define LCD_WIDTH 320
|
#define LCD_WIDTH 320
|
||||||
#define LCD_HEIGHT 240
|
#define LCD_HEIGHT 240
|
||||||
|
|
|
@ -54,10 +54,10 @@
|
||||||
#define CONFIG_LCD LCD_MROBE500
|
#define CONFIG_LCD LCD_MROBE500
|
||||||
|
|
||||||
/* choose the lcd orientation. both work */
|
/* choose the lcd orientation. both work */
|
||||||
/* #define CONFIG_ORIENTATION SCREEN_PORTAIT */
|
/* #define CONFIG_ORIENTATION SCREEN_PORTRAIT */
|
||||||
#define CONFIG_ORIENTATION SCREEN_LANDSCAPE
|
#define CONFIG_ORIENTATION SCREEN_LANDSCAPE
|
||||||
|
|
||||||
#if CONFIG_ORIENTATION == SCREEN_PORTAIT
|
#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
|
||||||
#define LCD_WIDTH 480
|
#define LCD_WIDTH 480
|
||||||
#define LCD_HEIGHT 640
|
#define LCD_HEIGHT 640
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -128,7 +128,7 @@
|
||||||
#define RGB565SWAPPED 3553
|
#define RGB565SWAPPED 3553
|
||||||
|
|
||||||
/* CONFIG_ORIENTATION */
|
/* CONFIG_ORIENTATION */
|
||||||
#define SCREEN_PORTAIT 0
|
#define SCREEN_PORTRAIT 0
|
||||||
#define SCREEN_LANDSCAPE 1
|
#define SCREEN_LANDSCAPE 1
|
||||||
#define SCREEN_SQUARE 2
|
#define SCREEN_SQUARE 2
|
||||||
|
|
||||||
|
@ -281,7 +281,7 @@
|
||||||
|
|
||||||
#ifndef CONFIG_ORIENTATION
|
#ifndef CONFIG_ORIENTATION
|
||||||
#if LCD_HEIGHT > LCD_WIDTH
|
#if LCD_HEIGHT > LCD_WIDTH
|
||||||
#define CONFIG_ORIENTATION SCREEN_PORTAIT
|
#define CONFIG_ORIENTATION SCREEN_PORTRAIT
|
||||||
#elif LCD_HEIGHT < LCD_WIDTH
|
#elif LCD_HEIGHT < LCD_WIDTH
|
||||||
#define CONFIG_ORIENTATION SCREEN_LANDSCAPE
|
#define CONFIG_ORIENTATION SCREEN_LANDSCAPE
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -323,7 +323,7 @@ void lcd_update_rect(int x, int y, int width, int height)
|
||||||
if (height <= 0)
|
if (height <= 0)
|
||||||
return; /* nothing left to do */
|
return; /* nothing left to do */
|
||||||
|
|
||||||
#if CONFIG_ORIENTATION == SCREEN_PORTAIT
|
#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
|
||||||
dst = (fb_data *)FRAME + LCD_WIDTH*y + x;
|
dst = (fb_data *)FRAME + LCD_WIDTH*y + x;
|
||||||
src = &lcd_framebuffer[y][x];
|
src = &lcd_framebuffer[y][x];
|
||||||
|
|
||||||
|
@ -363,7 +363,7 @@ void lcd_update(void)
|
||||||
{
|
{
|
||||||
if (!display_on || direct_fb_access)
|
if (!display_on || direct_fb_access)
|
||||||
return;
|
return;
|
||||||
#if CONFIG_ORIENTATION == SCREEN_PORTAIT
|
#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
|
||||||
lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0],
|
lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0],
|
||||||
LCD_WIDTH*LCD_HEIGHT, 1);
|
LCD_WIDTH*LCD_HEIGHT, 1);
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -72,7 +72,7 @@ static int touch_to_pixels(short val_x, short val_y)
|
||||||
{
|
{
|
||||||
short x,y;
|
short x,y;
|
||||||
|
|
||||||
#if CONFIG_ORIENTATION == SCREEN_PORTAIT
|
#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
|
||||||
x=val_x;
|
x=val_x;
|
||||||
y=val_y;
|
y=val_y;
|
||||||
#else
|
#else
|
||||||
|
@ -103,7 +103,7 @@ void button_init_device(void)
|
||||||
/* GIO is the power button, set as input */
|
/* GIO is the power button, set as input */
|
||||||
IO_GIO_DIR0 |= 0x01;
|
IO_GIO_DIR0 |= 0x01;
|
||||||
|
|
||||||
#if CONFIG_ORIENTATION == SCREEN_PORTAIT
|
#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
|
||||||
topleft.val_x = 200;
|
topleft.val_x = 200;
|
||||||
topleft.val_y = 3900;
|
topleft.val_y = 3900;
|
||||||
|
|
||||||
|
|
|
@ -101,7 +101,7 @@ void lcd_update_rect(int x, int y, int width, int height)
|
||||||
if (height <= 0)
|
if (height <= 0)
|
||||||
return; /* nothing left to do */
|
return; /* nothing left to do */
|
||||||
|
|
||||||
#if CONFIG_ORIENTATION == SCREEN_PORTAIT
|
#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
|
||||||
dst = (fb_data *)FRAME + LCD_WIDTH*y + x;
|
dst = (fb_data *)FRAME + LCD_WIDTH*y + x;
|
||||||
src = &lcd_framebuffer[y][x];
|
src = &lcd_framebuffer[y][x];
|
||||||
|
|
||||||
|
@ -146,7 +146,7 @@ void lcd_update(void)
|
||||||
{
|
{
|
||||||
if (!lcd_on)
|
if (!lcd_on)
|
||||||
return;
|
return;
|
||||||
#if CONFIG_ORIENTATION == SCREEN_PORTAIT
|
#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
|
||||||
lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0],
|
lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0],
|
||||||
LCD_WIDTH*LCD_HEIGHT, 1);
|
LCD_WIDTH*LCD_HEIGHT, 1);
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in a new issue