From 17857d6e97429a34fc157270d5425528bab6a031 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Wed, 7 Nov 2012 01:47:53 +0100
Subject: [PATCH] big doxygen update - now it works as it should

---
 drivers/gdisp/Nokia6610/gdisp_lld.c            | 2 +-
 drivers/gdisp/Nokia6610/gdisp_lld_config.h     | 2 +-
 drivers/gdisp/S6D1121/gdisp_lld.c              | 2 +-
 drivers/gdisp/SSD1289/gdisp_lld.c              | 2 +-
 drivers/gdisp/SSD1963/gdisp_lld.c              | 2 +-
 drivers/gdisp/SSD1963/gdisp_lld_config.h       | 2 +-
 drivers/gdisp/TestStub/gdisp_lld.c             | 2 +-
 drivers/gdisp/VMT/gdisp_lld.c                  | 2 +-
 drivers/gdisp/VMT/gdisp_lld_driver1.c          | 2 +-
 drivers/gdisp/VMT/gdisp_lld_driver2.c          | 2 +-
 drivers/gdisp/Win32/gdisp_lld.c                | 2 +-
 drivers/gdisp/Win32/gdisp_lld_config.h         | 2 +-
 drivers/touchpad/ADS7843/touchpad_lld.c        | 2 +-
 drivers/touchpad/ADS7843/touchpad_lld_config.h | 2 +-
 drivers/touchpad/XPT2046/touchpad_lld.c        | 2 +-
 drivers/touchpad/XPT2046/touchpad_lld_config.h | 2 +-
 templates/gdispXXX/gdisp_lld.c                 | 2 +-
 templates/gdispXXX/gdisp_lld_config.h          | 2 +-
 templates/touchpadXXX/touchpad_lld.c           | 8 +++-----
 templates/touchpadXXX/touchpad_lld_config.h    | 2 +-
 20 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/drivers/gdisp/Nokia6610/gdisp_lld.c b/drivers/gdisp/Nokia6610/gdisp_lld.c
index 1e96247e..e5a3160b 100644
--- a/drivers/gdisp/Nokia6610/gdisp_lld.c
+++ b/drivers/gdisp/Nokia6610/gdisp_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "gdisp.h"
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 /* Include the emulation code for things we don't support */
 #include "gdisp_emulation.c"
diff --git a/drivers/gdisp/Nokia6610/gdisp_lld_config.h b/drivers/gdisp/Nokia6610/gdisp_lld_config.h
index 78d30007..f751020f 100644
--- a/drivers/gdisp/Nokia6610/gdisp_lld_config.h
+++ b/drivers/gdisp/Nokia6610/gdisp_lld_config.h
@@ -29,7 +29,7 @@
 #ifndef _GDISP_LLD_CONFIG_H
 #define _GDISP_LLD_CONFIG_H
 
-#if GFX_USE_GDISP
+#if GFX_USE_GDISP 
 
 /*===========================================================================*/
 /* Driver hardware support.                                                  */
diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c
index 7e1509be..5eaa8e73 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "gdisp.h"
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 /* Include the emulation code for things we don't support */
 #include "gdisp_emulation.c"
diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c
index 00bb92cf..3568a6f1 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "gdisp.h"
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 /* Include the emulation code for things we don't support */
 #include "gdisp_emulation.c"
diff --git a/drivers/gdisp/SSD1963/gdisp_lld.c b/drivers/gdisp/SSD1963/gdisp_lld.c
index 01a5ed40..aceeb4a7 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld.c
+++ b/drivers/gdisp/SSD1963/gdisp_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "gdisp.h"
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 /* Include the emulation code for things we don't support */
 #include "gdisp_emulation.c"
diff --git a/drivers/gdisp/SSD1963/gdisp_lld_config.h b/drivers/gdisp/SSD1963/gdisp_lld_config.h
index 036df638..34b4f72b 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1963/gdisp_lld_config.h
@@ -29,7 +29,7 @@
 #ifndef _GDISP_LLD_CONFIG_H
 #define _GDISP_LLD_CONFIG_H
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP
 
 /*===========================================================================*/
 /* Driver hardware support.                                                  */
