Browse Source

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).

inmarket 5 years ago
parent
commit
fa8167b94d
100 changed files with 204 additions and 277 deletions
  1. 2 2
      demos/tools/touch_driver_test/main.c
  2. 2 2
      demos/tools/touch_raw_readings/main.c
  3. 1 1
      docs/src/containers.dox
  4. 1 1
      docs/src/widgets.dox
  5. 1 1
      docs/src/windows.dox
  6. 1 1
      drivers/gadc/AT91SAM7/gadc_lld.c
  7. 1 1
      drivers/gaudio/Win32/gaudio_play_lld.c
  8. 1 1
      drivers/gaudio/Win32/gaudio_record_lld.c
  9. 1 1
      drivers/gaudio/gadc/gaudio_record_lld.c
  10. 1 1
      drivers/gaudio/pwm/gaudio_play_lld.c
  11. 1 1
      drivers/gaudio/vs1053/gaudio_play_lld.c
  12. 1 1
      drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
  13. 1 1
      drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
  14. 1 1
      drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
  15. 1 1
      drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
  16. 1 1
      drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
  17. 1 1
      drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c
  18. 1 1
      drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
  19. 1 1
      drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c
  20. 1 1
      drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
  21. 1 1
      drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
  22. 1 1
      drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c
  23. 1 1
      drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c
  24. 1 1
      drivers/gdisp/R61505U/gdisp_lld_R61505U.c
  25. 1 1
      drivers/gdisp/RA8875/gdisp_lld_RA8875.c
  26. 1 1
      drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
  27. 1 1
      drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c
  28. 1 1
      drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
  29. 1 1
      drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
  30. 1 1
      drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
  31. 1 1
      drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
  32. 1 1
      drivers/gdisp/ST7565/gdisp_lld_ST7565.c
  33. 1 1
      drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c
  34. 1 1
      drivers/gdisp/TestStub/gdisp_lld_TestStub.c
  35. 1 1
      drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c
  36. 1 1
      drivers/ginput/dial/GADC/ginput_lld_dial.c
  37. 1 1
      drivers/ginput/toggle/Pal/ginput_lld_toggle.c
  38. 1 1
      drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c
  39. 1 1
      drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
  40. 1 1
      drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
  41. 1 1
      drivers/ginput/touch/MCU/gmouse_lld_MCU.c
  42. 1 1
      drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
  43. 5 5
      drivers/multiple/Win32/gdisp_lld_Win32.c
  44. 4 4
      drivers/multiple/X/gdisp_lld_X.c
  45. 2 2
      drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
  46. 36 36
      gfx.h
  47. 12 12
      gfx.mk
  48. 1 10
      src/gadc/gadc_gadc.c
  49. 1 1
      src/gadc/sys_defs.h
  50. 1 0
      src/gadc/gadc.mk
  51. 1 1
      src/gadc/driver.h
  52. 1 1
      src/gadc/sys_options.h
  53. 1 1
      src/gadc/sys_rules.h
  54. 0 1
      src/gadc/sys_make.mk
  55. 2 10
      src/gaudio/gaudio_gaudio.c
  56. 1 1
      src/gaudio/sys_defs.h
  57. 1 0
      src/gaudio/gaudio.mk
  58. 1 1
      src/gaudio/driver_play.h
  59. 1 1
      src/gaudio/driver_record.h
  60. 1 1
      src/gaudio/sys_options.h
  61. 1 1
      src/gaudio/sys_rules.h
  62. 0 1
      src/gaudio/sys_make.mk
  63. 1 9
      src/gdisp/gdisp_gdisp.c
  64. 1 1
      src/gdisp/sys_defs.h
  65. 1 1
      src/gdisp/sys_make.mk
  66. 2 2
      src/gdisp/driver.h
  67. 0 9
      src/gdisp/gdisp_fonts.c
  68. 0 8
      src/gdisp/gdisp_image.c
  69. 0 33
      src/gdisp/gdisp_image_bmp.c
  70. 0 8
      src/gdisp/gdisp_image_gif.c
  71. 0 5
      src/gdisp/gdisp_image_jpg.c
  72. 0 5
      src/gdisp/gdisp_image_native.c
  73. 0 5
      src/gdisp/gdisp_image_png.c
  74. 64 1
      src/gdisp/sys_options.h
  75. 2 2
      src/gdisp/gdisp_pixmap.c
  76. 1 1
      src/gdisp/sys_rules.h
  77. 1 1
      src/gdriver/gdriver_gdriver.c
  78. 2 2
      src/gdriver/sys_defs.h
  79. 1 0
      src/gdriver/gdriver.mk
  80. 1 1
      src/gdriver/sys_options.h
  81. 1 1
      src/gdriver/sys_rules.h
  82. 0 1
      src/gdriver/sys_make.mk
  83. 0 8
      src/gevent/gevent_gevent.c
  84. 1 1
      src/gevent/sys_defs.h
  85. 1 0
      src/gevent/gevent.mk
  86. 1 1
      src/gevent/sys_options.h
  87. 1 1
      src/gevent/sys_rules.h
  88. 0 1
      src/gevent/sys_make.mk
  89. 0 6
      src/gfile/gfile_gfile.c
  90. 1 1
      src/gfile/sys_defs.h
  91. 1 1
      src/gfile/sys_make.mk
  92. 0 6
      src/gfile/gfile_fatfs_diskio_chibios.c
  93. 0 6
      src/gfile/gfile_fatfs_wrapper.c
  94. 1 1
      src/gfile/sys_options.h
  95. 0 6
      src/gfile/gfile_petitfs_diskio_chibios.c
  96. 0 6
      src/gfile/gfile_petitfs_wrapper.c
  97. 1 1
      src/gfile/sys_rules.h
  98. 0 0
      src/ginput/ginput.c
  99. 1 1
      src/ginput/sys_defs.h
  100. 0 0
      src/ginput/sys_make.mk

+ 2 - 2
demos/tools/touch_driver_test/main.c

@@ -30,8 +30,8 @@
30 30
 #include "gfx.h"
31 31
 
32 32
 // We get nasty and look at some internal structures - get the relevant information
33
-#include "src/gdriver/sys_defs.h"
34
-#include "src/ginput/driver_mouse.h"
33
+#include "src/gdriver/gdriver.h"
34
+#include "src/ginput/ginput_driver_mouse.h"
35 35
 
36 36
 #include <string.h>
37 37
 

+ 2 - 2
demos/tools/touch_raw_readings/main.c

@@ -30,8 +30,8 @@
30 30
 #include "gfx.h"
31 31
 
32 32
 // We get nasty and look at some internal structures - get the relevant information
33
-#include "src/gdriver/sys_defs.h"
34
-#include "src/ginput/driver_mouse.h"
33
+#include "src/gdriver/gdriver.h"
34
+#include "src/ginput/ginput_driver_mouse.h"
35 35
 
36 36
 #include <string.h>
37 37
 

