diff options
| author | Joel Bodenmann <joel@unormal.org> | 2012-10-11 01:41:18 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2012-10-11 01:41:18 +0200 |
| commit | cf1a759ad6bcd51066036e40e91c617b91f1beba (patch) | |
| tree | 31a403b38c0c5eba3664967d0f055c33339ec5e2 /drivers/gdisp/S6D1121/s6d1121_lld.c.h | |
| parent | b9de7e6ce3f7e3b3344d1893c0516114a91277ae (diff) | |
| download | uGFX-cf1a759ad6bcd51066036e40e91c617b91f1beba.tar.gz uGFX-cf1a759ad6bcd51066036e40e91c617b91f1beba.tar.bz2 uGFX-cf1a759ad6bcd51066036e40e91c617b91f1beba.zip | |
SCREEN_WIDTH and SCREEN_HEIGHT renamed to GDISP_SCREEN_WIDTH and GDISP_SCREEN_HEIGHT
Diffstat (limited to 'drivers/gdisp/S6D1121/s6d1121_lld.c.h')
| -rw-r--r-- | drivers/gdisp/S6D1121/s6d1121_lld.c.h | 28 |
1 files changed, 14 insertions, 14 deletions
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;
}
}
|