diff --git a/drivers/gdisp/TestStub/gdisp_lld.c b/drivers/gdisp/TestStub/gdisp_lld.c
index 90b2b490..7084737a 100644
--- a/drivers/gdisp/TestStub/gdisp_lld.c
+++ b/drivers/gdisp/TestStub/gdisp_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "gdisp.h"
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 /* Include the emulation code for things we don't support */
 #include "gdisp_emulation.c"
diff --git a/drivers/gdisp/VMT/gdisp_lld.c b/drivers/gdisp/VMT/gdisp_lld.c
index 9768fd4b..6a7d0cfb 100644
--- a/drivers/gdisp/VMT/gdisp_lld.c
+++ b/drivers/gdisp/VMT/gdisp_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "gdisp.h"
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 #define GDISP_LLD_NO_STRUCT
 
diff --git a/drivers/gdisp/VMT/gdisp_lld_driver1.c b/drivers/gdisp/VMT/gdisp_lld_driver1.c
index 46d1c82c..5bfaaa85 100644
--- a/drivers/gdisp/VMT/gdisp_lld_driver1.c
+++ b/drivers/gdisp/VMT/gdisp_lld_driver1.c
@@ -29,7 +29,7 @@
 #include "ch.h"
 #include "hal.h"
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 #define CONFIGFILE()	<../GDISP_VMT_NAME1()/gdisp_lld_config.h>
 #define DRIVERFILE()	<../GDISP_VMT_NAME1()/gdisp_lld.c>
diff --git a/drivers/gdisp/VMT/gdisp_lld_driver2.c b/drivers/gdisp/VMT/gdisp_lld_driver2.c
index 3ca87d03..961c43b3 100644
--- a/drivers/gdisp/VMT/gdisp_lld_driver2.c
+++ b/drivers/gdisp/VMT/gdisp_lld_driver2.c
@@ -29,7 +29,7 @@
 #include "ch.h"
 #include "hal.h"
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 #define CONFIGFILE()	<../GDISP_VMT_NAME2()/gdisp_lld_config.h>
 #define DRIVERFILE()	<../GDISP_VMT_NAME2()/gdisp_lld.c>
diff --git a/drivers/gdisp/Win32/gdisp_lld.c b/drivers/gdisp/Win32/gdisp_lld.c
index 5cf25535..523e695d 100644
--- a/drivers/gdisp/Win32/gdisp_lld.c
+++ b/drivers/gdisp/Win32/gdisp_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "gdisp.h"
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 /* Include the emulation code for things we don't support */
 #include "gdisp_emulation.c"
diff --git a/drivers/gdisp/Win32/gdisp_lld_config.h b/drivers/gdisp/Win32/gdisp_lld_config.h
index 40acdc24..e0afa6c3 100644
--- a/drivers/gdisp/Win32/gdisp_lld_config.h
+++ b/drivers/gdisp/Win32/gdisp_lld_config.h
@@ -29,7 +29,7 @@
 #ifndef _GDISP_LLD_CONFIG_H
 #define _GDISP_LLD_CONFIG_H
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 /*===========================================================================*/
 /* Driver hardware support.                                                  */
diff --git a/drivers/touchpad/ADS7843/touchpad_lld.c b/drivers/touchpad/ADS7843/touchpad_lld.c
index 8cd92ff9..8b30f4f3 100644
--- a/drivers/touchpad/ADS7843/touchpad_lld.c
+++ b/drivers/touchpad/ADS7843/touchpad_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "touchpad.h"
 
-#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
+#if GFX_USE_TOUCHPAD /*|| defined(__DOXYGEN__)*/
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/drivers/touchpad/ADS7843/touchpad_lld_config.h b/drivers/touchpad/ADS7843/touchpad_lld_config.h
index 13b48922..5ed1981c 100644
--- a/drivers/touchpad/ADS7843/touchpad_lld_config.h
+++ b/drivers/touchpad/ADS7843/touchpad_lld_config.h
@@ -29,7 +29,7 @@
 #ifndef _TOUCHPAD_LLD_CONFIG_H
 #define _TOUCHPAD_LLD_CONFIG_H
 