+ 1 - 1
docs/src/containers.dox

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file		src/gwin/sys_defs.h
9
+ * @file		src/gwin/gwin.h
10 10
  *
11 11
  * @defgroup	Containers Containers
12 12
  * @ingroup 	GWIN

+ 1 - 1
docs/src/widgets.dox

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    	src/gwin/sys_defs.h
9
+ * @file    	src/gwin/gwin.h
10 10
  *
11 11
  * @defgroup 	Widgets Widgets
12 12
  * @ingroup 	GWIN

+ 1 - 1
docs/src/windows.dox

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file		src/gwin/sys_defs.h
9
+ * @file		src/gwin/gwin.h
10 10
  *
11 11
  * @defgroup	Windows Windows
12 12
  * @ingroup		GWIN

+ 1 - 1
drivers/gadc/AT91SAM7/gadc_lld.c

@@ -14,7 +14,7 @@
14 14
 
15 15
 #if GFX_USE_GADC
16 16
 
17
-#include "src/gadc/driver.h"
17
+#include "src/gadc/gadc_driver.h"
18 18
 
19 19
 static uint32_t		nextfreq;
20 20
 

+ 1 - 1
drivers/gaudio/Win32/gaudio_play_lld.c

@@ -10,7 +10,7 @@
10 10
 #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
11 11
 
12 12
 /* Include the driver defines */
13
-#include "src/gaudio/driver_play.h"
13
+#include "src/gaudio/gaudio_driver_play.h"
14 14
 
15 15
 #undef Red
16 16
 #undef Green

+ 1 - 1
drivers/gaudio/Win32/gaudio_record_lld.c

@@ -10,7 +10,7 @@
10 10
 #if GFX_USE_GAUDIO && GAUDIO_NEED_RECORD
11 11
 
12 12
 /* Include the driver defines */
13
-#include "src/gaudio/driver_record.h"
13
+#include "src/gaudio/gaudio_driver_record.h"
14 14
 
15 15
 #undef Red
16 16
 #undef Green

+ 1 - 1
drivers/gaudio/gadc/gaudio_record_lld.c

@@ -16,7 +16,7 @@
16 16
 #endif
17 17
 
18 18
 /* Include the driver defines */
19
-#include "src/gaudio/driver_record.h"
19
+#include "src/gaudio/gaudio_driver_record.h"
20 20
 
