renamed macros

8 files changed, 17 insertions, 17 deletions

diff --git a/include/console.h b/include/console.h
index 1874c57d..9891ea56 100644
--- a/include/console.h
+++ b/include/console.h
@@ -21,11 +21,11 @@
 #ifndef CONSOLE_H

 #define CONSOLE_H

 

-#ifndef GDISP_NEED_CONSOLE

-	#define GDISP_NEED_CONSOLE FALSE

+#ifndef GFX_USE_CONSOLE

+	#define GFX_USE_CONSOLE FALSE

 #endif

 

-#if GDISP_NEED_CONSOLE

+#if GFX_USE_CONSOLE

 

 #include "gdisp.h"

 

@@ -78,7 +78,7 @@ msg_t gfxConsoleWrite(GConsole *console, const uint8_t *bp, size_t n);
 }

 #endif

 

-#endif /* GDISP_NEED_CONSOLE */

+#endif /* GFX_USE_CONSOLE */

 

 #endif /* CONSOLE_H */

 

diff --git a/include/gdisp.h b/include/gdisp.h
index bb73677c..7b07bc2e 100644
--- a/include/gdisp.h
+++ b/include/gdisp.h
@@ -27,7 +27,7 @@
 #ifndef _GDISP_H

 #define _GDISP_H

 

-#if HAL_USE_GDISP || defined(__DOXYGEN__)

+#if GFX_USE_GDISP || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver constants.														 */

@@ -286,7 +286,7 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
 }

 #endif

 

-#endif /* HAL_USE_GDISP */

+#endif /* GFX_USE_GDISP */

 

 #endif /* _GDISP_H */

 /** @} */

diff --git a/include/gdisp_emulation.c b/include/gdisp_emulation.c
index c81bd305..34596b61 100644
--- a/include/gdisp_emulation.c
+++ b/include/gdisp_emulation.c
@@ -31,7 +31,7 @@
 #ifndef GDISP_EMULATION_C

 #define GDISP_EMULATION_C

 

-#if HAL_USE_GDISP || defined(__DOXYGEN__)

+#if GFX_USE_GDISP || defined(__DOXYGEN__)

 

 #ifndef GDISP_LLD_NO_STRUCT

 	static struct GDISPDriver {

@@ -683,5 +683,5 @@ void *GDISP_LLD(query)(unsigned what) {
 	}

 #endif

 

-#endif  /* HAL_USE_GDISP */

+#endif  /* GFX_USE_GDISP */

 #endif	/* GDISP_EMULATION_C */

diff --git a/include/gdisp_fonts.h b/include/gdisp_fonts.h
index 89359f18..a63e8909 100644
--- a/include/gdisp_fonts.h
+++ b/include/gdisp_fonts.h
@@ -30,7 +30,7 @@
 #ifndef _GDISP_FONTS_H

 #define _GDISP_FONTS_H

 

-/* Don't test against HAL_USE_GDISP as we may want to use this in other non-GDISP utilities. */

+/* Don't test against GFX_USE_GDISP as we may want to use this in other non-GDISP utilities. */

 

 /**

  * @brief   The maximum height of a font.

diff --git a/include/gdisp_lld.h b/include/gdisp_lld.h
index 376181fc..6dd826d9 100644
--- a/include/gdisp_lld.h
+++ b/include/gdisp_lld.h
@@ -28,7 +28,7 @@
 #ifndef _GDISP_LLD_H

 #define _GDISP_LLD_H

 

-#if HAL_USE_GDISP || defined(__DOXYGEN__)

+#if GFX_USE_GDISP || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Low level driver configuration needs					                     */

@@ -644,7 +644,7 @@ extern "C" {
 }

 #endif

 

-#endif	/* HAL_USE_GDISP */

+#endif	/* GFX_USE_GDISP */

 

 #endif	/* _GDISP_LLD_H */

 /** @} */

diff --git a/include/gdisp_lld_msgs.h b/include/gdisp_lld_msgs.h
index d45f45e4..a5cb885b 100644
--- a/include/gdisp_lld_msgs.h
+++ b/include/gdisp_lld_msgs.h
@@ -29,7 +29,7 @@
 #define _GDISP_LLD_MSGS_H

 

 /* This file describes the message API for gdisp_lld */

-#if HAL_USE_GDISP && GDISP_NEED_MSGAPI

+#if GFX_USE_GDISP && GDISP_NEED_MSGAPI

 

 typedef enum gdisp_msgaction {

 	GDISP_LLD_MSG_NOP,

@@ -188,6 +188,6 @@ typedef union gdisp_lld_msg {
 	} query;

 } gdisp_lld_msg_t;

 

-#endif	/* HAL_USE_GDISP */

+#endif	/* GFX_USE_GDISP */

 #endif	/* _GDISP_LLD_MSGS_H */

 /** @} */

diff --git a/include/touchpad.h b/include/touchpad.h
index 2fcb0c16..1db5ac98 100644
--- a/include/touchpad.h
+++ b/include/touchpad.h
@@ -28,7 +28,7 @@
 #ifndef _TOUCHPAD_H
 #define _TOUCHPAD_H
 
-#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
+#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
 
 /**
  * @brief	specifies how many conversions are made for a readout.
@@ -87,7 +87,7 @@ void tpCalibrate(void);
 }
 #endif
 
-#endif /* HAL_USE_TOUCHPAD */
+#endif /* GFX_USE_TOUCHPAD */
 
 #endif /* _TOUCHPAD_H */
 /** @} */
diff --git a/include/touchpad_lld.h b/include/touchpad_lld.h
index d207eb6c..c73591c7 100644
--- a/include/touchpad_lld.h
+++ b/include/touchpad_lld.h
@@ -29,7 +29,7 @@
 #ifndef _TOUCHPAD_LLD_H
 #define _TOUCHPAD_LLD_H
 
-#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
+#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
 
 /*===========================================================================*/
 /* Include the low level driver configuration information                    */
@@ -144,7 +144,7 @@ extern "C" {
 }
 #endif
 
-#endif /* HAL_USE_TOUCHPAD */
+#endif /* GFX_USE_TOUCHPAD */
 
 #endif /* _TOUCHPAD_LLD_H */
 /** @} */