aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gadc/AT91SAM7/gadc_lld.c2
-rw-r--r--drivers/gaudin/Win32/gaudin_lld.c2
-rw-r--r--drivers/gaudin/gadc/gaudin_lld.c2
-rw-r--r--drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c4
-rw-r--r--drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c4
-rw-r--r--drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c4
-rw-r--r--drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c4
-rw-r--r--drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c4
-rw-r--r--drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c4
-rw-r--r--drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c6
-rw-r--r--drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c6
-rw-r--r--drivers/gdisp/RA8875/gdisp_lld_RA8875.c4
-rw-r--r--drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c4
-rw-r--r--drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c4
-rw-r--r--drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c6
-rw-r--r--drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c6
-rw-r--r--drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c6
-rw-r--r--drivers/gdisp/ST7565/gdisp_lld_ST7565.c6
-rw-r--r--drivers/gdisp/TestStub/gdisp_lld_TestStub.c4
-rw-r--r--drivers/ginput/dial/GADC/ginput_lld_dial.c2
-rw-r--r--drivers/ginput/toggle/Pal/ginput_lld_toggle.c2
-rw-r--r--drivers/ginput/touch/ADS7843/ginput_lld_mouse.c2
-rw-r--r--drivers/ginput/touch/FT5x06/ginput_lld_mouse.c8
-rw-r--r--drivers/ginput/touch/MCU/ginput_lld_mouse.c2
-rw-r--r--drivers/ginput/touch/STMPE811/ginput_lld_mouse.c6
-rw-r--r--drivers/multiple/Win32/gdisp_lld_Win32.c8
-rw-r--r--drivers/multiple/X/gdisp_lld_X.c6
-rw-r--r--drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c8
28 files changed, 62 insertions, 64 deletions
diff --git a/drivers/gadc/AT91SAM7/gadc_lld.c b/drivers/gadc/AT91SAM7/gadc_lld.c
index 78a60109..f18f2717 100644
--- a/drivers/gadc/AT91SAM7/gadc_lld.c
+++ b/drivers/gadc/AT91SAM7/gadc_lld.c
@@ -18,7 +18,7 @@
#if GFX_USE_GADC
-#include "gadc/lld/gadc_lld.h"
+#include "src/gadc/driver.h"
static ADCConversionGroup acg = {
FALSE, // circular
diff --git a/drivers/gaudin/Win32/gaudin_lld.c b/drivers/gaudin/Win32/gaudin_lld.c
index dce4cad3..e798f4ef 100644
--- a/drivers/gaudin/Win32/gaudin_lld.c
+++ b/drivers/gaudin/Win32/gaudin_lld.c
@@ -15,7 +15,7 @@
#if GFX_USE_GAUDIN
/* Include the driver defines */
-#include "gaudin/lld/gaudin_lld.h"
+#include "src/gaudin/driver.h"
#undef Red
#undef Green
diff --git a/drivers/gaudin/gadc/gaudin_lld.c b/drivers/gaudin/gadc/gaudin_lld.c
index 10730797..972f3dcf 100644
--- a/drivers/gaudin/gadc/gaudin_lld.c
+++ b/drivers/gaudin/gadc/gaudin_lld.c
@@ -31,7 +31,7 @@
#endif
/* Include the driver defines */
-#include "gaudin/lld/gaudin_lld.h"
+#include "src/gaudin/driver.h"
/*===========================================================================*/
/* External declarations. */
diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
index 166f564b..1c61ee93 100644
--- a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
+++ b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
@@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_ED060SC4
-#include "../drivers/gdisp/ED060SC4/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/ED060SC4/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_ED060SC4.h"
diff --git a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
index 88d3d19a..35492541 100644
--- a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
+++ b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
@@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_HX8347D
-#include "../drivers/gdisp/HX8347D/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/HX8347D/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_HX8347D.h"
diff --git a/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c b/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
index 816d9956..ab0cc0ce 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
+++ b/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
@@ -25,8 +25,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9320
-#include "../drivers/gdisp/ILI9320/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/ILI9320/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_ILI9320.h"
diff --git a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
index 0197a536..e2900514 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
+++ b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
@@ -25,8 +25,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9325
-#include "../drivers/gdisp/ILI9325/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/ILI9325/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_ILI9325.h"
diff --git a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
index 4a21aa32..134e3614 100644
--- a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
+++ b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
@@ -25,8 +25,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9341
-#include "../drivers/gdisp/ILI9341/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/ILI9341/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_ILI9341.h"
diff --git a/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c b/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
index c96faf33..748ee469 100644
--- a/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
+++ b/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
@@ -25,8 +25,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9481
-#include "../drivers/gdisp/ILI9481/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/ILI9481/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_ILI9481.h"
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c b/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
index 261f6f66..f0603ca8 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
@@ -24,8 +24,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE12
-#include "../drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_Nokia6610GE12.h"
@@ -33,7 +33,7 @@
/* Driver local definitions. */
/*===========================================================================*/
-#include "GE12.h"
+#include "drivers/gdisp/Nokia6610GE12/GE12.h"
#define GDISP_SCAN_LINES 132
#define GDISP_SLEEP_SIZE 32 /* Sleep mode window lines - this must be 32 on this controller */
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
index afb060c1..0e2c7e4e 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
@@ -59,8 +59,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE8
-#include "../drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_Nokia6610GE8.h"
@@ -68,7 +68,7 @@
/* Driver local definitions. */
/*===========================================================================*/
-#include "GE8.h"
+#include "drivers/gdisp/Nokia6610GE8/GE8.h"
#define GDISP_SCAN_LINES 132
diff --git a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c
index e3fee636..a4d1d0e1 100644
--- a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c
+++ b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c
@@ -15,8 +15,8 @@
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
#define GDISP_DRIVER_VMT GDISPVMT_RA8875
-#include "../drivers/gdisp/RA8875/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/RA8875/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
/* include the users board interface */
#include "board_RA8875.h"
diff --git a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
index 78b659de..389b27fe 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
@@ -27,8 +27,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_S6D1121
-#include "../drivers/gdisp/S6D1121/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/S6D1121/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_S6D1121.h"
diff --git a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
index 79ac7dd9..75338745 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
@@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD1289
-#include "../drivers/gdisp/SSD1289/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/SSD1289/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_SSD1289.h"
diff --git a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
index b7bce1e2..5dd4c2ab 100644
--- a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
+++ b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
@@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD1306
-#include "../drivers/gdisp/SSD1306/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/SSD1306/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_SSD1306.h"
@@ -46,7 +46,7 @@
#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0)
-#include "SSD1306.h"
+#include "drivers/gdisp/SSD1306/SSD1306.h"
/*===========================================================================*/
/* Driver local functions. */
diff --git a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
index e1924c2d..1e69ef70 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
+++ b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
@@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD1963
-#include "../drivers/gdisp/SSD1963/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/SSD1963/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#define CALC_PERIOD(w,b,f,p) (p+b+w+f)
#define CALC_FPR(w,h,hb,hf,hp,vb,vf,vp,fps) ((fps * CALC_PERIOD(w,hb,hf,hp) * CALC_PERIOD(h,vb,vf,vp) * 1048576)/100000000)
@@ -51,7 +51,7 @@ typedef struct LCD_Parameters {
/* Driver local functions. */
/*===========================================================================*/
-#include "ssd1963.h"
+#include "drivers/gdisp/SSD1963/ssd1963.h"
#define write_reg(g, reg, data) { write_index(g, reg); write_data(g, data); }
#define write_data16(g, data) { write_data(g, (data)>>8); write_data(g, (data) & 0xFF); }
diff --git a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
index a58d2973..8af9a123 100644
--- a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
+++ b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
@@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD2119
-#include "../drivers/gdisp/SSD2119/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/SSD2119/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_SSD2119.h"
@@ -37,7 +37,7 @@
#define GDISP_INITIAL_BACKLIGHT 100
#endif
-#include "ssd2119.h"
+#include "drivers/gdisp/SSD2119/ssd2119.h"
/*===========================================================================*/
/* Driver local functions. */
diff --git a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c
index 5b0e9f27..b3029391 100644
--- a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c
+++ b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c
@@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_ST7565
-#include "../drivers/gdisp/ST7565/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/ST7565/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#include "board_ST7565.h"
@@ -39,7 +39,7 @@
#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0)
-#include "st7565.h"
+#include "drivers/gdisp/ST7565/st7565.h"
/*===========================================================================*/
/* Driver config defaults for backward compatibility. */
diff --git a/drivers/gdisp/TestStub/gdisp_lld_TestStub.c b/drivers/gdisp/TestStub/gdisp_lld_TestStub.c
index 1a5ad81f..f87826aa 100644
--- a/drivers/gdisp/TestStub/gdisp_lld_TestStub.c
+++ b/drivers/gdisp/TestStub/gdisp_lld_TestStub.c
@@ -15,8 +15,8 @@
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
#define GDISP_DRIVER_VMT GDISPVMT_TestStub
-#include "../drivers/gdisp/TestStub/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/gdisp/TestStub/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#ifndef GDISP_SCREEN_HEIGHT
#define GDISP_SCREEN_HEIGHT 128
diff --git a/drivers/ginput/dial/GADC/ginput_lld_dial.c b/drivers/ginput/dial/GADC/ginput_lld_dial.c
index af633771..cefe5689 100644
--- a/drivers/ginput/dial/GADC/ginput_lld_dial.c
+++ b/drivers/ginput/dial/GADC/ginput_lld_dial.c
@@ -18,7 +18,7 @@
#if GFX_USE_GINPUT && GINPUT_NEED_DIAL
-#include "ginput/lld/dial.h"
+#include "src/ginput/driver_dial.h"
#if GINPUT_DIAL_NUM_PORTS >= 5
#error "GINPUT: Dial - GADC driver currently only supports 4 devices"
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c b/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
index 3ed923bc..09290f17 100644
--- a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
+++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
@@ -18,7 +18,7 @@
#if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
-#include "ginput/lld/toggle.h"
+#include "src/ginput/driver_toggle.h"
GINPUT_TOGGLE_DECLARE_STRUCTURE();
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"
diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c
index 9425bd36..7bd9379f 100644
--- a/drivers/multiple/Win32/gdisp_lld_Win32.c
+++ b/drivers/multiple/Win32/gdisp_lld_Win32.c
@@ -14,8 +14,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_Win32
-#include "../drivers/multiple/Win32/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/multiple/Win32/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
#ifndef GDISP_SCREEN_WIDTH
#define GDISP_SCREEN_WIDTH 640
@@ -64,12 +64,12 @@
#if GINPUT_NEED_TOGGLE
/* Include toggle support code */
- #include "ginput/lld/toggle.h"
+ #include "src/ginput/driver_toggle.h"
#endif
#if GINPUT_NEED_MOUSE
/* Include mouse support code */
- #include "ginput/lld/mouse.h"
+ #include "src/ginput/driver_mouse.h"
#endif
static DWORD winThreadId;
diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c
index dcc76d09..940f4f7b 100644
--- a/drivers/multiple/X/gdisp_lld_X.c
+++ b/drivers/multiple/X/gdisp_lld_X.c
@@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_X11
-#include "../drivers/multiple/X/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
+#include "drivers/multiple/X/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
/**
* Our color model - Default or 24 bit only.
@@ -40,7 +40,7 @@
#if GINPUT_NEED_MOUSE
/* Include mouse support code */
- #include "ginput/lld/mouse.h"
+ #include "src/ginput/driver_mouse.h"
#endif
#include <X11/Xlib.h>
diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
index 787062f6..18a53580 100644
--- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
+++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
@@ -14,9 +14,9 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_uGFXnet
-#include "../drivers/multiple/uGFXnet/gdisp_lld_config.h"
-#include "gdisp/lld/gdisp_lld.h"
-#include "../drivers/multiple/uGFXnet/uGFXnetProtocol.h"
+#include "drivers/multiple/uGFXnet/gdisp_lld_config.h"
+#include "src/gdisp/driver.h"
+#include "drivers/multiple/uGFXnet/uGFXnetProtocol.h"
#ifndef GDISP_SCREEN_WIDTH
#define GDISP_SCREEN_WIDTH 640
@@ -107,7 +107,7 @@
#if GINPUT_NEED_MOUSE
/* Include mouse support code */
- #include "ginput/lld/mouse.h"
+ #include "src/ginput/driver_mouse.h"
#endif
/*===========================================================================*/