From 1ccb7f46608dd4da5abf92afbfa7c7daa8c62c47 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Fri, 5 Oct 2012 09:20:39 +0200
Subject: rename of orientation

---
 drivers/gdisp/S6D1121/gdisp_lld.c     | 10 +++++-----
 drivers/gdisp/S6D1121/s6d1121_lld.c.h | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'drivers/gdisp/S6D1121')

diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c
index 76fe941f..090042b7 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld.c
@@ -180,7 +180,7 @@ bool_t GDISP_LLD(init)(void) {
 	/* Now initialise the GDISP structure */
 	GDISP.Width = SCREEN_WIDTH;
 	GDISP.Height = SCREEN_HEIGHT;
-	GDISP.Orientation = portrait;
+	GDISP.Orientation = GDISP_ROTATE_0;
 	GDISP.Powermode = powerOn;
 	GDISP.Backlight = 100;
 	GDISP.Contrast = 50;
@@ -456,25 +456,25 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 			if (GDISP.Orientation == (gdisp_orientation_t)value)
 				return;
 			switch((gdisp_orientation_t)value) {
-			case portrait:
+			case GDISP_ROTATE_0:
 				lld_lcdWriteReg(0x0001,0x0127);
 				lld_lcdWriteReg(0x03, 0b0011);
 				GDISP.Height = SCREEN_HEIGHT;
 				GDISP.Width = SCREEN_WIDTH;
 				break;
-			case landscape:
+			case GDISP_ROTATE_90:
 				lld_lcdWriteReg(0x0001,0x0027);
 				lld_lcdWriteReg(0x0003, 0b1011);
 				GDISP.Height = SCREEN_WIDTH;
 				GDISP.Width = SCREEN_HEIGHT;
 				break;
-			case portraitInv:
+			case GDISP_ROTATE_180:
 				lld_lcdWriteReg(0x0001,0x0127);
 				lld_lcdWriteReg(0x0003, 0b0000);
 				GDISP.Height = SCREEN_HEIGHT;
 				GDISP.Width = SCREEN_WIDTH;
 				break;
-			case landscapeInv:
+			case GDISP_ROTATE_270:
 				lld_lcdWriteReg(0x0001,0x0027);
 				lld_lcdWriteReg(0x0003, 0b1000);
 				GDISP.Height = SCREEN_WIDTH;
diff --git a/drivers/gdisp/S6D1121/s6d1121_lld.c.h b/drivers/gdisp/S6D1121/s6d1121_lld.c.h
index 1d7ede61..e5d8c76b 100644
--- a/drivers/gdisp/S6D1121/s6d1121_lld.c.h
+++ b/drivers/gdisp/S6D1121/s6d1121_lld.c.h
@@ -182,19 +182,19 @@ static void lld_lcdSetCursor(coord_t x, coord_t y) {
 	 * R21h - 9 bit
 	 */
 	switch(GDISP.Orientation) {
-		case portraitInv:
+		case GDISP_ROTATE_180:
 			lld_lcdWriteReg(0x0020, (SCREEN_WIDTH-1-x) & 0x00FF);
 			lld_lcdWriteReg(0x0021, (SCREEN_HEIGHT-1-y) & 0x01FF);
 			break;
-		case portrait:
+		case GDISP_ROTATE_0:
 			lld_lcdWriteReg(0x0020, x & 0x00FF);
 			lld_lcdWriteReg(0x0021, y & 0x01FF);
 			break;
-		case landscape:
+		case GDISP_ROTATE_90:
 			lld_lcdWriteReg(0x0020, y & 0x00FF);
 			lld_lcdWriteReg(0x0021, x & 0x01FF);
 			break;
-		case landscapeInv:
+		case GDISP_ROTATE_270:
 			lld_lcdWriteReg(0x0020, (SCREEN_WIDTH - y - 1) & 0x00FF);
 			lld_lcdWriteReg(0x0021, (SCREEN_HEIGHT - x - 1) & 0x01FF);
 			break;
@@ -208,22 +208,22 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy)
 	 */
 
 	switch(GDISP.Orientation) {
-		case portrait:
+		case GDISP_ROTATE_0:
 			lld_lcdWriteReg(0x46, (((x+cx-1) << 8) & 0xFF00 ) | (x & 0x00FF));
 			lld_lcdWriteReg(0x48, y & 0x01FF);
 			lld_lcdWriteReg(0x47, (y+cy-1) & 0x01FF);
 			break;
-		case landscape:
+		case GDISP_ROTATE_90:
 			lld_lcdWriteReg(0x46, (((x+cx-1) << 8) & 0xFF00) | ((y+cy) & 0x00FF));
 			lld_lcdWriteReg(0x48, x & 0x01FF);
 			lld_lcdWriteReg(0x47, (x+cx-1) & 0x01FF);
 			break;
-		case portraitInv:
+		case GDISP_ROTATE_180:
 			lld_lcdWriteReg(0x46, (((SCREEN_WIDTH-x-1) & 0x00FF) << 8) | ((SCREEN_WIDTH - (x+cx)) & 0x00FF));
 			lld_lcdWriteReg(0x48, (SCREEN_HEIGHT-(y+cy)) & 0x01FF);
 			lld_lcdWriteReg(0x47, (SCREEN_HEIGHT-y-1) & 0x01FF);
 			break;
-		case landscapeInv:
+		case GDISP_ROTATE_270:
 			lld_lcdWriteReg(0x46, (((SCREEN_WIDTH - y - 1) & 0x00FF) << 8) | ((SCREEN_WIDTH - (y+cy)) & 0x00FF));
 			lld_lcdWriteReg(0x48, (SCREEN_HEIGHT - (x+cx)) & 0x01FF);
 			lld_lcdWriteReg(0x47, (SCREEN_HEIGHT - x - 1) & 0x01FF);
@@ -235,12 +235,12 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy)
 
 static void lld_lcdResetViewPort(void) {
 	switch(GDISP.Orientation) {
-		case portrait:
-		case portraitInv:
+		case GDISP_ROTATE_0:
+		case GDISP_ROTATE_180:
 			lld_lcdSetViewPort(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
 			break;
-		case landscape:
-		case landscapeInv:
+		case GDISP_ROTATE_90:
+		case GDISP_ROTATE_270:
 			lld_lcdSetViewPort(0, 0, SCREEN_HEIGHT, SCREEN_WIDTH);
 			break;
 	}
-- 
cgit v1.2.3