SCREEN_WIDTH and SCREEN_HEIGHT renamed to GDISP_SCREEN_WIDTH and GDISP_SCREEN_HEIGHT

3 files changed, 28 insertions, 28 deletions

diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c
index 090042b7..0972f260 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld.c
@@ -178,8 +178,8 @@ bool_t GDISP_LLD(init)(void) {
 	lld_lcdResetViewPort();

 

 	/* Now 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;

@@ -227,7 +227,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();

@@ -358,7 +358,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 		/* This is marked as "TODO: Test this" in the original GLCD driver.

 		 * For now we just leave the GDISP_HARDWARE_SCROLL off.

 		 */

-		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;

 

@@ -459,26 +459,26 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 			case GDISP_ROTATE_0:

 				lld_lcdWriteReg(0x0001,0x0127);

 				lld_lcdWriteReg(0x03, 0b0011);

-				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,0x0027);

 				lld_lcdWriteReg(0x0003, 0b1011);

-				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,0x0127);

 				lld_lcdWriteReg(0x0003, 0b0000);

-				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,0x0027);

 				lld_lcdWriteReg(0x0003, 0b1000);

-				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/S6D1121/readme.txt b/drivers/gdisp/S6D1121/readme.txt
index ecb34940..e60a0e29 100644
--- a/drivers/gdisp/S6D1121/readme.txt
+++ b/drivers/gdisp/S6D1121/readme.txt
@@ -8,8 +8,8 @@ To use this driver:
 		#define GDISP_USE_SPI

 		#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/S6D1121/gdisp_lld.mk

diff --git a/drivers/gdisp/S6D1121/s6d1121_lld.c.h b/drivers/gdisp/S6D1121/s6d1121_lld.c.h
index 76a64ce3..6cc3017b 100644
--- a/drivers/gdisp/S6D1121/s6d1121_lld.c.h
+++ b/drivers/gdisp/S6D1121/s6d1121_lld.c.h
@@ -192,12 +192,12 @@ static void lld_lcdSetCursor(coord_t x, coord_t y) {
 			lld_lcdWriteReg(0x0021, x & 0x01FF);

 			break;

 		case GDISP_ROTATE_180:

-            lld_lcdWriteReg(0x0020, (SCREEN_WIDTH - 1 - x) & 0x00FF);

-            lld_lcdWriteReg(0x0021, (SCREEN_HEIGHT - 1 - y) & 0x01FF);

+            lld_lcdWriteReg(0x0020, (GDISP_SCREEN_WIDTH - 1 - x) & 0x00FF);

+            lld_lcdWriteReg(0x0021, (GDISP_SCREEN_HEIGHT - 1 - y) & 0x01FF);

             break;

 		case GDISP_ROTATE_270:

-			lld_lcdWriteReg(0x0020, (SCREEN_WIDTH - 1 - y) & 0x00FF);

-			lld_lcdWriteReg(0x0021, (SCREEN_HEIGHT - 1 - x) & 0x01FF);

+			lld_lcdWriteReg(0x0020, (GDISP_SCREEN_WIDTH - 1 - y) & 0x00FF);

+			lld_lcdWriteReg(0x0021, (GDISP_SCREEN_HEIGHT - 1 - x) & 0x01FF);

 			break;

 	}

 }

@@ -224,16 +224,16 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy)
 			lld_lcdWriteReg(0x47, (x + cx - 1) & 0x01FF);

 			break;

 		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);

+			lld_lcdWriteReg(0x46, (((GDISP_SCREEN_WIDTH - x - 1) & 0x00FF) << 8) |

+			                          ((GDISP_SCREEN_WIDTH - (x + cx)) & 0x00FF));

+			lld_lcdWriteReg(0x48, (GDISP_SCREEN_HEIGHT - (y + cy)) & 0x01FF);

+			lld_lcdWriteReg(0x47, (GDISP_SCREEN_HEIGHT- y - 1) & 0x01FF);

 			break;

 		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);

+			lld_lcdWriteReg(0x46, (((GDISP_SCREEN_WIDTH - y - 1) & 0x00FF) << 8) |

+			                          ((GDISP_SCREEN_WIDTH - (y + cy)) & 0x00FF));

+			lld_lcdWriteReg(0x48, (GDISP_SCREEN_HEIGHT - (x + cx)) & 0x01FF);

+			lld_lcdWriteReg(0x47, (GDISP_SCREEN_HEIGHT - x - 1) & 0x01FF);

 			break;

 	}

 

@@ -244,11 +244,11 @@ static void lld_lcdResetViewPort(void) {
 	switch(GDISP.Orientation) {

 		case GDISP_ROTATE_0:

 		case GDISP_ROTATE_180:

-			lld_lcdSetViewPort(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);

+			lld_lcdSetViewPort(0, 0, GDISP_SCREEN_WIDTH, GDISP_SCREEN_HEIGHT);

 			break;

 		case GDISP_ROTATE_90:

 		case GDISP_ROTATE_270:

-			lld_lcdSetViewPort(0, 0, SCREEN_HEIGHT, SCREEN_WIDTH);

+			lld_lcdSetViewPort(0, 0, GDISP_SCREEN_HEIGHT, GDISP_SCREEN_WIDTH);

 			break;

 	}

 }