aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2012-11-22 21:23:38 +0100
committerJoel Bodenmann <joel@unormal.org>2012-11-22 21:23:38 +0100
commit971c9fd0d9467bb839f99e3d1baec77945339add (patch)
tree82e4e34706a594af538089ecaa79e382f7e2806c /drivers
parent0ef5bf9dfca957c1a0c5ae55e62ab9a7ffe7671b (diff)
downloaduGFX-971c9fd0d9467bb839f99e3d1baec77945339add.tar.gz
uGFX-971c9fd0d9467bb839f99e3d1baec77945339add.tar.bz2
uGFX-971c9fd0d9467bb839f99e3d1baec77945339add.zip
S6D1121 macro fix
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gdisp/S6D1121/gdisp_lld.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c
index 5f5d385a..585899d2 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld.c
@@ -39,13 +39,16 @@
/* Driver local definitions. */
/*===========================================================================*/
-#ifndef GDISP_SCREEN_HEIGHT
- #define GDISP_SCREEN_HEIGHT 320
+#if defined(GDISP_SCREEN_HEIGHT)
+ #undef GISP_SCREEN_HEIGHT
#endif
-#ifndef GDISP_SCREEN_WIDTH
- #define GDISP_SCREEN_WIDTH 240
+#if defined(GDISP_SCREEN_WIDTH)
+ #undef GDISP_SCREEN_WIDTH
#endif
+#define GDISP_SCREEN_HEIGHT 320
+#define GDISP_SCREEN_WIDTH 240
+
#define GDISP_INITIAL_CONTRAST 50
#define GDISP_INITIAL_BACKLIGHT 100