Restructure

Create global include file called gfx.h which knows about sub-system
dependancies.
Deprecate Touchscreen (GINPUT touch is now working properly)
Merge Graph into GWIN
Change directory structure to reflect sub-system structure
Many small bugs fixed
Split Nokia6610 gdisp driver into GE8 and GE12 controller versions
Fixed broken demos.
GFX sub-systems are now clearly defined and new ones should be much
easier to add.

2 files changed, 128 insertions, 65 deletions

diff --git a/demos/modules/gtimer/gfxconf.h b/demos/modules/gtimer/gfxconf.h
new file mode 100644
index 00000000..c0f24a7a
--- /dev/null
+++ b/demos/modules/gtimer/gfxconf.h
@@ -0,0 +1,69 @@
+/**

+ * This file has a different license to the rest of the GFX system.

+ * You can copy, modify and distribute this file as you see fit.

+ * You do not need to publish your source modifications to this file.

+ * The only thing you are not permitted to do is to relicense it

+ * under a different license.

+ */

+

+#ifndef _GFXCONF_H

+#define _GFXCONF_H

+

+/* GFX sub-systems to turn on */

+#define GFX_USE_GDISP			FALSE

+#define GFX_USE_GWIN			FALSE

+#define GFX_USE_GEVENT			FALSE

+#define GFX_USE_GTIMER			TRUE

+#define GFX_USE_GINPUT			FALSE

+

+/* Features for the GDISP sub-system. */

+#define GDISP_NEED_VALIDATION	TRUE

+#define GDISP_NEED_CLIP			TRUE

+#define GDISP_NEED_TEXT			TRUE

+#define GDISP_NEED_CIRCLE		FALSE

+#define GDISP_NEED_ELLIPSE		FALSE

+#define GDISP_NEED_ARC			FALSE

+#define GDISP_NEED_SCROLL		FALSE

+#define GDISP_NEED_PIXELREAD	FALSE

+#define GDISP_NEED_CONTROL		FALSE

+#define GDISP_NEED_MULTITHREAD	FALSE

+#define GDISP_NEED_ASYNC		FALSE

+#define GDISP_NEED_MSGAPI		FALSE

+

+/* Features for the GWIN sub-system. */

+#define GWIN_NEED_BUTTON		FALSE

+#define GWIN_NEED_CONSOLE		FALSE

+#define GWIN_NEED_GRAPH			FALSE

+

+/* Features for the GEVENT sub-system. */

+#define GEVENT_ASSERT_NO_RESOURCE	FALSE

+

+/* Features for the GTIMER sub-system. */

+/* NONE */

+

+/* Features for the GINPUT sub-system. */

+#define GINPUT_NEED_MOUSE		FALSE

+#define GINPUT_NEED_KEYBOARD	FALSE

+#define GINPUT_NEED_TOGGLE		FALSE

+#define GINPUT_NEED_DIAL		FALSE

+

+/* Optional Parameters for various sub-systems */

+/*

+	#define GDISP_MAX_FONT_HEIGHT			16

+	#define GEVENT_MAXIMUM_SIZE				32

+	#define GEVENT_MAX_SOURCE_LISTENERS		32

+	#define GTIMER_THREAD_WORKAREA_SIZE		512

+*/

+

+/* Optional Low Level Driver Definitions */

+/*

+	#define GDISP_USE_CUSTOM_BOARD		FALSE

+	#define GDISP_SCREEN_WIDTH			320

+	#define GDISP_SCREEN_HEIGHT			240

+	#define GDISP_USE_FSMC

+	#define GDISP_USE_GPIO

+	#define GDISP_VMT_NAME1(x)			x##YourDriver1

+	#define GDISP_VMT_NAME2(x)			x##YourDriver2

+*/

+

+#endif /* _GFXCONF_H */

diff --git a/demos/modules/gtimer/main.c b/demos/modules/gtimer/main.c
index bb991edc..ae7c2c92 100644
--- a/demos/modules/gtimer/main.c
+++ b/demos/modules/gtimer/main.c
@@ -1,65 +1,59 @@
-/*
-    ChibiOS/GFX - Copyright (C) 2012
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS/GFX.
-
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/GFX is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * Make sure you have enabled the GTimer module in your halconf.h:
- *
- *				#define GFX_USE_GTIMER TRUE
- */
-
-#include "ch.h"
-#include "hal.h"
-#include "gtimer.h"
-
-GTimer GT1, GT2;
- 
-void callback1(void* arg) {
-    (void)arg;
-
-    palTogglePad(GPIOD, GPIOD_LED3);
-}
- 
-void callback2(void* arg) {
-    (void)arg;
-
-    palSetPad(GPIOD, GPIOD_LED4);
-}
- 
-int main(void) {
-    halInit();
-    chSysInit();
- 
-    /* initialize the timers */
-    gtimerInit(&GT1);
-    gtimerInit(&GT2);
- 
-    /* continious mode - callback1() called without any argument every 250ms */
-    gtimerStart(&GT1, callback1, NULL, TRUE, 250);
- 
-    /* single shot mode - callback2() called without any argument once after 1s */
-    gtimerStart(&GT2, callback2, NULL, FALSE, 1000);
-
-	while(TRUE) {
-		chThdSleepMilliseconds(500);
-	}
-
-	return 0;
-}
-
+/*

+    ChibiOS/GFX - Copyright (C) 2012

+                 Joel Bodenmann aka Tectu <joel@unormal.org>

+

+    This file is part of ChibiOS/GFX.

+

+    ChibiOS/GFX is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/GFX is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+#include "ch.h"

+#include "hal.h"

+#include "gfx.h"

+

+GTimer GT1, GT2;

+ 

+void callback1(void* arg) {

+    (void)arg;

+

+    palTogglePad(GPIOD, GPIOD_LED3);

+}

+ 

+void callback2(void* arg) {

+    (void)arg;

+

+    palSetPad(GPIOD, GPIOD_LED4);

+}

+ 

+int main(void) {

+    halInit();

+    chSysInit();

+ 

+    /* initialize the timers */

+    gtimerInit(&GT1);

+    gtimerInit(&GT2);

+ 

+    /* continious mode - callback1() called without any argument every 250ms */

+    gtimerStart(&GT1, callback1, NULL, TRUE, 250);

+ 

+    /* single shot mode - callback2() called without any argument once after 1s */

+    gtimerStart(&GT2, callback2, NULL, FALSE, 1000);

+

+	while(TRUE) {

+		chThdSleepMilliseconds(500);

+	}

+

+	return 0;

+}

+