-#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
+#if GFX_USE_TOUCHPAD /*|| defined(__DOXYGEN__)*/
 
 /*===========================================================================*/
 /* Driver hardware support.                                                  */
diff --git a/drivers/touchpad/XPT2046/touchpad_lld.c b/drivers/touchpad/XPT2046/touchpad_lld.c
index 50ff6acc..8be23b07 100644
--- a/drivers/touchpad/XPT2046/touchpad_lld.c
+++ b/drivers/touchpad/XPT2046/touchpad_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "touchpad.h"
 
-#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
+#if GFX_USE_TOUCHPAD /*|| defined(__DOXYGEN__)*/
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/drivers/touchpad/XPT2046/touchpad_lld_config.h b/drivers/touchpad/XPT2046/touchpad_lld_config.h
index f1cd9ff5..a503d2b7 100644
--- a/drivers/touchpad/XPT2046/touchpad_lld_config.h
+++ b/drivers/touchpad/XPT2046/touchpad_lld_config.h
@@ -29,7 +29,7 @@
 #ifndef _TOUCHPAD_LLD_CONFIG_H
 #define _TOUCHPAD_LLD_CONFIG_H
 
-#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
+#if GFX_USE_TOUCHPAD /*|| defined(__DOXYGEN__)*/
 
 /*===========================================================================*/
 /* Driver hardware support.                                                  */
diff --git a/templates/gdispXXX/gdisp_lld.c b/templates/gdispXXX/gdisp_lld.c
index a845fdf9..1b88a338 100644
--- a/templates/gdispXXX/gdisp_lld.c
+++ b/templates/gdispXXX/gdisp_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "gdisp.h"
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 /* Include the emulation code for things we don't support */
 #include "gdisp_emulation.c"
diff --git a/templates/gdispXXX/gdisp_lld_config.h b/templates/gdispXXX/gdisp_lld_config.h
index b1c71729..cde3581d 100644
--- a/templates/gdispXXX/gdisp_lld_config.h
+++ b/templates/gdispXXX/gdisp_lld_config.h
@@ -29,7 +29,7 @@
 #ifndef _GDISP_LLD_CONFIG_H
 #define _GDISP_LLD_CONFIG_H
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 /*===========================================================================*/
 /* Driver hardware support.                                                  */
diff --git a/templates/touchpadXXX/touchpad_lld.c b/templates/touchpadXXX/touchpad_lld.c
index 8a832d8c..c2d898f4 100644
--- a/templates/touchpadXXX/touchpad_lld.c
+++ b/templates/touchpadXXX/touchpad_lld.c
@@ -30,7 +30,7 @@
 #include "hal.h"
 #include "touchpad.h"
 
-#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
+#if GFX_USE_TOUCHPAD /*|| defined(__DOXYGEN__)*/
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
@@ -46,9 +46,7 @@
 /* Driver exported variables.                                                */
 /*===========================================================================*/
 
-#if !defined(__DOXYGEN__)
 	TOUCHPADDriver Touchpad;
-#endif
 
 /*===========================================================================*/
 /* Driver local variables.                                                   */
@@ -118,8 +116,8 @@ uint16_t tp_lld_read_y(void) {
 }
 
 /* ---- Optional Routines ---- */
-#if TOUCHPAD_HAS_IRQ || defined(__DOXYGEN__)
-	/*
+#if TOCHPAD_HAS_IRQ || defined(__DOXYGEN)
+	/* 
 	 * @brief	for checking if touchpad is pressed or not.
 	 *
 	 * @return	1 if pressed / 0 if not pressed
diff --git a/templates/touchpadXXX/touchpad_lld_config.h b/templates/touchpadXXX/touchpad_lld_config.h
index e7d046da..eb5ccd80 100644
--- a/templates/touchpadXXX/touchpad_lld_config.h
+++ b/templates/touchpadXXX/touchpad_lld_config.h
@@ -29,7 +29,7 @@
 #ifndef _TOUCHPAD_LLD_CONFIG_H
 #define _TOUCHPAD_LLD_CONFIG_H
 
-#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
+#if GFX_USE_TOUCHPAD /*|| defined(__DOXYGEN__)*/
 
 /*===========================================================================*/
 /* Driver hardware support.                                                  */