From cf1a759ad6bcd51066036e40e91c617b91f1beba Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Thu, 11 Oct 2012 01:41:18 +0200
Subject: SCREEN_WIDTH and SCREEN_HEIGHT renamed to GDISP_SCREEN_WIDTH and
 GDISP_SCREEN_HEIGHT

---
 drivers/gdisp/SSD1289/gdisp_lld.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'drivers/gdisp/SSD1289/gdisp_lld.c')

diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c
index 8f3e0d5a..81fe1fa9 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld.c
@@ -119,8 +119,8 @@ bool_t GDISP_LLD(init)(void) {
     lld_lcdWriteReg(0x004e,0x0000);		lld_lcdDelay(5);
 
     /* Initialise the GDISP structure */
-	GDISP.Width = SCREEN_WIDTH;
-	GDISP.Height = SCREEN_HEIGHT;
+	GDISP.Width = GDISP_SCREEN_WIDTH;
+	GDISP.Height = GDISP_SCREEN_HEIGHT;
 	GDISP.Orientation = GDISP_ROTATE_0;
 	GDISP.Powermode = powerOn;
 	GDISP.Backlight = 100;
@@ -183,7 +183,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	    lld_lcdSetCursor(0, 0);
 	    lld_lcdWriteStreamStart();
 
-	    for(i = 0; i < SCREEN_WIDTH * SCREEN_HEIGHT; i++)
+	    for(i = 0; i < GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT; i++)
 	    	lld_lcdWriteData(color);
 
 	    lld_lcdWriteStreamStop();
@@ -307,7 +307,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 * @notapi
 	 */
 	void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {
-		static color_t buf[((SCREEN_HEIGHT > SCREEN_WIDTH ) ? SCREEN_HEIGHT : SCREEN_WIDTH)];
+		static color_t buf[((GDISP_SCREEN_HEIGHT > GDISP_SCREEN_WIDTH ) ? GDISP_SCREEN_HEIGHT : GDISP_SCREEN_WIDTH)];
 		coord_t row0, row1;
 		unsigned i, gap, abslines;
 
@@ -411,29 +411,29 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 				lld_lcdWriteReg(0x0001, 0x2B3F);
 				/* ID = 11 AM = 0 */
 				lld_lcdWriteReg(0x0011, 0x6070);
-				GDISP.Height = SCREEN_HEIGHT;
-				GDISP.Width = SCREEN_WIDTH;
+				GDISP.Height = GDISP_SCREEN_HEIGHT;
+				GDISP.Width = GDISP_SCREEN_WIDTH;
 				break;
 			case GDISP_ROTATE_90:
 				lld_lcdWriteReg(0x0001, 0x293F);
 				/* ID = 11 AM = 1 */
 				lld_lcdWriteReg(0x0011, 0x6078);
-				GDISP.Height = SCREEN_WIDTH;
-				GDISP.Width = SCREEN_HEIGHT;
+				GDISP.Height = GDISP_SCREEN_WIDTH;
+				GDISP.Width = GDISP_SCREEN_HEIGHT;
 				break;
 			case GDISP_ROTATE_180:
 				lld_lcdWriteReg(0x0001, 0x2B3F);
 				/* ID = 01 AM = 0 */
 				lld_lcdWriteReg(0x0011, 0x6040);
-				GDISP.Height = SCREEN_HEIGHT;
-				GDISP.Width = SCREEN_WIDTH;
+				GDISP.Height = GDISP_SCREEN_HEIGHT;
+				GDISP.Width = GDISP_SCREEN_WIDTH;
 				break;
 			case GDISP_ROTATE_270:
 				lld_lcdWriteReg(0x0001, 0x293F);
 				/* ID = 01 AM = 1 */
 				lld_lcdWriteReg(0x0011, 0x6048);
-				GDISP.Height = SCREEN_WIDTH;
-				GDISP.Width = SCREEN_HEIGHT;
+				GDISP.Height = GDISP_SCREEN_WIDTH;
+				GDISP.Width = GDISP_SCREEN_HEIGHT;
 				break;
 			default:
 				return;
-- 
cgit v1.2.3