diff options
| author | Joel Bodenmann <joel@unormal.org> | 2013-03-29 18:14:35 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2013-03-29 18:14:35 +0100 |
| commit | 2510f3e75b44b84e6ef43275c0818cb90764af2f (patch) | |
| tree | f286237717faf66ca18b875cb3ed6dd6f7942861 | |
| parent | d6b75429b25bec5f83cd9eb1db21a8337454d5a6 (diff) | |
| download | uGFX-2510f3e75b44b84e6ef43275c0818cb90764af2f.tar.gz uGFX-2510f3e75b44b84e6ef43275c0818cb90764af2f.tar.bz2 uGFX-2510f3e75b44b84e6ef43275c0818cb90764af2f.zip | |
board file fix
| -rw-r--r-- | drivers/gdisp/SSD2119/gdisp_lld.c | 8 | ||||
| -rw-r--r-- | drivers/ginput/touch/STMPE811/ginput_lld_mouse.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gdisp/SSD2119/gdisp_lld.c b/drivers/gdisp/SSD2119/gdisp_lld.c index 9e6fdb4f..a7ad7b1a 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld.c +++ b/drivers/gdisp/SSD2119/gdisp_lld.c @@ -55,7 +55,15 @@ /* Driver local functions. */ /*===========================================================================*/ +#if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD + /* Include the user supplied board definitions */ + #include "gdisp_lld_board.h" +#elif defined(BOARD_EMBEST_DMSTF4BB) #include "gdisp_lld_board_embest_dmstf4bb.h" +#else + /* Include the user supplied board definitions */ + #include "gdisp_lld_board.h" +#endif // Some common routines and macros #define write_reg(reg, data) { write_index(reg); write_data(data); } diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c index 09360dbc..782c5c06 100644 --- a/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c @@ -39,7 +39,7 @@ #if defined(GINPUT_MOUSE_USE_CUSTOM_BOARD) && GINPUT_MOUSE_USE_CUSTOM_BOARD #include "ginput_lld_mouse_board.h" -#elif defined(BOARD_EMBEST_DMST4BB) +#elif defined(BOARD_EMBEST_DMSTF4BB) #include "ginput_lld_mouse_board_embest_dmstf4bb.h" #else #include "ginput_lld_mouse_board_example.h" |