diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-19 08:00:52 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-19 08:00:52 +1000 |
| commit | b82448c3e23663a25a423402343fbca78253b80c (patch) | |
| tree | 57a03e35b88f6e434b6c4d084695fc5ce1061932 /drivers/ginput/touch | |
| parent | dcedf414136e55e6dacbe736babe748e1374e19e (diff) | |
| parent | 37966ff16d923bbca53c9464815cb49cbd7fc3be (diff) | |
| download | uGFX-b82448c3e23663a25a423402343fbca78253b80c.tar.gz uGFX-b82448c3e23663a25a423402343fbca78253b80c.tar.bz2 uGFX-b82448c3e23663a25a423402343fbca78253b80c.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'drivers/ginput/touch')
| -rw-r--r-- | drivers/ginput/touch/ADS7843/ginput_lld_mouse.c | 2 | ||||
| -rw-r--r-- | drivers/ginput/touch/FT5x06/ginput_lld_mouse.c | 8 | ||||
| -rw-r--r-- | drivers/ginput/touch/MCU/ginput_lld_mouse.c | 2 | ||||
| -rw-r--r-- | drivers/ginput/touch/STMPE811/ginput_lld_mouse.c | 6 |
4 files changed, 8 insertions, 10 deletions
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c b/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c index 074fd7ce..890b65ae 100644 --- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c +++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c @@ -18,7 +18,7 @@ #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
-#include "ginput/lld/mouse.h"
+#include "src/ginput/driver_mouse.h"
#include "ginput_lld_mouse_board.h"
diff --git a/drivers/ginput/touch/FT5x06/ginput_lld_mouse.c b/drivers/ginput/touch/FT5x06/ginput_lld_mouse.c index 74670c1e..43baa9b7 100644 --- a/drivers/ginput/touch/FT5x06/ginput_lld_mouse.c +++ b/drivers/ginput/touch/FT5x06/ginput_lld_mouse.c @@ -14,15 +14,13 @@ * @{ */ -#include "ch.h" -#include "hal.h" #include "gfx.h" -#include "ft5x06.h" - #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/ -#include "ginput/lld/mouse.h" +#include "src/ginput/driver_mouse.h" + +#include "drivers/ginput/touch/FT5x06/ft5x06.h" // include board abstraction #include "ginput_lld_mouse_board.h" diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse.c b/drivers/ginput/touch/MCU/ginput_lld_mouse.c index 1e325318..d7a2e314 100644 --- a/drivers/ginput/touch/MCU/ginput_lld_mouse.c +++ b/drivers/ginput/touch/MCU/ginput_lld_mouse.c @@ -19,7 +19,7 @@ #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
-#include "ginput/lld/mouse.h"
+#include "src/ginput/driver_mouse.h"
#include "ginput_lld_mouse_board.h"
diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c index 9ec1bdaa..d650e603 100644 --- a/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c @@ -16,11 +16,11 @@ #include "gfx.h" -#include "stmpe811.h" - #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/ -#include "ginput/lld/mouse.h" +#include "src/ginput/driver_mouse.h" + +#include "drivers/ginput/touch/STMPE811/stmpe811.h" #include "ginput_lld_mouse_board.h" |