Make all include paths in ugfx relative.

The only include path now needed is for drivers (in particular GDISP drivers)

2 files changed, 25 insertions, 28 deletions

diff --git a/drivers/ginput/toggle/Pal/driver.mk b/drivers/ginput/toggle/Pal/driver.mk
index b48fe83a..f2d32830 100644
--- a/drivers/ginput/toggle/Pal/driver.mk
+++ b/drivers/ginput/toggle/Pal/driver.mk
@@ -1,5 +1,2 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
-
-# Required include directories
 GFXINC += $(GFXLIB)/drivers/ginput/toggle/Pal
+GFXSRC += $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld_toggle_Pal.c
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c b/drivers/ginput/toggle/Pal/ginput_lld_toggle_Pal.c
index 96ef071e..1a16b70f 100644
--- a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
+++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_Pal.c
@@ -1,24 +1,24 @@
-/*

- * 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_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/

-

-#include "src/ginput/ginput_driver_toggle.h"

-

-GINPUT_TOGGLE_DECLARE_STRUCTURE();

-

-void ginput_lld_toggle_init(const GToggleConfig *ptc) {

-	palSetGroupMode(((IOBus *)ptc->id)->portid, ptc->mask, 0, ptc->mode);

-}

-

-unsigned ginput_lld_toggle_getbits(const GToggleConfig *ptc) {

-	return palReadBus((IOBus *)ptc->id);

-}

-

-#endif /* GFX_USE_GINPUT && GINPUT_NEED_TOGGLE */

+/*
+ * 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_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
+
+#include "../../../../src/ginput/ginput_driver_toggle.h"
+
+GINPUT_TOGGLE_DECLARE_STRUCTURE();
+
+void ginput_lld_toggle_init(const GToggleConfig *ptc) {
+	palSetGroupMode(((IOBus *)ptc->id)->portid, ptc->mask, 0, ptc->mode);
+}
+
+unsigned ginput_lld_toggle_getbits(const GToggleConfig *ptc) {
+	return palReadBus((IOBus *)ptc->id);
+}
+
+#endif /* GFX_USE_GINPUT && GINPUT_NEED_TOGGLE */