aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTectu <joel@unormal.org>2012-06-11 18:12:05 +0200
committerTectu <joel@unormal.org>2012-06-11 18:12:05 +0200
commit4c90a487f7667938e9735396335321e2fc6f01cd (patch)
treea2b90e4ecfb7c2ceaea085c4de18369f6fc02d9e /drivers
parente8c4fc8e31fb1c5dc6884102adf4ac6be208b570 (diff)
downloaduGFX-4c90a487f7667938e9735396335321e2fc6f01cd.tar.gz
uGFX-4c90a487f7667938e9735396335321e2fc6f01cd.tar.bz2
uGFX-4c90a487f7667938e9735396335321e2fc6f01cd.zip
added lcdconf.h
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s6d1121_lld.h5
-rw-r--r--drivers/ssd1289_lld.h6
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/s6d1121_lld.h b/drivers/s6d1121_lld.h
index b2547c37..42fe3b0f 100644
--- a/drivers/s6d1121_lld.h
+++ b/drivers/s6d1121_lld.h
@@ -1,6 +1,10 @@
#ifndef S6D1121_H
#define S6D1121_H
+
#include "glcd.h"
+#include "lcdconf.h"
+
+#ifdef LCD_USE_S6D1121
// I/O assignments
#define LCD_BL_GPIO GPIOB
@@ -36,4 +40,5 @@ uint16_t lld_lcdGetHeight(void);
uint16_t lld_lcdGetWidth(void);
#endif
+#endif
diff --git a/drivers/ssd1289_lld.h b/drivers/ssd1289_lld.h
index bfcfe105..db109749 100644
--- a/drivers/ssd1289_lld.h
+++ b/drivers/ssd1289_lld.h
@@ -1,9 +1,10 @@
#ifndef SSD1289_H
#define SSD1289_H
-#ifndef LCD_USE_SSD1289
-
#include "glcd.h"
+#include "lcdconf.h"
+
+#ifdef LCD_USE_SSD1289
#define Set_CS palSetPad(LCD_CMD_PORT, LCD_CS);
#define Clr_CS palClearPad(LCD_CMD_PORT, LCD_CS);
@@ -27,3 +28,4 @@ uint16_t lld_lcdGetWidth(void);
#endif
#endif
+