summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-04-29 01:09:39 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-04-29 01:09:39 +0000
commitc741ecc68a5e0c709d9f93ed10866da9bd6f6465 (patch)
treee11c12f6106938a0e0ff2b5683a094b607ba4962
parenta6100fb5ee093ecc9b263c2c659c653d90eed585 (diff)
downloadrockbox-c741ecc68a5e0c709d9f93ed10866da9bd6f6465.tar.gz
rockbox-c741ecc68a5e0c709d9f93ed10866da9bd6f6465.tar.bz2
rockbox-c741ecc68a5e0c709d9f93ed10866da9bd6f6465.zip
yep.. I really cant spell
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17287 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/config-creativezvm.h2
-rw-r--r--firmware/export/config-mrobe500.h4
-rw-r--r--firmware/export/config.h4
-rw-r--r--firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c4
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c4
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c4
6 files changed, 11 insertions, 11 deletions
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h
index f5ec33317e..509bbc97a1 100644
--- a/firmware/export/config-creativezvm.h
+++ b/firmware/export/config-creativezvm.h
@@ -54,7 +54,7 @@
#define CONFIG_LCD LCD_CREATIVEZVM
/* choose the lcd orientation. both work */
-#define CONFIG_ORIENTATION SCREEN_PORTAIT
+#define CONFIG_ORIENTATION SCREEN_PORTRAIT
#define LCD_WIDTH 320
#define LCD_HEIGHT 240
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h
index c8c14acfb0..3b1f7896f5 100644
--- a/firmware/export/config-mrobe500.h
+++ b/firmware/export/config-mrobe500.h
@@ -54,10 +54,10 @@
#define CONFIG_LCD LCD_MROBE500
/* choose the lcd orientation. both work */
-/* #define CONFIG_ORIENTATION SCREEN_PORTAIT */
+/* #define CONFIG_ORIENTATION SCREEN_PORTRAIT */
#define CONFIG_ORIENTATION SCREEN_LANDSCAPE
-#if CONFIG_ORIENTATION == SCREEN_PORTAIT
+#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
#define LCD_WIDTH 480
#define LCD_HEIGHT 640
#else
diff --git a/firmware/export/config.h b/firmware/export/config.h
index f4e38ce73c..565f8950ff 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -128,7 +128,7 @@
#define RGB565SWAPPED 3553
/* CONFIG_ORIENTATION */
-#define SCREEN_PORTAIT 0
+#define SCREEN_PORTRAIT 0
#define SCREEN_LANDSCAPE 1
#define SCREEN_SQUARE 2
@@ -281,7 +281,7 @@
#ifndef CONFIG_ORIENTATION
#if LCD_HEIGHT > LCD_WIDTH
-#define CONFIG_ORIENTATION SCREEN_PORTAIT
+#define CONFIG_ORIENTATION SCREEN_PORTRAIT
#elif LCD_HEIGHT < LCD_WIDTH
#define CONFIG_ORIENTATION SCREEN_LANDSCAPE
#else
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
index a96f9c4f5f..14a9febe59 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
@@ -323,7 +323,7 @@ void lcd_update_rect(int x, int y, int width, int height)
if (height <= 0)
return; /* nothing left to do */
-#if CONFIG_ORIENTATION == SCREEN_PORTAIT
+#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
dst = (fb_data *)FRAME + LCD_WIDTH*y + x;
src = &lcd_framebuffer[y][x];
@@ -363,7 +363,7 @@ void lcd_update(void)
{
if (!display_on || direct_fb_access)
return;
-#if CONFIG_ORIENTATION == SCREEN_PORTAIT
+#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0],
LCD_WIDTH*LCD_HEIGHT, 1);
#else
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
index d1fd2eb702..0f90c755ed 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
@@ -72,7 +72,7 @@ static int touch_to_pixels(short val_x, short val_y)
{
short x,y;
-#if CONFIG_ORIENTATION == SCREEN_PORTAIT
+#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
x=val_x;
y=val_y;
#else
@@ -103,7 +103,7 @@ void button_init_device(void)
/* GIO is the power button, set as input */
IO_GIO_DIR0 |= 0x01;
-#if CONFIG_ORIENTATION == SCREEN_PORTAIT
+#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
topleft.val_x = 200;
topleft.val_y = 3900;
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
index 241b82983c..52eb823896 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
@@ -101,7 +101,7 @@ void lcd_update_rect(int x, int y, int width, int height)
if (height <= 0)
return; /* nothing left to do */
-#if CONFIG_ORIENTATION == SCREEN_PORTAIT
+#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
dst = (fb_data *)FRAME + LCD_WIDTH*y + x;
src = &lcd_framebuffer[y][x];
@@ -146,7 +146,7 @@ void lcd_update(void)
{
if (!lcd_on)
return;
-#if CONFIG_ORIENTATION == SCREEN_PORTAIT
+#if CONFIG_ORIENTATION == SCREEN_PORTRAIT
lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0],
LCD_WIDTH*LCD_HEIGHT, 1);
#else