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

14 files changed, 72 insertions, 90 deletions

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