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 | |
| 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).
149 files changed, 251 insertions, 360 deletions
diff --git a/demos/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c index 13136a57..39924032 100644 --- a/demos/tools/touch_driver_test/main.c +++ b/demos/tools/touch_driver_test/main.c @@ -30,8 +30,8 @@ #include "gfx.h" // We get nasty and look at some internal structures - get the relevant information -#include "src/gdriver/sys_defs.h" -#include "src/ginput/driver_mouse.h" +#include "src/gdriver/gdriver.h" +#include "src/ginput/ginput_driver_mouse.h" #include <string.h> diff --git a/demos/tools/touch_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c index d6c97920..fb1b0772 100644 --- a/demos/tools/touch_raw_readings/main.c +++ b/demos/tools/touch_raw_readings/main.c @@ -30,8 +30,8 @@ #include "gfx.h" // We get nasty and look at some internal structures - get the relevant information -#include "src/gdriver/sys_defs.h" -#include "src/ginput/driver_mouse.h" +#include "src/gdriver/gdriver.h" +#include "src/ginput/ginput_driver_mouse.h" #include <string.h> diff --git a/docs/src/containers.dox b/docs/src/containers.dox index 3d0a6368..e8d6452c 100644 --- a/docs/src/containers.dox +++ b/docs/src/containers.dox @@ -6,7 +6,7 @@ */ /** - * @file src/gwin/sys_defs.h + * @file src/gwin/gwin.h * * @defgroup Containers Containers * @ingroup GWIN diff --git a/docs/src/widgets.dox b/docs/src/widgets.dox index 24be391d..4626508c 100644 --- a/docs/src/widgets.dox +++ b/docs/src/widgets.dox @@ -6,7 +6,7 @@ */ /** - * @file src/gwin/sys_defs.h + * @file src/gwin/gwin.h * * @defgroup Widgets Widgets * @ingroup GWIN diff --git a/docs/src/windows.dox b/docs/src/windows.dox index 699281a2..c5acc31f 100644 --- a/docs/src/windows.dox +++ b/docs/src/windows.dox @@ -6,7 +6,7 @@ */ /** - * @file src/gwin/sys_defs.h + * @file src/gwin/gwin.h * * @defgroup Windows Windows * @ingroup GWIN 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); @@ -161,18 +161,18 @@ * Get all the options for each sub-system. * */ -#include "src/gos/sys_options.h" -#include "src/gdriver/sys_options.h" -#include "src/gfile/sys_options.h" -#include "src/gmisc/sys_options.h" -#include "src/gqueue/sys_options.h" -#include "src/gevent/sys_options.h" -#include "src/gtimer/sys_options.h" -#include "src/gdisp/sys_options.h" -#include "src/gwin/sys_options.h" -#include "src/ginput/sys_options.h" -#include "src/gadc/sys_options.h" -#include "src/gaudio/sys_options.h" +#include "src/gos/gos_options.h" +#include "src/gdriver/gdriver_options.h" +#include "src/gfile/gfile_options.h" +#include "src/gmisc/gmisc_options.h" +#include "src/gqueue/gqueue_options.h" +#include "src/gevent/gevent_options.h" +#include "src/gtimer/gtimer_options.h" +#include "src/gdisp/gdisp_options.h" +#include "src/gwin/gwin_options.h" +#include "src/ginput/ginput_options.h" +#include "src/gadc/gadc_options.h" +#include "src/gaudio/gaudio_options.h" /** * Interdependency safety checks on the sub-systems. @@ -182,34 +182,34 @@ #ifndef GFX_DISPLAY_RULE_WARNINGS #define GFX_DISPLAY_RULE_WARNINGS FALSE #endif -#include "src/gwin/sys_rules.h" -#include "src/ginput/sys_rules.h" -#include "src/gdisp/sys_rules.h" -#include "src/gaudio/sys_rules.h" -#include "src/gadc/sys_rules.h" -#include "src/gevent/sys_rules.h" -#include "src/gtimer/sys_rules.h" -#include "src/gqueue/sys_rules.h" -#include "src/gmisc/sys_rules.h" -#include "src/gfile/sys_rules.h" -#include "src/gdriver/sys_rules.h" -#include "src/gos/sys_rules.h" +#include "src/gwin/gwin_rules.h" +#include "src/ginput/ginput_rules.h" +#include "src/gdisp/gdisp_rules.h" +#include "src/gaudio/gaudio_rules.h" +#include "src/gadc/gadc_rules.h" +#include "src/gevent/gevent_rules.h" +#include "src/gtimer/gtimer_rules.h" +#include "src/gqueue/gqueue_rules.h" +#include "src/gmisc/gmisc_rules.h" +#include "src/gfile/gfile_rules.h" +#include "src/gdriver/gdriver_rules.h" +#include "src/gos/gos_rules.h" /** * Include the sub-system header files */ -#include "src/gos/sys_defs.h" -//#include "src/gdriver/sys_defs.h" // This module is only included by source that needs it. -#include "src/gfile/sys_defs.h" -#include "src/gmisc/sys_defs.h" -#include "src/gqueue/sys_defs.h" -#include "src/gevent/sys_defs.h" -#include "src/gtimer/sys_defs.h" -#include "src/gdisp/sys_defs.h" -#include "src/gwin/sys_defs.h" -#include "src/ginput/sys_defs.h" -#include "src/gadc/sys_defs.h" -#include "src/gaudio/sys_defs.h" +#include "src/gos/gos.h" +//#include "src/gdriver/gdriver.h" // This module is only included by source that needs it. +#include "src/gfile/gfile.h" +#include "src/gmisc/gmisc.h" +#include "src/gqueue/gqueue.h" +#include "src/gevent/gevent.h" +#include "src/gtimer/gtimer.h" +#include "src/gdisp/gdisp.h" +#include "src/gwin/gwin.h" +#include "src/ginput/ginput.h" +#include "src/gadc/gadc.h" +#include "src/gaudio/gaudio.h" #ifdef __cplusplus extern "C" { @@ -1,18 +1,18 @@ GFXINC += $(GFXLIB)
GFXSRC += $(GFXLIB)/src/gfx.c
-include $(GFXLIB)/src/gos/sys_make.mk
-include $(GFXLIB)/src/gdriver/sys_make.mk
-include $(GFXLIB)/src/gqueue/sys_make.mk
-include $(GFXLIB)/src/gdisp/sys_make.mk
-include $(GFXLIB)/src/gevent/sys_make.mk
-include $(GFXLIB)/src/gtimer/sys_make.mk
-include $(GFXLIB)/src/gwin/sys_make.mk
-include $(GFXLIB)/src/ginput/sys_make.mk
-include $(GFXLIB)/src/gadc/sys_make.mk
-include $(GFXLIB)/src/gaudio/sys_make.mk
-include $(GFXLIB)/src/gmisc/sys_make.mk
-include $(GFXLIB)/src/gfile/sys_make.mk
+include $(GFXLIB)/src/gos/gos.mk
+include $(GFXLIB)/src/gdriver/gdriver.mk
+include $(GFXLIB)/src/gqueue/gqueue.mk
+include $(GFXLIB)/src/gdisp/gdisp.mk
+include $(GFXLIB)/src/gevent/gevent.mk
+include $(GFXLIB)/src/gtimer/gtimer.mk
+include $(GFXLIB)/src/gwin/gwin.mk
+include $(GFXLIB)/src/ginput/ginput.mk
+include $(GFXLIB)/src/gadc/gadc.mk
+include $(GFXLIB)/src/gaudio/gaudio.mk
+include $(GFXLIB)/src/gmisc/gmisc.mk
+include $(GFXLIB)/src/gfile/gfile.mk
# Include the boards and drivers
ifneq ($(GFXBOARD),)
diff --git a/src/gadc/gadc_gadc.c b/src/gadc/gadc.c index 5ac8e53c..ec0bc880 100644 --- a/src/gadc/gadc_gadc.c +++ b/src/gadc/gadc.c @@ -5,19 +5,12 @@ * http://ugfx.org/license.html */ -/** - * @file src/gadc/gadc_gadc.c - * @brief GADC sub-system code. - * - * @addtogroup GADC - * @{ - */ #include "gfx.h" #if GFX_USE_GADC /* Include the driver defines */ -#include "driver.h" +#include "gadc_driver.h" #if GADC_MAX_HIGH_SPEED_SAMPLERATE > GADC_MAX_SAMPLE_FREQUENCY/2 #error "GADC: GADC_MAX_HIGH_SPEED_SAMPLERATE has been set too high. It must be less than half the maximum CPU rate" @@ -358,5 +351,3 @@ bool_t gadcLowSpeedStart(uint32_t physdev, adcsample_t *buffer, GADCCallbackFunc } #endif /* GFX_USE_GADC */ -/** @} */ - diff --git a/src/gadc/sys_defs.h b/src/gadc/gadc.h index 1f40f6df..461e490e 100644 --- a/src/gadc/sys_defs.h +++ b/src/gadc/gadc.h @@ -6,7 +6,7 @@ */ /** - * @file src/gadc/sys_defs.h + * @file src/gadc/gadc.h * * @addtogroup GADC * diff --git a/src/gadc/gadc.mk b/src/gadc/gadc.mk new file mode 100644 index 00000000..05b1e9cc --- /dev/null +++ b/src/gadc/gadc.mk @@ -0,0 +1 @@ +GFXSRC += $(GFXLIB)/src/gadc/gadc.c diff --git a/src/gadc/driver.h b/src/gadc/gadc_driver.h index 77604b9f..7c72dfd4 100644 --- a/src/gadc/driver.h +++ b/src/gadc/gadc_driver.h @@ -6,7 +6,7 @@ */ /** - * @file src/gadc/driver.h + * @file src/gadc/gadc_driver.h * @brief GADC - Periodic ADC driver header file. * * @defgroup Driver Driver diff --git a/src/gadc/sys_options.h b/src/gadc/gadc_options.h index d9519c39..18c5038c 100644 --- a/src/gadc/sys_options.h +++ b/src/gadc/gadc_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gadc/sys_options.h + * @file src/gadc/gadc_options.h * @brief GADC - Periodic ADC subsystem options header file. * * @addtogroup GADC diff --git a/src/gadc/sys_rules.h b/src/gadc/gadc_rules.h index 363b2434..d6c6e5ee 100644 --- a/src/gadc/sys_rules.h +++ b/src/gadc/gadc_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gadc/sys_rules.h + * @file src/gadc/gadc_rules.h * @brief GADC safety rules header file. * * @addtogroup GADC diff --git a/src/gadc/sys_make.mk b/src/gadc/sys_make.mk deleted file mode 100644 index 21a07dbe..00000000 --- a/src/gadc/sys_make.mk +++ /dev/null @@ -1 +0,0 @@ -GFXSRC += $(GFXLIB)/src/gadc/gadc_gadc.c diff --git a/src/gaudio/gaudio_gaudio.c b/src/gaudio/gaudio.c index bb12e6d2..0abc9382 100644 --- a/src/gaudio/gaudio_gaudio.c +++ b/src/gaudio/gaudio.c @@ -5,19 +5,12 @@ * http://ugfx.org/license.html */ -/** - * @file src/gaudio/gaudio_gaudio.c - * @brief GAUDIO sub-system code. - * - * @addtogroup GAUDIO - * @{ - */ #include "gfx.h" #if GFX_USE_GAUDIO #if GAUDIO_NEED_PLAY - #include "driver_play.h" + #include "gaudio_driver_play.h" static gfxQueueASync playList; static gfxSem playComplete; @@ -32,7 +25,7 @@ #endif #if GAUDIO_NEED_RECORD - #include "driver_record.h" + #include "gaudio_driver_record.h" static gfxQueueGSync recordList; static uint16_t recordFlags; @@ -280,4 +273,3 @@ void _gaudioDeinit(void) #endif #endif /* GFX_USE_GAUDIO */ -/** @} */ diff --git a/src/gaudio/sys_defs.h b/src/gaudio/gaudio.h index 5a43af18..23403b15 100644 --- a/src/gaudio/sys_defs.h +++ b/src/gaudio/gaudio.h @@ -6,7 +6,7 @@ */ /** - * @file src/gaudio/sys_defs.h + * @file src/gaudio/gaudio.h * * @addtogroup GAUDIO * diff --git a/src/gaudio/gaudio.mk b/src/gaudio/gaudio.mk new file mode 100644 index 00000000..438892c0 --- /dev/null +++ b/src/gaudio/gaudio.mk @@ -0,0 +1 @@ +GFXSRC += $(GFXLIB)/src/gaudio/gaudio.c diff --git a/src/gaudio/driver_play.h b/src/gaudio/gaudio_driver_play.h index 343a0fed..fced1210 100644 --- a/src/gaudio/driver_play.h +++ b/src/gaudio/gaudio_driver_play.h @@ -6,7 +6,7 @@ */ /** - * @file src/gaudio/driver_play.h + * @file src/gaudio/gaudio_driver_play.h * @brief GAUDIO - Audio play driver header file. * * @defgroup Driver Driver diff --git a/src/gaudio/driver_record.h b/src/gaudio/gaudio_driver_record.h index 20136dd7..280be5d1 100644 --- a/src/gaudio/driver_record.h +++ b/src/gaudio/gaudio_driver_record.h @@ -6,7 +6,7 @@ */ /** - * @file src/gaudio/driver_record.h + * @file src/gaudio/gaudio_driver_record.h * @brief GAUDIO - Audio Recording driver header file. * * @defgroup Driver Driver diff --git a/src/gaudio/sys_options.h b/src/gaudio/gaudio_options.h index eb903424..d6dfb105 100644 --- a/src/gaudio/sys_options.h +++ b/src/gaudio/gaudio_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gaudio/sys_options.h + * @file src/gaudio/gaudio_options.h * @brief GAUDIO - Audio subsystem options header file. * * @addtogroup GAUDIO diff --git a/src/gaudio/sys_rules.h b/src/gaudio/gaudio_rules.h index 4786fa5f..2dbad17d 100644 --- a/src/gaudio/sys_rules.h +++ b/src/gaudio/gaudio_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gaudio/sys_rules.h + * @file src/gaudio/gaudio_rules.h * @brief GAUDIO safety rules header file. * * @addtogroup GAUDIO diff --git a/src/gaudio/sys_make.mk b/src/gaudio/sys_make.mk deleted file mode 100644 index ea02e010..00000000 --- a/src/gaudio/sys_make.mk +++ /dev/null @@ -1 +0,0 @@ -GFXSRC += $(GFXLIB)/src/gaudio/gaudio_gaudio.c diff --git a/src/gdisp/gdisp_gdisp.c b/src/gdisp/gdisp.c index 8910bcf1..cebed1ef 100644 --- a/src/gdisp/gdisp_gdisp.c +++ b/src/gdisp/gdisp.c @@ -5,19 +5,12 @@ * http://ugfx.org/license.html */ -/** - * @file src/gdisp/gdisp_gdisp.c - * @brief GDISP Driver code. - * - * @addtogroup GDISP - * @{ - */ #include "gfx.h" #if GFX_USE_GDISP /* Include the low level driver information */ -#include "driver.h" +#include "gdisp_driver.h" #if 1 #undef INLINE @@ -3375,4 +3368,3 @@ color_t gdispContrastColor(color_t color) { #endif #endif /* GFX_USE_GDISP */ -/** @} */ diff --git a/src/gdisp/sys_defs.h b/src/gdisp/gdisp.h index 6b77bab8..aaf53478 100644 --- a/src/gdisp/sys_defs.h +++ b/src/gdisp/gdisp.h @@ -6,7 +6,7 @@ */ /** - * @file src/gdisp/sys_defs.h + * @file src/gdisp/gdisp.h * @brief GDISP Graphic Driver subsystem header file. * * @addtogroup GDISP diff --git a/src/gdisp/sys_make.mk b/src/gdisp/gdisp.mk index 34710597..3c8af80a 100644 --- a/src/gdisp/sys_make.mk +++ b/src/gdisp/gdisp.mk @@ -1,4 +1,4 @@ -GFXSRC += $(GFXLIB)/src/gdisp/gdisp_gdisp.c \ +GFXSRC += $(GFXLIB)/src/gdisp/gdisp.c \ $(GFXLIB)/src/gdisp/gdisp_fonts.c \ $(GFXLIB)/src/gdisp/gdisp_pixmap.c \ $(GFXLIB)/src/gdisp/gdisp_image.c \ diff --git a/src/gdisp/driver.h b/src/gdisp/gdisp_driver.h index efcb2872..085e248f 100644 --- a/src/gdisp/driver.h +++ b/src/gdisp/gdisp_driver.h @@ -6,7 +6,7 @@ */ /** - * @file src/gdisp/driver.h + * @file src/gdisp/gdisp_driver.h * @brief GDISP Graphic Driver subsystem low level driver header. * * @addtogroup GDISP @@ -19,7 +19,7 @@ #if GFX_USE_GDISP // Include the GDRIVER infrastructure -#include "src/gdriver/sys_defs.h" +#include "src/gdriver/gdriver.h" // Are we currently compiling the driver itself? #if defined(GDISP_DRIVER_VMT) diff --git a/src/gdisp/gdisp_fonts.c b/src/gdisp/gdisp_fonts.c index cdb8e075..81df08ec 100644 --- a/src/gdisp/gdisp_fonts.c +++ b/src/gdisp/gdisp_fonts.c @@ -5,14 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gdisp/gdisp_fonts.c - * @brief GDISP Font Handling. - * - * @addtogroup GDISP - * @{ - */ - #include "gfx.h" #if GFX_USE_GDISP && GDISP_NEED_TEXT @@ -93,4 +85,3 @@ const char *gdispGetFontName(font_t font) { } #endif /* GFX_USE_GDISP && GDISP_NEED_TEXT */ -/** @} */ diff --git a/src/gdisp/gdisp_image.c b/src/gdisp/gdisp_image.c index 2851a7c8..35020634 100644 --- a/src/gdisp/gdisp_image.c +++ b/src/gdisp/gdisp_image.c @@ -5,13 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gdisp/gdisp_image.c - * @brief GDISP generic image code. - * - * @defgroup Image Image - * @ingroup GDISP - */ #include "gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE @@ -230,4 +223,3 @@ void gdispImageFree(gdispImage *img, void *ptr, size_t sz) { } #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE */ -/** @} */ diff --git a/src/gdisp/gdisp_image_bmp.c b/src/gdisp/gdisp_image_bmp.c index d4507ee2..9fc0e13a 100644 --- a/src/gdisp/gdisp_image_bmp.c +++ b/src/gdisp/gdisp_image_bmp.c @@ -5,42 +5,10 @@ * http://ugfx.org/license.html */ -/** - * @file src/gdisp/gdisp_image_bmp.c - * @brief GDISP native image code. - * - * @defgroup Image Image - * @ingroup GDISP - */ #include "gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP -#ifndef GDISP_NEED_IMAGE_BMP_1 - #define GDISP_NEED_IMAGE_BMP_1 TRUE -#endif -#ifndef GDISP_NEED_IMAGE_BMP_4 - #define GDISP_NEED_IMAGE_BMP_4 TRUE -#endif -#ifndef GDISP_NEED_IMAGE_BMP_4_RLE - #define GDISP_NEED_IMAGE_BMP_4_RLE TRUE -#endif -#ifndef GDISP_NEED_IMAGE_BMP_8 - #define GDISP_NEED_IMAGE_BMP_8 TRUE -#endif -#ifndef GDISP_NEED_IMAGE_BMP_8_RLE - #define GDISP_NEED_IMAGE_BMP_8_RLE TRUE -#endif -#ifndef GDISP_NEED_IMAGE_BMP_16 - #define GDISP_NEED_IMAGE_BMP_16 TRUE -#endif -#ifndef GDISP_NEED_IMAGE_BMP_24 - #define GDISP_NEED_IMAGE_BMP_24 TRUE -#endif -#ifndef GDISP_NEED_IMAGE_BMP_32 - #define GDISP_NEED_IMAGE_BMP_32 TRUE -#endif - /** * Helper Routines Needed */ @@ -901,4 +869,3 @@ delaytime_t gdispImageNext_BMP(gdispImage *img) { } #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP */ -/** @} */ diff --git a/src/gdisp/gdisp_image_gif.c b/src/gdisp/gdisp_image_gif.c index 8ea9beb2..d5c6b3ca 100644 --- a/src/gdisp/gdisp_image_gif.c +++ b/src/gdisp/gdisp_image_gif.c @@ -5,13 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gdisp/gdisp_image_gif.c - * @brief GDISP native image code. - * - * @defgroup Image Image - * @ingroup GDISP -*/ #include "gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF @@ -1205,4 +1198,3 @@ delaytime_t gdispImageNext_GIF(gdispImage *img) { } #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF */ -/** @} */ diff --git a/src/gdisp/gdisp_image_jpg.c b/src/gdisp/gdisp_image_jpg.c index f20884bc..02ec9a8f 100644 --- a/src/gdisp/gdisp_image_jpg.c +++ b/src/gdisp/gdisp_image_jpg.c @@ -5,10 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gdisp/gdisp_image_jpg.c - * @brief GDISP native image code. - */ #include "gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG @@ -16,4 +12,3 @@ #error "JPG support not implemented yet" #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG */ -/** @} */ diff --git a/src/gdisp/gdisp_image_native.c b/src/gdisp/gdisp_image_native.c index 21dcb0fc..ec22f386 100644 --- a/src/gdisp/gdisp_image_native.c +++ b/src/gdisp/gdisp_image_native.c @@ -5,10 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gdisp/gdisp_image_native.c - * @brief GDISP native image code. - */ #include "gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE @@ -142,4 +138,3 @@ delaytime_t gdispImageNext_NATIVE(gdispImage *img) { } #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE */ -/** @} */ diff --git a/src/gdisp/gdisp_image_png.c b/src/gdisp/gdisp_image_png.c index 5d2c1450..6538b2ff 100644 --- a/src/gdisp/gdisp_image_png.c +++ b/src/gdisp/gdisp_image_png.c @@ -5,10 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gdisp/gdisp_image_png.c - * @brief GDISP native image code. - */ #include "gfx.h" #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG @@ -16,4 +12,3 @@ #error "PNG support not implemented yet" #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG */ -/** @} */ diff --git a/src/gdisp/sys_options.h b/src/gdisp/gdisp_options.h index ebb054e1..51d759d8 100644 --- a/src/gdisp/sys_options.h +++ b/src/gdisp/gdisp_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gdisp/sys_options.h + * @file src/gdisp/gdisp_options.h * @brief GDISP sub-system options header file. * * @addtogroup GDISP @@ -320,6 +320,69 @@ /** * @} * + * @name GDISP BMP Image Options + * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_BMP must be TRUE + * @{ + */ + /** + * @brief Is BMP 1 bit per pixel (monochrome/2 color) image decoding required. + * @details Defaults to TRUE + */ + #ifndef GDISP_NEED_IMAGE_BMP_1 + #define GDISP_NEED_IMAGE_BMP_1 TRUE + #endif + /** + * @brief Is BMP 4 bits per pixel (16 color) image decoding required. + * @details Defaults to TRUE + */ + #ifndef GDISP_NEED_IMAGE_BMP_4 + #define GDISP_NEED_IMAGE_BMP_4 TRUE + #endif + /** + * @brief Is BMP 4 bits per pixel (16 color) with RLE compression image decoding required. + * @details Defaults to TRUE + */ + #ifndef GDISP_NEED_IMAGE_BMP_4_RLE + #define GDISP_NEED_IMAGE_BMP_4_RLE TRUE + #endif + /** + * @brief Is BMP 8 bits per pixel (256 color) image decoding required. + * @details Defaults to TRUE + */ + #ifndef GDISP_NEED_IMAGE_BMP_8 + #define GDISP_NEED_IMAGE_BMP_8 TRUE + #endif + /** + * @brief Is BMP 8 bits per pixel (256 color) with RLE compression image decoding required. + * @details Defaults to TRUE + */ + #ifndef GDISP_NEED_IMAGE_BMP_8_RLE + #define GDISP_NEED_IMAGE_BMP_8_RLE TRUE + #endif + /** + * @brief Is BMP 16 bits per pixel (65536 color) image decoding required. + * @details Defaults to TRUE + */ + #ifndef GDISP_NEED_IMAGE_BMP_16 + #define GDISP_NEED_IMAGE_BMP_16 TRUE + #endif + /** + * @brief Is BMP 24 bits per pixel (true-color) image decoding required. + * @details Defaults to TRUE + */ + #ifndef GDISP_NEED_IMAGE_BMP_24 + #define GDISP_NEED_IMAGE_BMP_24 TRUE + #endif + /** + * @brief Is BMP 32 bits per pixel (true-color) image decoding required. + * @details Defaults to TRUE + */ + #ifndef GDISP_NEED_IMAGE_BMP_32 + #define GDISP_NEED_IMAGE_BMP_32 TRUE + #endif +/** + * @} + * * @name GDISP Text Rendering Options * @{ */ diff --git a/src/gdisp/gdisp_pixmap.c b/src/gdisp/gdisp_pixmap.c index d088a57b..b6226289 100644 --- a/src/gdisp/gdisp_pixmap.c +++ b/src/gdisp/gdisp_pixmap.c @@ -39,8 +39,8 @@ #error "GDISP Pixmap: Pixmap's do not currently support the specified GDISP_LLD_PIXELFORMAT" #endif -#include "src/gdisp/driver.h" -#include "src/gdriver/sys_defs.h" +#include "src/gdisp/gdisp_driver.h" +#include "src/gdriver/gdriver.h" typedef struct pixmap { #if GDISP_NEED_PIXMAP_IMAGE diff --git a/src/gdisp/sys_rules.h b/src/gdisp/gdisp_rules.h index 79df2d88..3e5051e5 100644 --- a/src/gdisp/sys_rules.h +++ b/src/gdisp/gdisp_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gdisp/sys_rules.h + * @file src/gdisp/gdisp_rules.h * @brief GDISP safety rules header file. * * @addtogroup GDISP diff --git a/src/gdriver/gdriver_gdriver.c b/src/gdriver/gdriver.c index 210840b1..d0324639 100644 --- a/src/gdriver/gdriver_gdriver.c +++ b/src/gdriver/gdriver.c @@ -9,7 +9,7 @@ #if GFX_USE_GDRIVER -#include "sys_defs.h" +#include "gdriver.h" #include <string.h> // For memset diff --git a/src/gdriver/sys_defs.h b/src/gdriver/gdriver.h index 4ac20b19..6f245ef1 100644 --- a/src/gdriver/sys_defs.h +++ b/src/gdriver/gdriver.h @@ -6,7 +6,7 @@ */ /** - * @file src/gdriver/sys_defs.h + * @file src/gdriver/gdriver.h * * @addtogroup GDRIVER * @@ -23,7 +23,7 @@ * @note If there is only a single device of a particular type it will automatically * register that device (it only needs to be included in the build, no special * configuration is required) - * @note This module sys_defs.h file is NOT included in the general gfx.h file. + * @note This module gdriver.h file is NOT included in the general gfx.h file. * Instead it is included in each driver type's driver API. * * @pre GFX_USE_GDRIVER must be set to TRUE in your gfxconf.h diff --git a/src/gdriver/gdriver.mk b/src/gdriver/gdriver.mk new file mode 100644 index 00000000..663042af --- /dev/null +++ b/src/gdriver/gdriver.mk @@ -0,0 +1 @@ +GFXSRC += $(GFXLIB)/src/gdriver/gdriver.c diff --git a/src/gdriver/sys_options.h b/src/gdriver/gdriver_options.h index bef0a95a..ca3fe1f1 100644 --- a/src/gdriver/sys_options.h +++ b/src/gdriver/gdriver_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gdriver/sys_options.h + * @file src/gdriver/gdriver_options.h * @brief GDRIVER - Driver options header file. * * @addtogroup GDRIVER diff --git a/src/gdriver/sys_rules.h b/src/gdriver/gdriver_rules.h index 596babba..2aaffa1b 100644 --- a/src/gdriver/sys_rules.h +++ b/src/gdriver/gdriver_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gdriver/sys_rules.h + * @file src/gdriver/gdriver_rules.h * @brief GDRIVER safety rules header file. * * @addtogroup GFILE diff --git a/src/gdriver/sys_make.mk b/src/gdriver/sys_make.mk deleted file mode 100644 index 93810aa9..00000000 --- a/src/gdriver/sys_make.mk +++ /dev/null @@ -1 +0,0 @@ -GFXSRC += $(GFXLIB)/src/gdriver/gdriver_gdriver.c diff --git a/src/gevent/gevent_gevent.c b/src/gevent/gevent.c index fc45102e..bb57b3ad 100644 --- a/src/gevent/gevent_gevent.c +++ b/src/gevent/gevent.c @@ -5,13 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gevent/gevent_gevent.c - * @brief GEVENT Driver code. - * - * @addtogroup GEVENT - * @{ - */ #include "gfx.h" #if GFX_USE_GEVENT || defined(__DOXYGEN__) @@ -243,4 +236,3 @@ void geventDetachSourceListeners(GSourceHandle gsh) { } #endif /* GFX_USE_GEVENT */ -/** @} */ diff --git a/src/gevent/sys_defs.h b/src/gevent/gevent.h index 9f1f4dde..a33fd84a 100644 --- a/src/gevent/sys_defs.h +++ b/src/gevent/gevent.h @@ -6,7 +6,7 @@ */ /** - * @file src/gevent/sys_defs.h + * @file src/gevent/gevent.h * * @addtogroup GEVENT * diff --git a/src/gevent/gevent.mk b/src/gevent/gevent.mk new file mode 100644 index 00000000..5744ae46 --- /dev/null +++ b/src/gevent/gevent.mk @@ -0,0 +1 @@ +GFXSRC += $(GFXLIB)/src/gevent/gevent.c diff --git a/src/gevent/sys_options.h b/src/gevent/gevent_options.h index 6a58103f..7f68fd32 100644 --- a/src/gevent/sys_options.h +++ b/src/gevent/gevent_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gevent/sys_options.h + * @file src/gevent/gevent_options.h * @brief GEVENT sub-system options header file. * * @addtogroup GEVENT diff --git a/src/gevent/sys_rules.h b/src/gevent/gevent_rules.h index 8cf7e9b4..8dc12c8d 100644 --- a/src/gevent/sys_rules.h +++ b/src/gevent/gevent_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gevent/sys_rules.h + * @file src/gevent/gevent_rules.h * @brief GEVENT safety rules header file. * * @addtogroup GEVENT diff --git a/src/gevent/sys_make.mk b/src/gevent/sys_make.mk deleted file mode 100644 index f8b88e56..00000000 --- a/src/gevent/sys_make.mk +++ /dev/null @@ -1 +0,0 @@ -GFXSRC += $(GFXLIB)/src/gevent/gevent_gevent.c diff --git a/src/gfile/gfile_gfile.c b/src/gfile/gfile.c index 3547f861..4c22e6cc 100644 --- a/src/gfile/gfile_gfile.c +++ b/src/gfile/gfile.c @@ -5,12 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gfile/gfile_gfile.c - * @brief GFILE code. - * - */ - #include "gfx.h" #if GFX_USE_GFILE diff --git a/src/gfile/sys_defs.h b/src/gfile/gfile.h index 2c475b40..f332db4c 100644 --- a/src/gfile/sys_defs.h +++ b/src/gfile/gfile.h @@ -6,7 +6,7 @@ */ /** - * @file src/gfile/sys_defs.h + * @file src/gfile/gfile.h * @brief GFILE - File IO Routines header file. * * @addtogroup GFILE diff --git a/src/gfile/sys_make.mk b/src/gfile/gfile.mk index 0a85d1ae..8f20b5ce 100644 --- a/src/gfile/sys_make.mk +++ b/src/gfile/gfile.mk @@ -1,4 +1,4 @@ -GFXSRC += $(GFXLIB)/src/gfile/gfile_gfile.c \ +GFXSRC += $(GFXLIB)/src/gfile/gfile.c \ $(GFXLIB)/src/gfile/gfile_fs_native.c \ $(GFXLIB)/src/gfile/gfile_fs_ram.c \ $(GFXLIB)/src/gfile/gfile_fs_rom.c \ diff --git a/src/gfile/gfile_fatfs_diskio_chibios.c b/src/gfile/gfile_fatfs_diskio_chibios.c index 46ddbb7e..319d1a86 100644 --- a/src/gfile/gfile_fatfs_diskio_chibios.c +++ b/src/gfile/gfile_fatfs_diskio_chibios.c @@ -5,12 +5,6 @@ /* disk I/O modules and attach it to FatFs module with common interface. */ /*-----------------------------------------------------------------------*/ -/** - * @file src/gfile/gfile_fatfs_diskio_chibios.c - * @brief GFILE FATFS wrapper. - * - */ - #include "gfx.h" #if GFX_USE_GFILE && GFILE_NEED_FATFS && GFX_USE_OS_CHIBIOS diff --git a/src/gfile/gfile_fatfs_wrapper.c b/src/gfile/gfile_fatfs_wrapper.c index edcab056..fb5e6ec2 100644 --- a/src/gfile/gfile_fatfs_wrapper.c +++ b/src/gfile/gfile_fatfs_wrapper.c @@ -5,12 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gfile/gfile_fatfs_wrapper.c - * @brief GFILE FATFS wrapper. - * - */ - #include "gfx.h" #if GFX_USE_GFILE && GFILE_NEED_FATFS diff --git a/src/gfile/sys_options.h b/src/gfile/gfile_options.h index 5581b13b..06781f38 100644 --- a/src/gfile/sys_options.h +++ b/src/gfile/gfile_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gfile/sys_options.h + * @file src/gfile/gfile_options.h * @brief GFILE - File IO options header file. * * @addtogroup GFILE diff --git a/src/gfile/gfile_petitfs_diskio_chibios.c b/src/gfile/gfile_petitfs_diskio_chibios.c index 90e709e4..7aa236ba 100644 --- a/src/gfile/gfile_petitfs_diskio_chibios.c +++ b/src/gfile/gfile_petitfs_diskio_chibios.c @@ -5,12 +5,6 @@ /* disk I/O modules and attach it to FatFs module with common interface. */ /*-----------------------------------------------------------------------*/ -/** - * @file src/gfile/gfile_petitfs_diskio_chibios.c - * @brief GFILE FATFS wrapper. - * - */ - #include "gfx.h" #if GFX_USE_GFILE && GFILE_NEED_PETITFS && GFX_USE_OS_CHIBIOS diff --git a/src/gfile/gfile_petitfs_wrapper.c b/src/gfile/gfile_petitfs_wrapper.c index 8efc7eb9..b7bc0ee1 100644 --- a/src/gfile/gfile_petitfs_wrapper.c +++ b/src/gfile/gfile_petitfs_wrapper.c @@ -5,12 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gfile/gfile_petitfs_wrapper.c - * @brief GFILE PETITFS wrapper. - * - */ - #include "gfx.h" #if GFX_USE_GFILE && GFILE_NEED_PETITFS diff --git a/src/gfile/sys_rules.h b/src/gfile/gfile_rules.h index d13041f2..949a500c 100644 --- a/src/gfile/sys_rules.h +++ b/src/gfile/gfile_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gfile/sys_rules.h + * @file src/gfile/gfile_rules.h * @brief GFILE safety rules header file. * * @addtogroup GFILE diff --git a/src/ginput/ginput_ginput.c b/src/ginput/ginput.c index becefc19..becefc19 100644 --- a/src/ginput/ginput_ginput.c +++ b/src/ginput/ginput.c diff --git a/src/ginput/sys_defs.h b/src/ginput/ginput.h index cab1e15d..469a10d1 100644 --- a/src/ginput/sys_defs.h +++ b/src/ginput/ginput.h @@ -6,7 +6,7 @@ */ /** - * @file src/ginput/sys_defs.h + * @file src/ginput/ginput.h * * @addtogroup GINPUT * diff --git a/src/ginput/sys_make.mk b/src/ginput/ginput.mk index 6adb2e4c..c814afa2 100644 --- a/src/ginput/sys_make.mk +++ b/src/ginput/ginput.mk @@ -1,6 +1,6 @@ -GFXSRC += $(GFXLIB)/src/ginput/ginput_ginput.c \ +GFXSRC += $(GFXLIB)/src/ginput/ginput.c \ $(GFXLIB)/src/ginput/ginput_mouse.c \ $(GFXLIB)/src/ginput/ginput_keyboard.c \ - $(GFXLIB)/src/ginput/keyboard_microcode.c \ + $(GFXLIB)/src/ginput/ginput_keyboard_microcode.c \ $(GFXLIB)/src/ginput/ginput_toggle.c \ $(GFXLIB)/src/ginput/ginput_dial.c diff --git a/src/ginput/ginput_dial.c b/src/ginput/ginput_dial.c index 6af89b31..6c4f872b 100644 --- a/src/ginput/ginput_dial.c +++ b/src/ginput/ginput_dial.c @@ -17,7 +17,7 @@ #if GFX_USE_GINPUT && GINPUT_NEED_DIAL -#include "driver_dial.h" +#include "ginput_driver_dial.h" static GTIMER_DECL(DialTimer); static struct DialStatus_t { diff --git a/src/ginput/driver_dial.h b/src/ginput/ginput_driver_dial.h index bf01da20..146ffc8d 100644 --- a/src/ginput/driver_dial.h +++ b/src/ginput/ginput_driver_dial.h @@ -6,7 +6,7 @@ */ /** - * @file src/ginput/driver_dial.h + * @file src/ginput/ginput_driver_dial.h * @brief GINPUT header file for dial drivers. * * @defgroup Dial Dial diff --git a/src/ginput/driver_keyboard.h b/src/ginput/ginput_driver_keyboard.h index 329df97a..62a00339 100644 --- a/src/ginput/driver_keyboard.h +++ b/src/ginput/ginput_driver_keyboard.h @@ -6,7 +6,7 @@ */ /** - * @file src/ginput/driver_keyboard.h + * @file src/ginput/ginput_driver_keyboard.h * @brief GINPUT LLD header file for keyboard drivers. * * @defgroup Keyboard Keyboard @@ -20,7 +20,7 @@ #if GINPUT_NEED_KEYBOARD //|| defined(__DOXYGEN__) // Include the GDRIVER infrastructure -#include "src/gdriver/sys_defs.h" +#include "src/gdriver/gdriver.h" typedef struct GKeyboard { GDriver d; // The driver overheads and vmt diff --git a/src/ginput/driver_mouse.h b/src/ginput/ginput_driver_mouse.h index 5f948458..93d01124 100644 --- a/src/ginput/driver_mouse.h +++ b/src/ginput/ginput_driver_mouse.h @@ -6,7 +6,7 @@ */ /** - * @file src/ginput/driver_mouse.h + * @file src/ginput/ginput_driver_mouse.h * @brief GINPUT LLD header file for mouse/touch drivers. * * @defgroup Mouse Mouse @@ -20,7 +20,7 @@ #if GINPUT_NEED_MOUSE //|| defined(__DOXYGEN__) // Include the GDRIVER infrastructure -#include "src/gdriver/sys_defs.h" +#include "src/gdriver/gdriver.h" typedef struct GMouseReading { coord_t x, y, z; diff --git a/src/ginput/driver_toggle.h b/src/ginput/ginput_driver_toggle.h index 6d672c91..0dced07b 100644 --- a/src/ginput/driver_toggle.h +++ b/src/ginput/ginput_driver_toggle.h @@ -6,7 +6,7 @@ */ /** - * @file src/ginput/driver_toggle.h + * @file src/ginput/ginput_driver_toggle.h * @brief GINPUT header file for toggle drivers. * * @defgroup Toggle Toggle diff --git a/src/ginput/ginput_keyboard.c b/src/ginput/ginput_keyboard.c index 2d284eaa..eac2e9e0 100644 --- a/src/ginput/ginput_keyboard.c +++ b/src/ginput/ginput_keyboard.c @@ -21,8 +21,8 @@ #endif // Get the keyboard driver interface -#include "driver_keyboard.h" -#include "keyboard_microcode.h" +#include "ginput_driver_keyboard.h" +#include "ginput_keyboard_microcode.h" // The keyboard poll timer static GTIMER_DECL(KeyboardTimer); diff --git a/src/ginput/keyboard_microcode.c b/src/ginput/ginput_keyboard_microcode.c index e3c04d5f..e3c04d5f 100644 --- a/src/ginput/keyboard_microcode.c +++ b/src/ginput/ginput_keyboard_microcode.c diff --git a/src/ginput/keyboard_microcode.h b/src/ginput/ginput_keyboard_microcode.h index c18e94e5..c18e94e5 100644 --- a/src/ginput/keyboard_microcode.h +++ b/src/ginput/ginput_keyboard_microcode.h diff --git a/src/ginput/ginput_mouse.c b/src/ginput/ginput_mouse.c index 9ecf7dc7..f88c2ded 100644 --- a/src/ginput/ginput_mouse.c +++ b/src/ginput/ginput_mouse.c @@ -46,7 +46,7 @@ #define CALIBRATION_ERROR_HEIGHT 40 // Get the mouse driver interface -#include "driver_mouse.h" +#include "ginput_driver_mouse.h" // The mouse poll timer static GTIMER_DECL(MouseTimer); diff --git a/src/ginput/sys_options.h b/src/ginput/ginput_options.h index 9c1b0d30..3d3478d2 100644 --- a/src/ginput/sys_options.h +++ b/src/ginput/ginput_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/ginput/sys_options.h + * @file src/ginput/ginput_options.h * @brief GINPUT sub-system options header file. * * @addtogroup GINPUT diff --git a/src/ginput/sys_rules.h b/src/ginput/ginput_rules.h index d9a367ce..6d997f90 100644 --- a/src/ginput/sys_rules.h +++ b/src/ginput/ginput_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/ginput/sys_rules.h + * @file src/ginput/ginput_rules.h * @brief GINPUT safety rules header file. * * @addtogroup GINPUT diff --git a/src/ginput/ginput_toggle.c b/src/ginput/ginput_toggle.c index 4c6dc9ae..9ef945fa 100644 --- a/src/ginput/ginput_toggle.c +++ b/src/ginput/ginput_toggle.c @@ -17,7 +17,7 @@ #if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) || defined(__DOXYGEN__) -#include "driver_toggle.h" +#include "ginput_driver_toggle.h" #define GINPUT_TOGGLE_ISON 0x01 #define GINPUT_TOGGLE_INVERT 0x02 diff --git a/src/gmisc/gmisc_gmisc.c b/src/gmisc/gmisc.c index 3121182f..9bcc7bbe 100644 --- a/src/gmisc/gmisc_gmisc.c +++ b/src/gmisc/gmisc.c @@ -5,11 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gmisc/gmisc_gmisc.c - * @brief GMISC Functions. - * - */ #include "gfx.h" #if GFX_USE_GMISC diff --git a/src/gmisc/sys_defs.h b/src/gmisc/gmisc.h index 813fa07e..8f858682 100644 --- a/src/gmisc/sys_defs.h +++ b/src/gmisc/gmisc.h @@ -6,7 +6,7 @@ */ /** - * @file src/gmisc/sys_defs.h + * @file src/gmisc/gmisc.h * @brief GMISC - Miscellaneous Routines header file. * * @addtogroup GMISC diff --git a/src/gmisc/sys_make.mk b/src/gmisc/gmisc.mk index 203910e6..fa2e382f 100644 --- a/src/gmisc/sys_make.mk +++ b/src/gmisc/gmisc.mk @@ -1,4 +1,4 @@ -GFXSRC += $(GFXLIB)/src/gmisc/gmisc_gmisc.c \ +GFXSRC += $(GFXLIB)/src/gmisc/gmisc.c \ $(GFXLIB)/src/gmisc/gmisc_arrayops.c \ $(GFXLIB)/src/gmisc/gmisc_matrix2d.c \ $(GFXLIB)/src/gmisc/gmisc_trig.c diff --git a/src/gmisc/gmisc_arrayops.c b/src/gmisc/gmisc_arrayops.c index 6e5442cd..350a787c 100644 --- a/src/gmisc/gmisc_arrayops.c +++ b/src/gmisc/gmisc_arrayops.c @@ -5,13 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gmisc/gmisc_arrayops.c - * @brief GMISC Array Operations code. - * - * @addtogroup GMISC - * @{ - */ #include "gfx.h" #if GFX_USE_GMISC && GMISC_NEED_ARRAYOPS @@ -223,4 +216,3 @@ void gmiscArrayConvert(ArrayDataFormat srcfmt, void *src, ArrayDataFormat dstfmt } #endif /* GFX_USE_GMISC && GMISC_NEED_ARRAYOPS */ -/** @} */ diff --git a/src/gmisc/gmisc_matrix2d.c b/src/gmisc/gmisc_matrix2d.c index dd13603e..84b90c23 100644 --- a/src/gmisc/gmisc_matrix2d.c +++ b/src/gmisc/gmisc_matrix2d.c @@ -5,10 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gmisc/gmisc_matrix2d.c - * @brief GMISC 2D matrix operations code. - */ #include "gfx.h" #if GFX_USE_GMISC diff --git a/src/gmisc/sys_options.h b/src/gmisc/gmisc_options.h index 9cdf37f6..7f175fd7 100644 --- a/src/gmisc/sys_options.h +++ b/src/gmisc/gmisc_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gmisc/sys_options.h + * @file src/gmisc/gmisc_options.h * @brief GMISC - Miscellaneous Routines options header file. * * @addtogroup GMISC diff --git a/src/gmisc/sys_rules.h b/src/gmisc/gmisc_rules.h index 6c66907a..44a19846 100644 --- a/src/gmisc/sys_rules.h +++ b/src/gmisc/gmisc_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gmisc/sys_rules.h + * @file src/gmisc/gmisc_rules.h * @brief GMISC safety rules header file. * * @addtogroup GMISC diff --git a/src/gmisc/gmisc_trig.c b/src/gmisc/gmisc_trig.c index 7314f389..12d06be2 100644 --- a/src/gmisc/gmisc_trig.c +++ b/src/gmisc/gmisc_trig.c @@ -5,13 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gmisc/gmisc_trig.c - * @brief GMISC Trig Functions. - * - * @addtogroup GMISC - * @{ - */ #include "gfx.h" #if GFX_USE_GMISC @@ -187,4 +180,3 @@ #endif #endif /* GFX_USE_GMISC */ -/** @} */ diff --git a/src/gos/sys_defs.h b/src/gos/gos.h index 7e1348bb..f1def55a 100644 --- a/src/gos/sys_defs.h +++ b/src/gos/gos.h @@ -6,7 +6,7 @@ */ /** - * @file src/gos/sys_defs.h + * @file src/gos/gos.h * @brief GOS - Operating System Support header file * * @addtogroup GOS diff --git a/src/gos/sys_make.mk b/src/gos/gos.mk index a7b3dec6..a7b3dec6 100644 --- a/src/gos/sys_make.mk +++ b/src/gos/gos.mk diff --git a/src/gos/sys_options.h b/src/gos/gos_options.h index 45e398dd..611acfb7 100644 --- a/src/gos/sys_options.h +++ b/src/gos/gos_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gos/sys_options.h + * @file src/gos/gos_options.h * @brief GOS - Operating System options header file. * * @addtogroup GOS diff --git a/src/gos/gos_rawrtos.c b/src/gos/gos_rawrtos.c index cd684208..c47c85bf 100644 --- a/src/gos/gos_rawrtos.c +++ b/src/gos/gos_rawrtos.c @@ -1,3 +1,10 @@ +/* + * This file is subject to the terms of the GFX License. If a copy of + * the license was not distributed with this file, you can obtain one at: + * + * http://ugfx.org/license.html + */ + #include "gfx.h" #if GFX_USE_OS_RAWRTOS diff --git a/src/gos/sys_rules.h b/src/gos/gos_rules.h index 6d6c7845..0a86f86e 100644 --- a/src/gos/sys_rules.h +++ b/src/gos/gos_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gos/sys_rules.h + * @file src/gos/gos_rules.h * @brief GOS safety rules header file. * * @addtogroup GOS diff --git a/src/gos/gos_win32.c b/src/gos/gos_win32.c index 0ae9e618..a7e0943b 100644 --- a/src/gos/gos_win32.c +++ b/src/gos/gos_win32.c @@ -5,10 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gos/gos_win32.c - * @brief GOS Win32 Operating System support. - */ #include "gfx.h" #if GFX_USE_OS_WIN32 diff --git a/src/gqueue/gqueue_gqueue.c b/src/gqueue/gqueue.c index 5a50c64b..1205143f 100644 --- a/src/gqueue/gqueue_gqueue.c +++ b/src/gqueue/gqueue.c @@ -5,11 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gqueue/gqueue_gqueue.c - * @brief GQUEUE source file. - */ - #include "gfx.h" #if GFX_USE_GQUEUE diff --git a/src/gqueue/sys_defs.h b/src/gqueue/gqueue.h index cba22588..924024b7 100644 --- a/src/gqueue/sys_defs.h +++ b/src/gqueue/gqueue.h @@ -6,7 +6,7 @@ */ /** - * @file src/gqueue/sys_defs.h + * @file src/gqueue/gqueue.h * @brief GQUEUE header file. * * @addtogroup GQUEUE diff --git a/src/gqueue/gqueue.mk b/src/gqueue/gqueue.mk new file mode 100644 index 00000000..ab8a0423 --- /dev/null +++ b/src/gqueue/gqueue.mk @@ -0,0 +1 @@ +GFXSRC += $(GFXLIB)/src/gqueue/gqueue.c diff --git a/src/gqueue/sys_options.h b/src/gqueue/gqueue_options.h index 169cf116..a9f7302f 100644 --- a/src/gqueue/sys_options.h +++ b/src/gqueue/gqueue_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gqueue/sys_options.h + * @file src/gqueue/gqueue_options.h * @brief GQUEUE - Queue options header file. * * @addtogroup GQUEUE diff --git a/src/gqueue/sys_rules.h b/src/gqueue/gqueue_rules.h index 831952d8..0bccb196 100644 --- a/src/gqueue/sys_rules.h +++ b/src/gqueue/gqueue_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gqueue/sys_rules.h + * @file src/gqueue/gqueue_rules.h * @brief GQUEUE safety rules header file. * * @addtogroup GQUEUE diff --git a/src/gqueue/sys_make.mk b/src/gqueue/sys_make.mk deleted file mode 100644 index f8a542c3..00000000 --- a/src/gqueue/sys_make.mk +++ /dev/null @@ -1 +0,0 @@ -GFXSRC += $(GFXLIB)/src/gqueue/gqueue_gqueue.c diff --git a/src/gtimer/gtimer_gtimer.c b/src/gtimer/gtimer.c index 38dceca5..f84cad22 100644 --- a/src/gtimer/gtimer_gtimer.c +++ b/src/gtimer/gtimer.c @@ -5,13 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file src/gtimer/gtimer_gtimer.c - * @brief GTIMER sub-system code. - * - * @addtogroup GTIMER - * @{ - */ #include "gfx.h" #if GFX_USE_GTIMER || defined(__DOXYGEN__) @@ -234,5 +227,3 @@ void gtimerJabI(GTimer *pt) { } #endif /* GFX_USE_GTIMER */ -/** @} */ - diff --git a/src/gtimer/sys_defs.h b/src/gtimer/gtimer.h index 45b12162..6803ac66 100644 --- a/src/gtimer/sys_defs.h +++ b/src/gtimer/gtimer.h @@ -6,7 +6,7 @@ */ /** - * @file src/gtimer/sys_defs.h + * @file src/gtimer/gtimer.h * * @addtogroup GTIMER * diff --git a/src/gtimer/gtimer.mk b/src/gtimer/gtimer.mk new file mode 100644 index 00000000..801c31a6 --- /dev/null +++ b/src/gtimer/gtimer.mk @@ -0,0 +1 @@ +GFXSRC += $(GFXLIB)/src/gtimer/gtimer.c diff --git a/src/gtimer/sys_options.h b/src/gtimer/gtimer_options.h index 8dca0b82..dc0c6141 100644 --- a/src/gtimer/sys_options.h +++ b/src/gtimer/gtimer_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gtimer/sys_options.h + * @file src/gtimer/gtimer_options.h * @brief GTIMER sub-system options header file. * * @addtogroup GTIMER diff --git a/src/gtimer/sys_rules.h b/src/gtimer/gtimer_rules.h index 6f277965..ff966d38 100644 --- a/src/gtimer/sys_rules.h +++ b/src/gtimer/gtimer_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gtimer/sys_rules.h + * @file src/gtimer/gtimer_rules.h * @brief GTIMER safety rules header file. * * @addtogroup GTIMER diff --git a/src/gtimer/sys_make.mk b/src/gtimer/sys_make.mk deleted file mode 100644 index e48dc9f5..00000000 --- a/src/gtimer/sys_make.mk +++ /dev/null @@ -1 +0,0 @@ -GFXSRC += $(GFXLIB)/src/gtimer/gtimer_gtimer.c diff --git a/src/gwin/gwin_gwin.c b/src/gwin/gwin.c index eb51b89a..eb51b89a 100644 --- a/src/gwin/gwin_gwin.c +++ b/src/gwin/gwin.c diff --git a/src/gwin/sys_defs.h b/src/gwin/gwin.h index afab138c..81bf38e5 100644 --- a/src/gwin/sys_defs.h +++ b/src/gwin/gwin.h @@ -6,7 +6,7 @@ */ /** - * @file src/gwin/sys_defs.h + * @file src/gwin/gwin.h * * @defgroup Window Window * @ingroup Windows diff --git a/src/gwin/sys_make.mk b/src/gwin/gwin.mk index c619466e..23993346 100644 --- a/src/gwin/sys_make.mk +++ b/src/gwin/gwin.mk @@ -1,4 +1,4 @@ -GFXSRC += $(GFXLIB)/src/gwin/gwin_gwin.c \ +GFXSRC += $(GFXLIB)/src/gwin/gwin.c \ $(GFXLIB)/src/gwin/gwin_widget.c \ $(GFXLIB)/src/gwin/gwin_wm.c \ $(GFXLIB)/src/gwin/gwin_console.c \ diff --git a/src/gwin/gwin_console.h b/src/gwin/gwin_console.h index 77e623eb..a21642aa 100644 --- a/src/gwin/gwin_console.h +++ b/src/gwin/gwin_console.h @@ -24,7 +24,7 @@ #ifndef _GWIN_CONSOLE_H #define _GWIN_CONSOLE_H -/* This file is included within "src/gwin/sys_defs.h" */ +/* This file is included within "src/gwin/gwin.h" */ // A console window. Supports wrapped text writing and a cursor. typedef struct GConsoleObject { diff --git a/src/gwin/gwin_container.h b/src/gwin/gwin_container.h index 19562a7d..c40683db 100644 --- a/src/gwin/gwin_container.h +++ b/src/gwin/gwin_container.h @@ -21,7 +21,7 @@ #ifndef _GCONTAINER_H #define _GCONTAINER_H -/* This file is included within "src/gwin/sys_defs.h" */ +/* This file is included within "src/gwin/gwin.h" */ // Forward definition struct GContainerObject; diff --git a/src/gwin/gwin_gl3d.h b/src/gwin/gwin_gl3d.h index 644f45bf..84ead5d9 100644 --- a/src/gwin/gwin_gl3d.h +++ b/src/gwin/gwin_gl3d.h @@ -22,7 +22,7 @@ #ifndef _GWIN_GL3D_H #define _GWIN_GL3D_H -/* This file is included within "src/gwin/sys_defs.h" */ +/* This file is included within "src/gwin/gwin.h" */ // A gl3d window diff --git a/src/gwin/gwin_graph.h b/src/gwin/gwin_graph.h index eea80679..8355f494 100644 --- a/src/gwin/gwin_graph.h +++ b/src/gwin/gwin_graph.h @@ -22,7 +22,7 @@ #ifndef _GWIN_GRAPH_H #define _GWIN_GRAPH_H -/* This file is included within "src/gwin/sys_defs.h" */ +/* This file is included within "src/gwin/gwin.h" */ typedef enum GGraphPointType_e { GGRAPH_POINT_NONE, GGRAPH_POINT_DOT, GGRAPH_POINT_SQUARE, GGRAPH_POINT_CIRCLE diff --git a/src/gwin/gwin_image.h b/src/gwin/gwin_image.h index 2e0a3218..5def4037 100644 --- a/src/gwin/gwin_image.h +++ b/src/gwin/gwin_image.h @@ -27,7 +27,7 @@ #ifndef _GWIN_IMAGE_H #define _GWIN_IMAGE_H -// This file is included within "src/gwin/sys_defs.h" +// This file is included within "src/gwin/gwin.h" // An image window typedef struct GImageObject { diff --git a/src/gwin/sys_options.h b/src/gwin/gwin_options.h index df8f497e..9252e67a 100644 --- a/src/gwin/sys_options.h +++ b/src/gwin/gwin_options.h @@ -6,7 +6,7 @@ */ /** - * @file src/gwin/sys_options.h + * @file src/gwin/gwin_options.h * @brief GWIN sub-system options header file. * * @addtogroup GWIN diff --git a/src/gwin/sys_rules.h b/src/gwin/gwin_rules.h index 39864901..8d8ef2cc 100644 --- a/src/gwin/sys_rules.h +++ b/src/gwin/gwin_rules.h @@ -6,7 +6,7 @@ */ /** - * @file src/gwin/sys_rules.h + * @file src/gwin/gwin_rules.h * @brief GWIN safety rules header file. * * @addtogroup GWIN diff --git a/src/gwin/gwin_widget.h b/src/gwin/gwin_widget.h index c6bc6d4c..63d73e77 100644 --- a/src/gwin/gwin_widget.h +++ b/src/gwin/gwin_widget.h @@ -23,7 +23,7 @@ #ifndef _GWIDGET_H #define _GWIDGET_H -/* This file is included within "src/gwin/sys_defs.h" */ +/* This file is included within "src/gwin/gwin.h" */ // Forward definition struct GWidgetObject; |