SCREEN_WIDTH and SCREEN_HEIGHT renamed to GDISP_SCREEN_WIDTH and GDISP_SCREEN_HEIGHT

3 files changed, 24 insertions, 24 deletions

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;

diff --git a/drivers/gdisp/SSD1289/readme.txt b/drivers/gdisp/SSD1289/readme.txt
index 08aa4f60..bbe49d7d 100644
--- a/drivers/gdisp/SSD1289/readme.txt
+++ b/drivers/gdisp/SSD1289/readme.txt
@@ -11,8 +11,8 @@ To use this driver:
 		#define GDISP_USE_FSMC

 

 	d) All of the following (with appropriate values):

-		#define SCREEN_WIDTH	320

-		#define SCREEN_HEIGHT	240

+		#define GDISP_SCREEN_WIDTH	320

+		#define GDISP_SCREEN_HEIGHT	240

 

 2. To your makefile add the following lines:

 	include $(GFXLIB)/drivers/gdisp/SSD1289/gdisp_lld.mk

diff --git a/drivers/gdisp/SSD1289/ssd1289_lld.c.h b/drivers/gdisp/SSD1289/ssd1289_lld.c.h
index b9e4af6f..025ef6e7 100644
--- a/drivers/gdisp/SSD1289/ssd1289_lld.c.h
+++ b/drivers/gdisp/SSD1289/ssd1289_lld.c.h
@@ -266,8 +266,8 @@ static void lld_lcdSetCursor(uint16_t x, uint16_t y) {
 	 */
 	switch(GDISP.Orientation) {
 		case GDISP_ROTATE_180:
-			lld_lcdWriteReg(0x004e, (SCREEN_WIDTH-1-x) & 0x00FF);
-			lld_lcdWriteReg(0x004f, (SCREEN_HEIGHT-1-y) & 0x01FF);
+			lld_lcdWriteReg(0x004e, (GDISP_SCREEN_WIDTH-1-x) & 0x00FF);
+			lld_lcdWriteReg(0x004f, (GDISP_SCREEN_HEIGHT-1-y) & 0x01FF);
 			break;
 		case GDISP_ROTATE_0:
 			lld_lcdWriteReg(0x004e, x & 0x00FF);
@@ -278,8 +278,8 @@ static void lld_lcdSetCursor(uint16_t x, uint16_t y) {
 			lld_lcdWriteReg(0x004f, x & 0x01FF);
 			break;
 		case GDISP_ROTATE_90:
-			lld_lcdWriteReg(0x004e, (SCREEN_WIDTH - y - 1) & 0x00FF);
-			lld_lcdWriteReg(0x004f, (SCREEN_HEIGHT - x - 1) & 0x01FF);
+			lld_lcdWriteReg(0x004e, (GDISP_SCREEN_WIDTH - y - 1) & 0x00FF);
+			lld_lcdWriteReg(0x004f, (GDISP_SCREEN_HEIGHT - x - 1) & 0x01FF);
 			break;
 	}
 }
@@ -308,14 +308,14 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy)
 			lld_lcdWriteReg(0x46, (x+cx-1) & 0x01FF);
 			break;
 		case GDISP_ROTATE_180:
-			lld_lcdWriteReg(0x44, (((SCREEN_WIDTH-x-1) & 0x00FF) << 8) | ((SCREEN_WIDTH - (x+cx)) & 0x00FF));
-			lld_lcdWriteReg(0x45, (SCREEN_HEIGHT-(y+cy)) & 0x01FF);
-			lld_lcdWriteReg(0x46, (SCREEN_HEIGHT-y-1) & 0x01FF);
+			lld_lcdWriteReg(0x44, (((GDISP_SCREEN_WIDTH-x-1) & 0x00FF) << 8) | ((GDISP_SCREEN_WIDTH - (x+cx)) & 0x00FF));
+			lld_lcdWriteReg(0x45, (GDISP_SCREEN_HEIGHT-(y+cy)) & 0x01FF);
+			lld_lcdWriteReg(0x46, (GDISP_SCREEN_HEIGHT-y-1) & 0x01FF);
 			break;
 		case GDISP_ROTATE_270:
-			lld_lcdWriteReg(0x44, (((SCREEN_WIDTH - y - 1) & 0x00FF) << 8) | ((SCREEN_WIDTH - (y+cy)) & 0x00FF));
-			lld_lcdWriteReg(0x45, (SCREEN_HEIGHT - (x+cx)) & 0x01FF);
-			lld_lcdWriteReg(0x46, (SCREEN_HEIGHT - x - 1) & 0x01FF);
+			lld_lcdWriteReg(0x44, (((GDISP_SCREEN_WIDTH - y - 1) & 0x00FF) << 8) | ((GDISP_SCREEN_WIDTH - (y+cy)) & 0x00FF));
+			lld_lcdWriteReg(0x45, (GDISP_SCREEN_HEIGHT - (x+cx)) & 0x01FF);
+			lld_lcdWriteReg(0x46, (GDISP_SCREEN_HEIGHT - x - 1) & 0x01FF);
 			break;
 	}