21 21
 static void gadcCallbackI(void) {
22 22
 	GDataBuffer *pd;

+ 1 - 1
drivers/gaudio/pwm/gaudio_play_lld.c

@@ -10,7 +10,7 @@
10 10
 #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
11 11
 
12 12
 /* Include the driver defines */
13
-#include "src/gaudio/driver_play.h"
13
+#include "src/gaudio/gaudio_driver_play.h"
14 14
 
15 15
 /* Forward definition */
16 16
 static void gaudio_play_pwm_timer_callbackI(void);

+ 1 - 1
drivers/gaudio/vs1053/gaudio_play_lld.c

@@ -10,7 +10,7 @@
10 10
 #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
11 11
 
12 12
 /* Include the driver defines */
13
-#include "src/gaudio/driver_play.h"
13
+#include "src/gaudio/gaudio_driver_play.h"
14 14
 
15 15
 /* Include the vs1053 registers */
16 16
 #include "drivers/gaudio/vs1053/vs1053.h"

+ 1 - 1
drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_ED060SC4
13 13
 #include "drivers/gdisp/ED060SC4/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_ED060SC4.h"
17 17
 

+ 1 - 1
drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_HX8347D
13 13
 #include "drivers/gdisp/HX8347D/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_HX8347D.h"
17 17
 

+ 1 - 1
drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c

@@ -21,7 +21,7 @@
21 21
 
22 22
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9320
23 23
 #include "drivers/gdisp/ILI9320/gdisp_lld_config.h"
24
-#include "src/gdisp/driver.h"
24
+#include "src/gdisp/gdisp_driver.h"
25 25
 
26 26
 #include "board_ILI9320.h"
27 27
 

+ 1 - 1
drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c

@@ -21,7 +21,7 @@
21 21
 
22 22
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9325
23 23
 #include "drivers/gdisp/ILI9325/gdisp_lld_config.h"
24
-#include "src/gdisp/driver.h"
24
+#include "src/gdisp/gdisp_driver.h"
25 25
 
26 26
 #include "board_ILI9325.h"
27 27
 

+ 1 - 1
drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c

@@ -20,7 +20,7 @@
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9341
22 22
 #include "drivers/gdisp/ILI9341/gdisp_lld_config.h"
23
-#include "src/gdisp/driver.h"
23
+#include "src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "board_ILI9341.h"
26 26
 

+ 1 - 1
drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c

@@ -21,7 +21,7 @@
21 21
 
22 22
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI93xx
23 23
 #include "drivers/gdisp/ILI93xx/gdisp_lld_config.h"
24
-#include "src/gdisp/driver.h"
24
+#include "src/gdisp/gdisp_driver.h"
25 25
 
26 26
 #include "board_ILI93xx.h"
27 27
 

+ 1 - 1
drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c

@@ -20,7 +20,7 @@
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9481
22 22
 #include "drivers/gdisp/ILI9481/gdisp_lld_config.h"
23
-#include "src/gdisp/driver.h"
23
+#include "src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "board_ILI9481.h"
26 26
 

+ 1 - 1
drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c

@@ -21,7 +21,7 @@
21 21
 
22 22
 #define GDISP_DRIVER_VMT	GDISPVMT_LGDP4532
23 23
 #include "gdisp_lld_config.h"
24
-#include "src/gdisp/driver.h"
24
+#include "src/gdisp/gdisp_driver.h"
25 25
 
26 26
 #include "board_LGDP4532.h"
27 27
 

+ 1 - 1
drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c

@@ -20,7 +20,7 @@
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_Nokia6610GE12
22 22
 #include "drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h"
23
-#include "src/gdisp/driver.h"
23
+#include "src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "board_Nokia6610GE12.h"
26 26
 

+ 1 - 1
drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c

@@ -52,7 +52,7 @@
52 52
 
53 53
 #define GDISP_DRIVER_VMT			GDISPVMT_Nokia6610GE8
54 54
 #include "drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h"
55
-#include "src/gdisp/driver.h"
55
+#include "src/gdisp/gdisp_driver.h"
56 56
 
57 57
 #include "board_Nokia6610GE8.h"
58 58
 

+ 1 - 1
drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT		GDISPVMT_PCD8544
13 13
 #include "drivers/gdisp/PCD8544/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 #include "board_PCD8544.h"
16 16
 
17 17
 /*===========================================================================*/

+ 1 - 1
drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT		GDISPVMT_PCF8812
13 13
 #include "drivers/gdisp/PCF8812/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 #include "board_PCF8812.h"
16 16
 
17 17
 /*===========================================================================*/

+ 1 - 1
drivers/gdisp/R61505U/gdisp_lld_R61505U.c

@@ -21,7 +21,7 @@
21 21
 
22 22
 #define GDISP_DRIVER_VMT			GDISPVMT_R61505U
23 23
 #include "drivers/gdisp/R61505U/gdisp_lld_config.h"
24
-#include "src/gdisp/driver.h"
24
+#include "src/gdisp/gdisp_driver.h"
25 25
 
26 26
 #include "board_R61505U.h"
27 27
 

+ 1 - 1
drivers/gdisp/RA8875/gdisp_lld_RA8875.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_RA8875
13 13
 #include "drivers/gdisp/RA8875/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 
16 16
 /* include the users board interface */
17 17
 #include "board_RA8875.h"

+ 1 - 1
drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c

@@ -20,7 +20,7 @@
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_S6D1121
22 22
 #include "drivers/gdisp/S6D1121/gdisp_lld_config.h"
23
-#include "src/gdisp/driver.h"
23
+#include "src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "board_S6D1121.h"
26 26
 

+ 1 - 1
drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c

@@ -25,7 +25,7 @@
25 25
 #endif
26 26
 
27 27
 #include "drivers/gdisp/SPFD54124B/gdisp_lld_config.h"
28
-#include "src/gdisp/driver.h"
28
+#include "src/gdisp/gdisp_driver.h"
29 29
 
30 30
 #include "board_SPFD54124B.h"
31 31
 

+ 1 - 1
drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1289
13 13
 #include "drivers/gdisp/SSD1289/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_SSD1289.h"
17 17
 

+ 1 - 1
drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1306
13 13
 #include "drivers/gdisp/SSD1306/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_SSD1306.h"
17 17
 #include <string.h>   // for memset

+ 1 - 1
drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1963
13 13
 #include "drivers/gdisp/SSD1963/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #define CALC_PERIOD(w,b,f,p)				(p+b+w+f)
17 17
 #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)

+ 1 - 1
drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD2119
13 13
 #include "drivers/gdisp/SSD2119/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_SSD2119.h"
17 17
 

+ 1 - 1
drivers/gdisp/ST7565/gdisp_lld_ST7565.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_ST7565
13 13
 #include "drivers/gdisp/ST7565/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #include "board_ST7565.h"
17 17
 

+ 1 - 1
drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c

@@ -20,7 +20,7 @@
20 20
 
21 21
 #define GDISP_DRIVER_VMT			GDISPVMT_STM32F429iDiscovery
22 22
 #include "drivers/gdisp/STM32F429iDiscovery/gdisp_lld_config.h"
23
-#include "src/gdisp/driver.h"
23
+#include "src/gdisp/gdisp_driver.h"
24 24
 
25 25
 #include "stm32_ltdc.h"
26 26
 

+ 1 - 1
drivers/gdisp/TestStub/gdisp_lld_TestStub.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_TestStub
13 13
 #include "drivers/gdisp/TestStub/gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 
16 16
 #ifndef GDISP_SCREEN_HEIGHT
17 17
 	#define GDISP_SCREEN_HEIGHT		128

+ 1 - 1
drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c

@@ -16,7 +16,7 @@ typedef struct fbInfo {
16 16
 
17 17
 #define GDISP_DRIVER_VMT			GDISPVMT_framebuffer
18 18
 #include "drivers/gdisp/framebuffer/gdisp_lld_config.h"
19
-#include "src/gdisp/driver.h"
19
+#include "src/gdisp/gdisp_driver.h"
20 20
 #include "board_framebuffer.h"
21 21
 
22 22
 typedef struct fbPriv {

+ 1 - 1
drivers/ginput/dial/GADC/ginput_lld_dial.c

@@ -9,7 +9,7 @@
9 9
 
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_DIAL
11 11
 
12
-#include "src/ginput/driver_dial.h"
12
+#include "src/ginput/ginput_driver_dial.h"
13 13
 
14 14
 #if GINPUT_DIAL_NUM_PORTS >= 5
15 15
 	#error "GINPUT: Dial - GADC driver currently only supports 4 devices"

+ 1 - 1
drivers/ginput/toggle/Pal/ginput_lld_toggle.c

@@ -9,7 +9,7 @@
9 9
 
10 10
 #if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
11 11
 
12
-#include "src/ginput/driver_toggle.h"
12
+#include "src/ginput/ginput_driver_toggle.h"
13 13
 
14 14
 GINPUT_TOGGLE_DECLARE_STRUCTURE();
15 15
 

+ 1 - 1
drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c

@@ -10,7 +10,7 @@
10 10
 #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) 
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_ADS7843
13
-#include "src/ginput/driver_mouse.h"
13
+#include "src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Get the hardware interface
16 16
 #include "gmouse_lld_ADS7843_board.h"

+ 1 - 1
drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c

@@ -10,7 +10,7 @@
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_FT5x06
13
-#include "src/ginput/driver_mouse.h"
13
+#include "src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Get the hardware interface
16 16
 #include "gmouse_lld_FT5x06_board.h"

+ 1 - 1
drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c

@@ -10,7 +10,7 @@
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_MAX11802
13
-#include "src/ginput/driver_mouse.h"
13
+#include "src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Hardware definitions
16 16
 #include "drivers/ginput/touch/MAX11802/max11802.h"

+ 1 - 1
drivers/ginput/touch/MCU/gmouse_lld_MCU.c

@@ -10,7 +10,7 @@
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_MCU
13
-#include "src/ginput/driver_mouse.h"
13
+#include "src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Get the hardware interface
16 16
 #include "gmouse_lld_MCU_board.h"

+ 1 - 1
drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c

@@ -10,7 +10,7 @@
10 10
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
11 11
 
12 12
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_STMPE811
13
-#include "src/ginput/driver_mouse.h"
13
+#include "src/ginput/ginput_driver_mouse.h"
14 14
 
15 15
 // Hardware definitions
16 16
 #include "drivers/ginput/touch/STMPE811/stmpe811.h"

+ 5 - 5
drivers/multiple/Win32/gdisp_lld_Win32.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_Win32
13 13
 #include "gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 
16 16
 // Configuration parameters for this driver
17 17
 #ifndef GDISP_SCREEN_WIDTH
@@ -79,13 +79,13 @@
79 79
 
80 80
 #if GINPUT_NEED_TOGGLE
81 81
 	/* Include toggle support code */
82
-	#include "src/ginput/driver_toggle.h"
82
+	#include "src/ginput/ginput_driver_toggle.h"
83 83
 #endif
84 84
 
85 85
 #if GINPUT_NEED_MOUSE
86 86
 	// Include mouse support code
87 87
 	#define GMOUSE_DRIVER_VMT		GMOUSEVMT_Win32
88
-	#include "src/ginput/driver_mouse.h"
88
+	#include "src/ginput/ginput_driver_mouse.h"
89 89
 
90 90
 	// Forward definitions
91 91
 	static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance);
@@ -126,14 +126,14 @@
126 126
 
127 127
 #if GINPUT_NEED_KEYBOARD
128 128
 	#define GKEYBOARD_DRIVER_VMT		GKEYBOARDVMT_Win32
129
-	#include "src/ginput/driver_keyboard.h"
129
+	#include "src/ginput/ginput_driver_keyboard.h"
130 130
 
131 131
 	#if !GKEYBOARD_WIN32_NO_LAYOUT
132 132
 		#if GKEYBOARD_LAYOUT_OFF
133 133
 			#error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_WIN32_NO_LAYOUT=TRUE."
134 134
 		#endif
135 135
 
136
-		#include "src/ginput/keyboard_microcode.h"
136
+		#include "src/ginput/ginput_keyboard_microcode.h"
137 137
 
138 138
 		// Forward definitions
139 139
 		extern uint8_t	GKEYBOARD_WIN32_DEFAULT_LAYOUT[];

+ 4 - 4
drivers/multiple/X/gdisp_lld_X.c

@@ -17,7 +17,7 @@
17 17
 
18 18
 #define GDISP_DRIVER_VMT				GDISPVMT_X11
19 19
 #include "gdisp_lld_config.h"
20
-#include "src/gdisp/driver.h"
20
+#include "src/gdisp/gdisp_driver.h"
21 21
 
22 22
 // Configuration parameters for this driver
23 23
 #ifndef GDISP_FORCE_24BIT
@@ -53,7 +53,7 @@
53 53
 #if GINPUT_NEED_MOUSE
54 54
 	// Include mouse support code
55 55
 	#define GMOUSE_DRIVER_VMT		GMOUSEVMT_X11
56
-	#include "src/ginput/driver_mouse.h"
56
+	#include "src/ginput/ginput_driver_mouse.h"
57 57
 
58 58
 	// Forward definitions
59 59
 	static bool_t XMouseInit(GMouse *m, unsigned driverinstance);
@@ -95,7 +95,7 @@
95 95
 #if GINPUT_NEED_KEYBOARD
96 96
 	// Include mouse support code
97 97
 	#define GKEYBOARD_DRIVER_VMT		GKEYBOARDVMT_X
98
-	#include "src/ginput/driver_keyboard.h"
98
+	#include "src/ginput/ginput_driver_keyboard.h"
99 99
 
100 100
 	#if !GKEYBOARD_X_NO_LAYOUT
101 101
 		#if GKEYBOARD_LAYOUT_OFF
@@ -105,7 +105,7 @@
105 105
 		// Forward definitions
106 106
 		extern uint8_t	GKEYBOARD_X_DEFAULT_LAYOUT[];
107 107
 
108
-		#include "src/ginput/keyboard_microcode.h"
108
+		#include "src/ginput/ginput_keyboard_microcode.h"
109 109
 		#include <X11/keysym.h>
110 110
 
111 111
 		// This is the layout code for the English US keyboard.

+ 2 - 2
drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c

@@ -11,7 +11,7 @@
11 11
 
12 12
 #define GDISP_DRIVER_VMT			GDISPVMT_uGFXnet
13 13
 #include "gdisp_lld_config.h"
14
-#include "src/gdisp/driver.h"
14
+#include "src/gdisp/gdisp_driver.h"
15 15
 #include "uGFXnetProtocol.h"
16 16
 
17 17
 #ifndef GDISP_SCREEN_WIDTH
@@ -36,7 +36,7 @@
36 36
 #if GINPUT_NEED_MOUSE
37 37
 	// Include mouse support code
38 38
 	#define GMOUSE_DRIVER_VMT		GMOUSEVMT_uGFXnet
39
-	#include "src/ginput/driver_mouse.h"
39
+	#include "src/ginput/ginput_driver_mouse.h"
40 40
 
41 41
 	// Forward definitions
42 42
 	static bool_t NMouseInit(GMouse *m, unsigned driverinstance);

+ 36 - 36
gfx.h

@@ -161,18 +161,18 @@
161 161
  * Get all the options for each sub-system.
162 162
  *
163 163
  */
164
-#include "src/gos/sys_options.h"
165
-#include "src/gdriver/sys_options.h"
166
-#include "src/gfile/sys_options.h"
167
-#include "src/gmisc/sys_options.h"
168
-#include "src/gqueue/sys_options.h"
169
-#include "src/gevent/sys_options.h"
170
-#include "src/gtimer/sys_options.h"
171
-#include "src/gdisp/sys_options.h"
172
-#include "src/gwin/sys_options.h"
173
-#include "src/ginput/sys_options.h"
174
-#include "src/gadc/sys_options.h"
175
-#include "src/gaudio/sys_options.h"
164
+#include "src/gos/gos_options.h"
165
+#include "src/gdriver/gdriver_options.h"
166
+#include "src/gfile/gfile_options.h"
167
+#include "src/gmisc/gmisc_options.h"
168
+#include "src/gqueue/gqueue_options.h"
169
+#include "src/gevent/gevent_options.h"
170
+#include "src/gtimer/gtimer_options.h"
171
+#include "src/gdisp/gdisp_options.h"
172
+#include "src/gwin/gwin_options.h"
173
+#include "src/ginput/ginput_options.h"
174
+#include "src/gadc/gadc_options.h"
175
+#include "src/gaudio/gaudio_options.h"
176 176
 
177 177
 /**
178 178
  * Interdependency safety checks on the sub-systems.
@@ -182,34 +182,34 @@
182 182
 #ifndef GFX_DISPLAY_RULE_WARNINGS
183 183
 	#define GFX_DISPLAY_RULE_WARNINGS	FALSE
184 184
 #endif
185
-#include "src/gwin/sys_rules.h"
186
-#include "src/ginput/sys_rules.h"
187
-#include "src/gdisp/sys_rules.h"
188
-#include "src/gaudio/sys_rules.h"
189
-#include "src/gadc/sys_rules.h"
190
-#include "src/gevent/sys_rules.h"
191
-#include "src/gtimer/sys_rules.h"
192
-#include "src/gqueue/sys_rules.h"
193
-#include "src/gmisc/sys_rules.h"
194
-#include "src/gfile/sys_rules.h"
195
-#include "src/gdriver/sys_rules.h"
196
-#include "src/gos/sys_rules.h"
185
+#include "src/gwin/gwin_rules.h"
186
+#include "src/ginput/ginput_rules.h"
187
+#include "src/gdisp/gdisp_rules.h"
188
+#include "src/gaudio/gaudio_rules.h"
189
+#include "src/gadc/gadc_rules.h"
190
+#include "src/gevent/gevent_rules.h"
191
+#include "src/gtimer/gtimer_rules.h"
192
+#include "src/gqueue/gqueue_rules.h"
193
+#include "src/gmisc/gmisc_rules.h"
194
+#include "src/gfile/gfile_rules.h"
195
+#include "src/gdriver/gdriver_rules.h"
196
+#include "src/gos/gos_rules.h"
197 197
 
198 198
 /**
199 199
  *  Include the sub-system header files
200 200
  */
201
-#include "src/gos/sys_defs.h"
202
-//#include "src/gdriver/sys_defs.h"			// This module is only included by source that needs it.
203
-#include "src/gfile/sys_defs.h"
204
-#include "src/gmisc/sys_defs.h"
205
-#include "src/gqueue/sys_defs.h"
206
-#include "src/gevent/sys_defs.h"
207
-#include "src/gtimer/sys_defs.h"
208
-#include "src/gdisp/sys_defs.h"
209
-#include "src/gwin/sys_defs.h"
210
-#include "src/ginput/sys_defs.h"
211
-#include "src/gadc/sys_defs.h"
212
-#include "src/gaudio/sys_defs.h"
201
+#include "src/gos/gos.h"
202
+//#include "src/gdriver/gdriver.h"			// This module is only included by source that needs it.
203
+#include "src/gfile/gfile.h"
204
+#include "src/gmisc/gmisc.h"
205
+#include "src/gqueue/gqueue.h"
206
+#include "src/gevent/gevent.h"
207
+#include "src/gtimer/gtimer.h"
208
+#include "src/gdisp/gdisp.h"
209
+#include "src/gwin/gwin.h"
210
+#include "src/ginput/ginput.h"
211
+#include "src/gadc/gadc.h"
212
+#include "src/gaudio/gaudio.h"
213 213
 
214 214
 #ifdef __cplusplus
215 215
 extern "C" {

+ 12 - 12
gfx.mk

@@ -1,18 +1,18 @@
1 1
 GFXINC +=   $(GFXLIB)
2 2
 GFXSRC +=	$(GFXLIB)/src/gfx.c
3 3
 
4
-include $(GFXLIB)/src/gos/sys_make.mk
5
-include $(GFXLIB)/src/gdriver/sys_make.mk
6
-include $(GFXLIB)/src/gqueue/sys_make.mk
7
-include $(GFXLIB)/src/gdisp/sys_make.mk
8
-include $(GFXLIB)/src/gevent/sys_make.mk
9
-include $(GFXLIB)/src/gtimer/sys_make.mk
10
-include $(GFXLIB)/src/gwin/sys_make.mk
11
-include $(GFXLIB)/src/ginput/sys_make.mk
12
-include $(GFXLIB)/src/gadc/sys_make.mk
13
-include $(GFXLIB)/src/gaudio/sys_make.mk
14
-include $(GFXLIB)/src/gmisc/sys_make.mk
15
-include $(GFXLIB)/src/gfile/sys_make.mk
4
+include $(GFXLIB)/src/gos/gos.mk
5
+include $(GFXLIB)/src/gdriver/gdriver.mk
6
+include $(GFXLIB)/src/gqueue/gqueue.mk
7
+include $(GFXLIB)/src/gdisp/gdisp.mk
8
+include $(GFXLIB)/src/gevent/gevent.mk
9
+include $(GFXLIB)/src/gtimer/gtimer.mk
10
+include $(GFXLIB)/src/gwin/gwin.mk
11
+include $(GFXLIB)/src/ginput/ginput.mk
12
+include $(GFXLIB)/src/gadc/gadc.mk
13
+include $(GFXLIB)/src/gaudio/gaudio.mk
14
+include $(GFXLIB)/src/gmisc/gmisc.mk
15
+include $(GFXLIB)/src/gfile/gfile.mk
16 16
 
17 17
 # Include the boards and drivers
18 18
 ifneq ($(GFXBOARD),)

+ 1 - 10
src/gadc/gadc_gadc.c

@@ -5,19 +5,12 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gadc/gadc_gadc.c
10
- * @brief   GADC sub-system code.
11
- *
12
- * @addtogroup GADC
13
- * @{
14
- */
15 8
 #include "gfx.h"
16 9
 
17 10
 #if GFX_USE_GADC
18 11
 
19 12
 /* Include the driver defines */
20
-#include "driver.h"
13
+#include "gadc_driver.h"
21 14
 
22 15
 #if GADC_MAX_HIGH_SPEED_SAMPLERATE > GADC_MAX_SAMPLE_FREQUENCY/2
23 16
 	#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
358 351
 }
359 352
 
360 353
 #endif /* GFX_USE_GADC */
361
-/** @} */
362
-

+ 1 - 1
src/gadc/sys_defs.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gadc/sys_defs.h
9
+ * @file    src/gadc/gadc.h
10 10
  *
11 11
  * @addtogroup GADC
12 12
  *

+ 1 - 0
src/gadc/gadc.mk

@@ -0,0 +1 @@
1
+GFXSRC +=   $(GFXLIB)/src/gadc/gadc.c

+ 1 - 1
src/gadc/driver.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gadc/driver.h
9
+ * @file    src/gadc/gadc_driver.h
10 10
  * @brief   GADC - Periodic ADC driver header file.
11 11
  *
12 12
  * @defgroup Driver Driver

+ 1 - 1
src/gadc/sys_options.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gadc/sys_options.h
9
+ * @file    src/gadc/gadc_options.h
10 10
  * @brief   GADC - Periodic ADC subsystem options header file.
11 11
  *
12 12
  * @addtogroup GADC

+ 1 - 1
src/gadc/sys_rules.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gadc/sys_rules.h
9
+ * @file    src/gadc/gadc_rules.h
10 10
  * @brief   GADC safety rules header file.
11 11
  *
12 12
  * @addtogroup GADC

+ 0 - 1
src/gadc/sys_make.mk

@@ -1 +0,0 @@
1
-GFXSRC +=   $(GFXLIB)/src/gadc/gadc_gadc.c

+ 2 - 10
src/gaudio/gaudio_gaudio.c

@@ -5,19 +5,12 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gaudio/gaudio_gaudio.c
10
- * @brief   GAUDIO sub-system code.
11
- *
12
- * @addtogroup GAUDIO
13
- * @{
14
- */
15 8
 #include "gfx.h"
16 9
 
17 10
 #if GFX_USE_GAUDIO
18 11
 
19 12
 #if GAUDIO_NEED_PLAY
20
-	#include "driver_play.h"
13
+	#include "gaudio_driver_play.h"
21 14
 
22 15
 	static gfxQueueASync	playList;
23 16
 	static gfxSem			playComplete;
@@ -32,7 +25,7 @@
32 25
 #endif
33 26
 
34 27
 #if GAUDIO_NEED_RECORD
35
-	#include "driver_record.h"
28
+	#include "gaudio_driver_record.h"
36 29
 
37 30
 	static gfxQueueGSync	recordList;
38 31
 	static uint16_t			recordFlags;
@@ -280,4 +273,3 @@ void _gaudioDeinit(void)
280 273
 #endif
281 274
 
282 275
 #endif /* GFX_USE_GAUDIO */
283
-/** @} */

+ 1 - 1
src/gaudio/sys_defs.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gaudio/sys_defs.h
9
+ * @file    src/gaudio/gaudio.h
10 10
  *
11 11
  * @addtogroup GAUDIO
12 12
  *

+ 1 - 0
src/gaudio/gaudio.mk

@@ -0,0 +1 @@
1
+GFXSRC +=   $(GFXLIB)/src/gaudio/gaudio.c

+ 1 - 1
src/gaudio/driver_play.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gaudio/driver_play.h
9
+ * @file    src/gaudio/gaudio_driver_play.h
10 10
  * @brief   GAUDIO - Audio play driver header file.
11 11
  *
12 12
  * @defgroup Driver Driver

+ 1 - 1
src/gaudio/driver_record.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gaudio/driver_record.h
9
+ * @file    src/gaudio/gaudio_driver_record.h
10 10
  * @brief   GAUDIO - Audio Recording driver header file.
11 11
  *
12 12
  * @defgroup Driver Driver

+ 1 - 1
src/gaudio/sys_options.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gaudio/sys_options.h
9
+ * @file    src/gaudio/gaudio_options.h
10 10
  * @brief   GAUDIO - Audio subsystem options header file.
11 11
  *
12 12
  * @addtogroup GAUDIO

+ 1 - 1
src/gaudio/sys_rules.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gaudio/sys_rules.h
9
+ * @file    src/gaudio/gaudio_rules.h
10 10
  * @brief   GAUDIO safety rules header file.
11 11
  *
12 12
  * @addtogroup GAUDIO

+ 0 - 1
src/gaudio/sys_make.mk

@@ -1 +0,0 @@
1
-GFXSRC +=   $(GFXLIB)/src/gaudio/gaudio_gaudio.c

+ 1 - 9
src/gdisp/gdisp_gdisp.c

@@ -5,19 +5,12 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gdisp/gdisp_gdisp.c
10
- * @brief   GDISP Driver code.
11
- *
12
- * @addtogroup GDISP
13
- * @{
14
- */
15 8
 #include "gfx.h"
16 9
 
17 10
 #if GFX_USE_GDISP
18 11
 
19 12
 /* Include the low level driver information */
20
-#include "driver.h"
13
+#include "gdisp_driver.h"
21 14
 
22 15
 #if 1
23 16
 	#undef INLINE
@@ -3375,4 +3368,3 @@ color_t gdispContrastColor(color_t color) {
3375 3368
 #endif
3376 3369
 
3377 3370
 #endif /* GFX_USE_GDISP */
3378
-/** @} */

+ 1 - 1
src/gdisp/sys_defs.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gdisp/sys_defs.h
9
+ * @file    src/gdisp/gdisp.h
10 10
  * @brief   GDISP Graphic Driver subsystem header file.
11 11
  *
12 12
  * @addtogroup GDISP

+ 1 - 1
src/gdisp/sys_make.mk

@@ -1,4 +1,4 @@
1
-GFXSRC +=   $(GFXLIB)/src/gdisp/gdisp_gdisp.c \
1
+GFXSRC +=   $(GFXLIB)/src/gdisp/gdisp.c \
2 2
 			$(GFXLIB)/src/gdisp/gdisp_fonts.c \
3 3
 			$(GFXLIB)/src/gdisp/gdisp_pixmap.c \
4 4
 			$(GFXLIB)/src/gdisp/gdisp_image.c \

+ 2 - 2
src/gdisp/driver.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gdisp/driver.h
9
+ * @file    src/gdisp/gdisp_driver.h
10 10
  * @brief   GDISP Graphic Driver subsystem low level driver header.
11 11
  *
12 12
  * @addtogroup GDISP
@@ -19,7 +19,7 @@
19 19
 #if GFX_USE_GDISP
20 20
 
21 21
 // Include the GDRIVER infrastructure
22
-#include "src/gdriver/sys_defs.h"
22
+#include "src/gdriver/gdriver.h"
23 23
 
24 24
 // Are we currently compiling the driver itself?
25 25
 #if defined(GDISP_DRIVER_VMT)

+ 0 - 9
src/gdisp/gdisp_fonts.c

@@ -5,14 +5,6 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gdisp/gdisp_fonts.c
10
- * @brief   GDISP Font Handling.
11
- *
12
- * @addtogroup GDISP
13
- * @{
14
- */
15
-
16 8
 #include "gfx.h"
17 9
 
18 10
 #if GFX_USE_GDISP && GDISP_NEED_TEXT
@@ -93,4 +85,3 @@ const char *gdispGetFontName(font_t font) {
93 85
 }
94 86
 
95 87
 #endif /* GFX_USE_GDISP && GDISP_NEED_TEXT */
96
-/** @} */

+ 0 - 8
src/gdisp/gdisp_image.c

@@ -5,13 +5,6 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gdisp/gdisp_image.c
10
- * @brief   GDISP generic image code.
11
- *
12
- * @defgroup Image Image
13
- * @ingroup GDISP
14
- */
15 8
 #include "gfx.h"
16 9
 
17 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE
@@ -230,4 +223,3 @@ void gdispImageFree(gdispImage *img, void *ptr, size_t sz) {
230 223
 }
231 224
 
232 225
 #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE */
233
-/** @} */

+ 0 - 33
src/gdisp/gdisp_image_bmp.c

@@ -5,42 +5,10 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gdisp/gdisp_image_bmp.c
10
- * @brief   GDISP native image code.
11
- *
12
- * @defgroup Image Image
13
- * @ingroup GDISP
14
- */
15 8
 #include "gfx.h"
16 9
 
17 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP
18 11
 
19
-#ifndef GDISP_NEED_IMAGE_BMP_1
20
-	#define GDISP_NEED_IMAGE_BMP_1		TRUE
21
-#endif
22
-#ifndef GDISP_NEED_IMAGE_BMP_4
23
-	#define GDISP_NEED_IMAGE_BMP_4		TRUE
24
-#endif
25
-#ifndef GDISP_NEED_IMAGE_BMP_4_RLE
26
-	#define GDISP_NEED_IMAGE_BMP_4_RLE	TRUE
27
-#endif
28
-#ifndef GDISP_NEED_IMAGE_BMP_8
29
-	#define GDISP_NEED_IMAGE_BMP_8		TRUE
30
-#endif
31
-#ifndef GDISP_NEED_IMAGE_BMP_8_RLE
32
-	#define GDISP_NEED_IMAGE_BMP_8_RLE	TRUE
33
-#endif
34
-#ifndef GDISP_NEED_IMAGE_BMP_16
35
-	#define GDISP_NEED_IMAGE_BMP_16		TRUE
36
-#endif
37
-#ifndef GDISP_NEED_IMAGE_BMP_24
38
-	#define GDISP_NEED_IMAGE_BMP_24		TRUE
39
-#endif
40
-#ifndef GDISP_NEED_IMAGE_BMP_32
41
-	#define GDISP_NEED_IMAGE_BMP_32		TRUE
42
-#endif
43
-
44 12
 /**
45 13
  * Helper Routines Needed
46 14
  */
@@ -901,4 +869,3 @@ delaytime_t gdispImageNext_BMP(gdispImage *img) {
901 869
 }
902 870
 
903 871
 #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP */
904
-/** @} */

+ 0 - 8
src/gdisp/gdisp_image_gif.c

@@ -5,13 +5,6 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gdisp/gdisp_image_gif.c
10
- * @brief   GDISP native image code.
11
- *
12
- * @defgroup Image Image
13
- * @ingroup GDISP
14
-*/
15 8
 #include "gfx.h"
16 9
 
17 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF
@@ -1205,4 +1198,3 @@ delaytime_t gdispImageNext_GIF(gdispImage *img) {
1205 1198
 }
1206 1199
 
1207 1200
 #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF */
1208
-/** @} */

+ 0 - 5
src/gdisp/gdisp_image_jpg.c

@@ -5,10 +5,6 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gdisp/gdisp_image_jpg.c
10
- * @brief   GDISP native image code.
11
- */
12 8
 #include "gfx.h"
13 9
 
14 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG
@@ -16,4 +12,3 @@
16 12
 #error "JPG support not implemented yet"
17 13
 
18 14
 #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG */
19
-/** @} */

+ 0 - 5
src/gdisp/gdisp_image_native.c

@@ -5,10 +5,6 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gdisp/gdisp_image_native.c
10
- * @brief   GDISP native image code.
11
- */
12 8
 #include "gfx.h"
13 9
 
14 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE
@@ -142,4 +138,3 @@ delaytime_t gdispImageNext_NATIVE(gdispImage *img) {
142 138
 }
143 139
 
144 140
 #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE */
145
-/** @} */

+ 0 - 5
src/gdisp/gdisp_image_png.c

@@ -5,10 +5,6 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gdisp/gdisp_image_png.c
10
- * @brief   GDISP native image code.
11
- */
12 8
 #include "gfx.h"
13 9
 
14 10
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG
@@ -16,4 +12,3 @@
16 12
 #error "PNG support not implemented yet"
17 13
 
18 14
 #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG */
19
-/** @} */

+ 64 - 1
src/gdisp/sys_options.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gdisp/sys_options.h
9
+ * @file    src/gdisp/gdisp_options.h
10 10
  * @brief   GDISP sub-system options header file.
11 11
  *
12 12
  * @addtogroup GDISP
@@ -317,6 +317,69 @@
317 317
 	#ifndef GDISP_NEED_IMAGE_ACCOUNTING
318 318
 		#define GDISP_NEED_IMAGE_ACCOUNTING		FALSE
319 319
 	#endif
320
+/**
321
+ * @}
322
+ *
323
+ * @name    GDISP BMP Image Options
324
+ * @pre		GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_BMP must be TRUE
325
+ * @{
326
+ */
327
+	/**
328
+	 * @brief   Is BMP 1 bit per pixel (monochrome/2 color) image decoding required.
329
+	 * @details	Defaults to TRUE
330
+	 */
331
+	#ifndef GDISP_NEED_IMAGE_BMP_1
332
+		#define GDISP_NEED_IMAGE_BMP_1		TRUE
333
+	#endif
334
+	/**
335
+	 * @brief   Is BMP 4 bits per pixel (16 color) image decoding required.
336
+	 * @details	Defaults to TRUE
337
+	 */
338
+	#ifndef GDISP_NEED_IMAGE_BMP_4
339
+		#define GDISP_NEED_IMAGE_BMP_4		TRUE
340
+	#endif
341
+	/**
342
+	 * @brief   Is BMP 4 bits per pixel (16 color) with RLE compression image decoding required.
343
+	 * @details	Defaults to TRUE
344
+	 */
345
+	#ifndef GDISP_NEED_IMAGE_BMP_4_RLE
346
+		#define GDISP_NEED_IMAGE_BMP_4_RLE	TRUE
347
+	#endif
348
+	/**
349
+	 * @brief   Is BMP 8 bits per pixel (256 color) image decoding required.
350
+	 * @details	Defaults to TRUE
351
+	 */
352
+	#ifndef GDISP_NEED_IMAGE_BMP_8
353
+		#define GDISP_NEED_IMAGE_BMP_8		TRUE
354
+	#endif
355
+	/**
356
+	 * @brief   Is BMP 8 bits per pixel (256 color) with RLE compression image decoding required.
357
+	 * @details	Defaults to TRUE
358
+	 */
359
+	#ifndef GDISP_NEED_IMAGE_BMP_8_RLE
360
+		#define GDISP_NEED_IMAGE_BMP_8_RLE	TRUE
361
+	#endif
362
+	/**
363
+	 * @brief   Is BMP 16 bits per pixel (65536 color) image decoding required.
364
+	 * @details	Defaults to TRUE
365
+	 */
366
+	#ifndef GDISP_NEED_IMAGE_BMP_16
367
+		#define GDISP_NEED_IMAGE_BMP_16		TRUE
368
+	#endif
369
+	/**
370
+	 * @brief   Is BMP 24 bits per pixel (true-color) image decoding required.
371
+	 * @details	Defaults to TRUE
372
+	 */
373
+	#ifndef GDISP_NEED_IMAGE_BMP_24
374
+		#define GDISP_NEED_IMAGE_BMP_24		TRUE
375
+	#endif
376
+	/**
377
+	 * @brief   Is BMP 32 bits per pixel (true-color) image decoding required.
378
+	 * @details	Defaults to TRUE
379
+	 */
380
+	#ifndef GDISP_NEED_IMAGE_BMP_32
381
+		#define GDISP_NEED_IMAGE_BMP_32		TRUE
382
+	#endif
320 383
 /**
321 384
  * @}
322 385
  *

+ 2 - 2
src/gdisp/gdisp_pixmap.c

@@ -39,8 +39,8 @@
39 39
 	#error "GDISP Pixmap: Pixmap's do not currently support the specified GDISP_LLD_PIXELFORMAT"
40 40
 #endif
41 41
 
42
-#include "src/gdisp/driver.h"
43
-#include "src/gdriver/sys_defs.h"
42
+#include "src/gdisp/gdisp_driver.h"
43
+#include "src/gdriver/gdriver.h"
44 44
 
45 45
 typedef struct pixmap {
46 46
 	#if GDISP_NEED_PIXMAP_IMAGE

+ 1 - 1
src/gdisp/sys_rules.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gdisp/sys_rules.h
9
+ * @file    src/gdisp/gdisp_rules.h
10 10
  * @brief   GDISP safety rules header file.
11 11
  *
12 12
  * @addtogroup GDISP

+ 1 - 1
src/gdriver/gdriver_gdriver.c

@@ -9,7 +9,7 @@
9 9
 
10 10
 #if GFX_USE_GDRIVER
11 11
 
12
-#include "sys_defs.h"
12
+#include "gdriver.h"
13 13
 
14 14
 #include <string.h>         // For memset
15 15
 

+ 2 - 2
src/gdriver/sys_defs.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gdriver/sys_defs.h
9
+ * @file    src/gdriver/gdriver.h
10 10
  *
11 11
  * @addtogroup GDRIVER
12 12
  *
@@ -23,7 +23,7 @@
23 23
  * @note		If there is only a single device of a particular type it will automatically
24 24
  *				register that device (it only needs to be included in the build, no special
25 25
  *				configuration is required)
26
- * @note		This module sys_defs.h file is NOT included in the general gfx.h file.
26
+ * @note		This module gdriver.h file is NOT included in the general gfx.h file.
27 27
  * 				Instead it is included in each driver type's driver API.
28 28
  *
29 29
  * @pre			GFX_USE_GDRIVER must be set to TRUE in your gfxconf.h

+ 1 - 0
src/gdriver/gdriver.mk

@@ -0,0 +1 @@
1
+GFXSRC +=   $(GFXLIB)/src/gdriver/gdriver.c

+ 1 - 1
src/gdriver/sys_options.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gdriver/sys_options.h
9
+ * @file    src/gdriver/gdriver_options.h
10 10
  * @brief   GDRIVER - Driver options header file.
11 11
  *
12 12
  * @addtogroup GDRIVER

+ 1 - 1
src/gdriver/sys_rules.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gdriver/sys_rules.h
9
+ * @file    src/gdriver/gdriver_rules.h
10 10
  * @brief   GDRIVER safety rules header file.
11 11
  *
12 12
  * @addtogroup GFILE

+ 0 - 1
src/gdriver/sys_make.mk

@@ -1 +0,0 @@
1
-GFXSRC +=   $(GFXLIB)/src/gdriver/gdriver_gdriver.c

+ 0 - 8
src/gevent/gevent_gevent.c

@@ -5,13 +5,6 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gevent/gevent_gevent.c
10
- * @brief   GEVENT Driver code.
11
- *
12
- * @addtogroup GEVENT
13
- * @{
14
- */
15 8
 #include "gfx.h"
16 9
 
17 10
 #if GFX_USE_GEVENT || defined(__DOXYGEN__)
@@ -243,4 +236,3 @@ void geventDetachSourceListeners(GSourceHandle gsh) {
243 236
 }
244 237
 
245 238
 #endif /* GFX_USE_GEVENT */
246
-/** @} */

+ 1 - 1
src/gevent/sys_defs.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gevent/sys_defs.h
9
+ * @file    src/gevent/gevent.h
10 10
  *
11 11
  * @addtogroup GEVENT
12 12
  *

+ 1 - 0
src/gevent/gevent.mk

@@ -0,0 +1 @@
1
+GFXSRC +=   $(GFXLIB)/src/gevent/gevent.c

+ 1 - 1
src/gevent/sys_options.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gevent/sys_options.h
9
+ * @file    src/gevent/gevent_options.h
10 10
  * @brief   GEVENT sub-system options header file.
11 11
  *
12 12
  * @addtogroup GEVENT

+ 1 - 1
src/gevent/sys_rules.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gevent/sys_rules.h
9
+ * @file    src/gevent/gevent_rules.h
10 10
  * @brief   GEVENT safety rules header file.
11 11
  *
12 12
  * @addtogroup GEVENT

+ 0 - 1
src/gevent/sys_make.mk

@@ -1 +0,0 @@
1
-GFXSRC +=   $(GFXLIB)/src/gevent/gevent_gevent.c

+ 0 - 6
src/gfile/gfile_gfile.c

@@ -5,12 +5,6 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gfile/gfile_gfile.c
10
- * @brief   GFILE code.
11
- *
12
- */
13
-
14 8
 #include "gfx.h"
15 9
 
16 10
 #if GFX_USE_GFILE

+ 1 - 1
src/gfile/sys_defs.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gfile/sys_defs.h
9
+ * @file    src/gfile/gfile.h
10 10
  * @brief   GFILE - File IO Routines header file.
11 11
  *
12 12
  * @addtogroup GFILE

+ 1 - 1
src/gfile/sys_make.mk

@@ -1,4 +1,4 @@
1
-GFXSRC +=   $(GFXLIB)/src/gfile/gfile_gfile.c \
1
+GFXSRC +=   $(GFXLIB)/src/gfile/gfile.c \
2 2
             $(GFXLIB)/src/gfile/gfile_fs_native.c \
3 3
             $(GFXLIB)/src/gfile/gfile_fs_ram.c \
4 4
             $(GFXLIB)/src/gfile/gfile_fs_rom.c \

+ 0 - 6
src/gfile/gfile_fatfs_diskio_chibios.c

@@ -5,12 +5,6 @@
5 5
 /* disk I/O modules and attach it to FatFs module with common interface. */
6 6
 /*-----------------------------------------------------------------------*/
7 7
 
8
-/**
9
- * @file    src/gfile/gfile_fatfs_diskio_chibios.c
10
- * @brief   GFILE FATFS wrapper.
11
- *
12
- */
13
-
14 8
 #include "gfx.h"
15 9
 
16 10
 #if GFX_USE_GFILE && GFILE_NEED_FATFS && GFX_USE_OS_CHIBIOS

+ 0 - 6
src/gfile/gfile_fatfs_wrapper.c

@@ -5,12 +5,6 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gfile/gfile_fatfs_wrapper.c
10
- * @brief   GFILE FATFS wrapper.
11
- *
12
- */
13
-
14 8
 #include "gfx.h"
15 9
 
16 10
 #if GFX_USE_GFILE && GFILE_NEED_FATFS

+ 1 - 1
src/gfile/sys_options.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gfile/sys_options.h
9
+ * @file    src/gfile/gfile_options.h
10 10
  * @brief   GFILE - File IO options header file.
11 11
  *
12 12
  * @addtogroup GFILE

+ 0 - 6
src/gfile/gfile_petitfs_diskio_chibios.c

@@ -5,12 +5,6 @@
5 5
 /* disk I/O modules and attach it to FatFs module with common interface. */
6 6
 /*-----------------------------------------------------------------------*/
7 7
 
8
-/**
9
- * @file    src/gfile/gfile_petitfs_diskio_chibios.c
10
- * @brief   GFILE FATFS wrapper.
11
- *
12
- */
13
-
14 8
 #include "gfx.h"
15 9
 
16 10
 #if GFX_USE_GFILE && GFILE_NEED_PETITFS && GFX_USE_OS_CHIBIOS

+ 0 - 6
src/gfile/gfile_petitfs_wrapper.c

@@ -5,12 +5,6 @@
5 5
  *              http://ugfx.org/license.html
6 6
  */
7 7
 
8
-/**
9
- * @file    src/gfile/gfile_petitfs_wrapper.c
10
- * @brief   GFILE PETITFS wrapper.
11
- *
12
- */
13
-
14 8
 #include "gfx.h"
15 9
 
16 10
 #if GFX_USE_GFILE && GFILE_NEED_PETITFS

+ 1 - 1
src/gfile/sys_rules.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/gfile/sys_rules.h
9
+ * @file    src/gfile/gfile_rules.h
10 10
  * @brief   GFILE safety rules header file.
11 11
  *
12 12
  * @addtogroup GFILE

src/ginput/ginput_ginput.c → src/ginput/ginput.c


+ 1 - 1
src/ginput/sys_defs.h

@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 /**
9
- * @file    src/ginput/sys_defs.h
9
+ * @file    src/ginput/ginput.h
10 10
  *
11 11
  * @addtogroup GINPUT
12 12
  *

+ 0 - 0
src/ginput/sys_make.mk


Some files were not shown because too many files changed in this diff