diff options
author | inmarket <andrewh@inmarket.com.au> | 2015-01-21 17:26:24 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2015-01-21 17:26:24 +1000 |
commit | fa8167b94d13e94a6cb953e7f549a89f155f77c6 (patch) | |
tree | 8c33f78c45ca72ac2653327607f1d7caed668c5e /drivers | |
parent | 34939386d7390b0876973a1969f336b814313a22 (diff) | |
download | uGFX-fa8167b94d13e94a6cb953e7f549a89f155f77c6.tar.gz uGFX-fa8167b94d13e94a6cb953e7f549a89f155f77c6.tar.bz2 uGFX-fa8167b94d13e94a6cb953e7f549a89f155f77c6.zip |
Big file rename to reduce problems with brain-dead IDE's that don't handle project file hierarchies well.
Naming is more consistent with the new scheme.
May affect some third party drivers (header file renames).
Diffstat (limited to 'drivers')
40 files changed, 48 insertions, 48 deletions
diff --git a/drivers/gadc/AT91SAM7/gadc_lld.c b/drivers/gadc/AT91SAM7/gadc_lld.c index b01fdd6c..fa1870b0 100644 --- a/drivers/gadc/AT91SAM7/gadc_lld.c +++ b/drivers/gadc/AT91SAM7/gadc_lld.c @@ -14,7 +14,7 @@ #if GFX_USE_GADC -#include "src/gadc/driver.h" +#include "src/gadc/gadc_driver.h" static uint32_t nextfreq; diff --git a/drivers/gaudio/Win32/gaudio_play_lld.c b/drivers/gaudio/Win32/gaudio_play_lld.c index c0adf03e..cdc9a62a 100644 --- a/drivers/gaudio/Win32/gaudio_play_lld.c +++ b/drivers/gaudio/Win32/gaudio_play_lld.c @@ -10,7 +10,7 @@ #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY /* Include the driver defines */ -#include "src/gaudio/driver_play.h" +#include "src/gaudio/gaudio_driver_play.h" #undef Red #undef Green diff --git a/drivers/gaudio/Win32/gaudio_record_lld.c b/drivers/gaudio/Win32/gaudio_record_lld.c index c9ac8187..cfe8edf5 100644 --- a/drivers/gaudio/Win32/gaudio_record_lld.c +++ b/drivers/gaudio/Win32/gaudio_record_lld.c @@ -10,7 +10,7 @@ #if GFX_USE_GAUDIO && GAUDIO_NEED_RECORD /* Include the driver defines */ -#include "src/gaudio/driver_record.h" +#include "src/gaudio/gaudio_driver_record.h" #undef Red #undef Green diff --git a/drivers/gaudio/gadc/gaudio_record_lld.c b/drivers/gaudio/gadc/gaudio_record_lld.c index 1d70a259..6495309a 100644 --- a/drivers/gaudio/gadc/gaudio_record_lld.c +++ b/drivers/gaudio/gadc/gaudio_record_lld.c @@ -16,7 +16,7 @@ #endif /* Include the driver defines */ -#include "src/gaudio/driver_record.h" +#include "src/gaudio/gaudio_driver_record.h" static void gadcCallbackI(void) { GDataBuffer *pd; diff --git a/drivers/gaudio/pwm/gaudio_play_lld.c b/drivers/gaudio/pwm/gaudio_play_lld.c index 07fd14b2..d4d85c33 100644 --- a/drivers/gaudio/pwm/gaudio_play_lld.c +++ b/drivers/gaudio/pwm/gaudio_play_lld.c @@ -10,7 +10,7 @@ #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY /* Include the driver defines */ -#include "src/gaudio/driver_play.h" +#include "src/gaudio/gaudio_driver_play.h" /* Forward definition */ static void gaudio_play_pwm_timer_callbackI(void); diff --git a/drivers/gaudio/vs1053/gaudio_play_lld.c b/drivers/gaudio/vs1053/gaudio_play_lld.c index 8e7fb0a5..eaf677cb 100644 --- a/drivers/gaudio/vs1053/gaudio_play_lld.c +++ b/drivers/gaudio/vs1053/gaudio_play_lld.c @@ -10,7 +10,7 @@ #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY /* Include the driver defines */ -#include "src/gaudio/driver_play.h" +#include "src/gaudio/gaudio_driver_play.h" /* Include the vs1053 registers */ #include "drivers/gaudio/vs1053/vs1053.h" diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c index 789053c8..470c2768 100644 --- a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c +++ b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_ED060SC4 #include "drivers/gdisp/ED060SC4/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/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 34051c22..9c1e7f66 100644 --- a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c +++ b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_HX8347D #include "drivers/gdisp/HX8347D/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/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 87f29390..d3d1ca0e 100644 --- a/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c +++ b/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c @@ -21,7 +21,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_ILI9320 #include "drivers/gdisp/ILI9320/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/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 118e5933..5637b0b2 100644 --- a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c +++ b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c @@ -21,7 +21,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_ILI9325 #include "drivers/gdisp/ILI9325/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/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 20b1e270..6a9a929b 100644 --- a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c +++ b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c @@ -20,7 +20,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_ILI9341 #include "drivers/gdisp/ILI9341/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_ILI9341.h" diff --git a/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c b/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c index 277d0aff..b883cee6 100644 --- a/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c +++ b/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c @@ -21,7 +21,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_ILI93xx #include "drivers/gdisp/ILI93xx/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_ILI93xx.h" diff --git a/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c b/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c index f0bc7355..dec1cc31 100644 --- a/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c +++ b/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c @@ -20,7 +20,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_ILI9481 #include "drivers/gdisp/ILI9481/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_ILI9481.h" diff --git a/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c b/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c index ceeca05f..067851e6 100644 --- a/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c +++ b/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c @@ -21,7 +21,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_LGDP4532 #include "gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_LGDP4532.h" diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c b/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c index c6aa2a7c..6439b91e 100644 --- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c +++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c @@ -20,7 +20,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE12 #include "drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_Nokia6610GE12.h" diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c index cd265e00..f419abf5 100644 --- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c @@ -52,7 +52,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE8 #include "drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_Nokia6610GE8.h" diff --git a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c index ee447202..531a5a42 100644 --- a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c +++ b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_PCD8544 #include "drivers/gdisp/PCD8544/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_PCD8544.h" /*===========================================================================*/ diff --git a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c index 56d14f3e..cfb4ad83 100644 --- a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c +++ b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_PCF8812 #include "drivers/gdisp/PCF8812/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_PCF8812.h" /*===========================================================================*/ diff --git a/drivers/gdisp/R61505U/gdisp_lld_R61505U.c b/drivers/gdisp/R61505U/gdisp_lld_R61505U.c index dd966c03..94832248 100644 --- a/drivers/gdisp/R61505U/gdisp_lld_R61505U.c +++ b/drivers/gdisp/R61505U/gdisp_lld_R61505U.c @@ -21,7 +21,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_R61505U #include "drivers/gdisp/R61505U/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_R61505U.h" diff --git a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c index 6b58868b..0da233db 100644 --- a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c +++ b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_RA8875 #include "drivers/gdisp/RA8875/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/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 e3f1dd0c..0611ae1c 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c +++ b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c @@ -20,7 +20,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_S6D1121 #include "drivers/gdisp/S6D1121/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_S6D1121.h" diff --git a/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c b/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c index 91298aff..f66d11d6 100644 --- a/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c +++ b/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c @@ -25,7 +25,7 @@ #endif #include "drivers/gdisp/SPFD54124B/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_SPFD54124B.h" diff --git a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c index 0af1339e..82ad57f0 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c +++ b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_SSD1289 #include "drivers/gdisp/SSD1289/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/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 d2f2a872..898c6ece 100644 --- a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c +++ b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_SSD1306 #include "drivers/gdisp/SSD1306/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_SSD1306.h" #include <string.h> // for memset diff --git a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c index 5c20d3d6..4ffc9f3c 100644 --- a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c +++ b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_SSD1963 #include "drivers/gdisp/SSD1963/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/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) diff --git a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c index 5a789548..e32e2b12 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c +++ b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_SSD2119 #include "drivers/gdisp/SSD2119/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_SSD2119.h" diff --git a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c index 8d331fbc..686d1aa2 100644 --- a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c +++ b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_ST7565 #include "drivers/gdisp/ST7565/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_ST7565.h" diff --git a/drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c b/drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c index 65e582b2..6330c32a 100644 --- a/drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c +++ b/drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c @@ -20,7 +20,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_STM32F429iDiscovery #include "drivers/gdisp/STM32F429iDiscovery/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "stm32_ltdc.h" diff --git a/drivers/gdisp/TestStub/gdisp_lld_TestStub.c b/drivers/gdisp/TestStub/gdisp_lld_TestStub.c index 4051c818..1d21ab6f 100644 --- a/drivers/gdisp/TestStub/gdisp_lld_TestStub.c +++ b/drivers/gdisp/TestStub/gdisp_lld_TestStub.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_TestStub #include "drivers/gdisp/TestStub/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #ifndef GDISP_SCREEN_HEIGHT #define GDISP_SCREEN_HEIGHT 128 diff --git a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c index 6e38b5f4..79432bcd 100644 --- a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c +++ b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c @@ -16,7 +16,7 @@ typedef struct fbInfo { #define GDISP_DRIVER_VMT GDISPVMT_framebuffer #include "drivers/gdisp/framebuffer/gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "board_framebuffer.h" typedef struct fbPriv { diff --git a/drivers/ginput/dial/GADC/ginput_lld_dial.c b/drivers/ginput/dial/GADC/ginput_lld_dial.c index c07419bc..9ad43748 100644 --- a/drivers/ginput/dial/GADC/ginput_lld_dial.c +++ b/drivers/ginput/dial/GADC/ginput_lld_dial.c @@ -9,7 +9,7 @@ #if GFX_USE_GINPUT && GINPUT_NEED_DIAL -#include "src/ginput/driver_dial.h" +#include "src/ginput/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 f42d222f..96ef071e 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle.c @@ -9,7 +9,7 @@ #if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
-#include "src/ginput/driver_toggle.h"
+#include "src/ginput/ginput_driver_toggle.h"
GINPUT_TOGGLE_DECLARE_STRUCTURE();
diff --git a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c index 31443c45..e9492f55 100644 --- a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c +++ b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c @@ -10,7 +10,7 @@ #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE)
#define GMOUSE_DRIVER_VMT GMOUSEVMT_ADS7843
-#include "src/ginput/driver_mouse.h"
+#include "src/ginput/ginput_driver_mouse.h"
// Get the hardware interface
#include "gmouse_lld_ADS7843_board.h"
diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c index 6b0bcdb2..ba3db50b 100644 --- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c +++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c @@ -10,7 +10,7 @@ #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE #define GMOUSE_DRIVER_VMT GMOUSEVMT_FT5x06 -#include "src/ginput/driver_mouse.h" +#include "src/ginput/ginput_driver_mouse.h" // Get the hardware interface #include "gmouse_lld_FT5x06_board.h" diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c index 12f45645..713b9aad 100644 --- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c +++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c @@ -10,7 +10,7 @@ #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE #define GMOUSE_DRIVER_VMT GMOUSEVMT_MAX11802 -#include "src/ginput/driver_mouse.h" +#include "src/ginput/ginput_driver_mouse.h" // Hardware definitions #include "drivers/ginput/touch/MAX11802/max11802.h" diff --git a/drivers/ginput/touch/MCU/gmouse_lld_MCU.c b/drivers/ginput/touch/MCU/gmouse_lld_MCU.c index babf8bc3..a69ae72e 100644 --- a/drivers/ginput/touch/MCU/gmouse_lld_MCU.c +++ b/drivers/ginput/touch/MCU/gmouse_lld_MCU.c @@ -10,7 +10,7 @@ #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE #define GMOUSE_DRIVER_VMT GMOUSEVMT_MCU -#include "src/ginput/driver_mouse.h" +#include "src/ginput/ginput_driver_mouse.h" // Get the hardware interface #include "gmouse_lld_MCU_board.h" diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c index 27bc280e..353539f9 100644 --- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c +++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c @@ -10,7 +10,7 @@ #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE #define GMOUSE_DRIVER_VMT GMOUSEVMT_STMPE811 -#include "src/ginput/driver_mouse.h" +#include "src/ginput/ginput_driver_mouse.h" // Hardware definitions #include "drivers/ginput/touch/STMPE811/stmpe811.h" diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c index a85fae91..0335feee 100644 --- a/drivers/multiple/Win32/gdisp_lld_Win32.c +++ b/drivers/multiple/Win32/gdisp_lld_Win32.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_Win32 #include "gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" // Configuration parameters for this driver #ifndef GDISP_SCREEN_WIDTH @@ -79,13 +79,13 @@ #if GINPUT_NEED_TOGGLE /* Include toggle support code */ - #include "src/ginput/driver_toggle.h" + #include "src/ginput/ginput_driver_toggle.h" #endif #if GINPUT_NEED_MOUSE // Include mouse support code #define GMOUSE_DRIVER_VMT GMOUSEVMT_Win32 - #include "src/ginput/driver_mouse.h" + #include "src/ginput/ginput_driver_mouse.h" // Forward definitions static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance); @@ -126,14 +126,14 @@ #if GINPUT_NEED_KEYBOARD #define GKEYBOARD_DRIVER_VMT GKEYBOARDVMT_Win32 - #include "src/ginput/driver_keyboard.h" + #include "src/ginput/ginput_driver_keyboard.h" #if !GKEYBOARD_WIN32_NO_LAYOUT #if GKEYBOARD_LAYOUT_OFF #error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_WIN32_NO_LAYOUT=TRUE." #endif - #include "src/ginput/keyboard_microcode.h" + #include "src/ginput/ginput_keyboard_microcode.h" // Forward definitions extern uint8_t GKEYBOARD_WIN32_DEFAULT_LAYOUT[]; diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c index 8a29f033..265d03ee 100644 --- a/drivers/multiple/X/gdisp_lld_X.c +++ b/drivers/multiple/X/gdisp_lld_X.c @@ -17,7 +17,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_X11 #include "gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" // Configuration parameters for this driver #ifndef GDISP_FORCE_24BIT @@ -53,7 +53,7 @@ #if GINPUT_NEED_MOUSE // Include mouse support code #define GMOUSE_DRIVER_VMT GMOUSEVMT_X11 - #include "src/ginput/driver_mouse.h" + #include "src/ginput/ginput_driver_mouse.h" // Forward definitions static bool_t XMouseInit(GMouse *m, unsigned driverinstance); @@ -95,7 +95,7 @@ #if GINPUT_NEED_KEYBOARD // Include mouse support code #define GKEYBOARD_DRIVER_VMT GKEYBOARDVMT_X - #include "src/ginput/driver_keyboard.h" + #include "src/ginput/ginput_driver_keyboard.h" #if !GKEYBOARD_X_NO_LAYOUT #if GKEYBOARD_LAYOUT_OFF @@ -105,7 +105,7 @@ // Forward definitions extern uint8_t GKEYBOARD_X_DEFAULT_LAYOUT[]; - #include "src/ginput/keyboard_microcode.h" + #include "src/ginput/ginput_keyboard_microcode.h" #include <X11/keysym.h> // This is the layout code for the English US keyboard. diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c index 3b42bcda..fbc40916 100644 --- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c +++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c @@ -11,7 +11,7 @@ #define GDISP_DRIVER_VMT GDISPVMT_uGFXnet #include "gdisp_lld_config.h" -#include "src/gdisp/driver.h" +#include "src/gdisp/gdisp_driver.h" #include "uGFXnetProtocol.h" #ifndef GDISP_SCREEN_WIDTH @@ -36,7 +36,7 @@ #if GINPUT_NEED_MOUSE // Include mouse support code #define GMOUSE_DRIVER_VMT GMOUSEVMT_uGFXnet - #include "src/ginput/driver_mouse.h" + #include "src/ginput/ginput_driver_mouse.h" // Forward definitions static bool_t NMouseInit(GMouse *m, unsigned driverinstance); |