diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-26 18:45:26 +1000 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-26 18:45:26 +1000 |
| commit | 8275c8820f230342939a2410dd0b24c0f26a14e5 (patch) | |
| tree | fcb202fb077e7d78e1381e5ef531bbf96dcca3cf /drivers/gdisp/S6D1121 | |
| parent | 6cc2bc280cc7dc4cb546d94219210d65c15df2e1 (diff) | |
| download | uGFX-8275c8820f230342939a2410dd0b24c0f26a14e5.tar.gz uGFX-8275c8820f230342939a2410dd0b24c0f26a14e5.tar.bz2 uGFX-8275c8820f230342939a2410dd0b24c0f26a14e5.zip | |
Ginput and structure changes
GINPUT Touch including drivers
GTIMER fixes
GEVENT fixes
GWIN button completion
Structure changes to better seperate sections of a sub-system
Diffstat (limited to 'drivers/gdisp/S6D1121')
| -rw-r--r-- | drivers/gdisp/S6D1121/gdisp_lld.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c index 585899d2..49116ec1 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld.c +++ b/drivers/gdisp/S6D1121/gdisp_lld.c @@ -33,7 +33,7 @@ #if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
/* Include the emulation code for things we don't support */
-#include "gdisp_emulation.c"
+#include "lld/gdisp/emulation.c"
/*===========================================================================*/
/* Driver local definitions. */
@@ -56,7 +56,10 @@ /* Driver local definitions. */
/*===========================================================================*/
-#if defined(BOARD_OLIMEX_STM32_E407)
+#if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD
+ /* Include the user supplied board definitions */
+ #include "gdisp_lld_board.h"
+#elif defined(BOARD_OLIMEX_STM32_E407)
#include "gdisp_lld_board_olimex_e407.h"
#else
#include "gdisp_lld_board.h"
|