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.

10 files changed, 611 insertions, 253 deletions

diff --git a/demos/modules/console/gfxconf.h b/demos/modules/console/gfxconf.h
new file mode 100644
index 00000000..d3e99de4
--- /dev/null
+++ b/demos/modules/console/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			TRUE

+#define GFX_USE_GWIN			TRUE

+#define GFX_USE_GEVENT			FALSE

+#define GFX_USE_GTIMER			FALSE

+#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		TRUE

+#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/console/main.c b/demos/modules/console/main.c
index 962969eb..830c9d00 100644
--- a/demos/modules/console/main.c
+++ b/demos/modules/console/main.c
@@ -1,95 +1,90 @@
-/*
-    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 the following stuff enabled in your halconf.h:
- *
- *				#define GFX_USE_GDISP		TRUE
- *				#define GFX_USE_GWIN		TRUE
- *				#define GDISP_NEED_SCROLL	TRUE	(optional but recommended)
- *				#define GDISP_NEED_CLIP		TRUE	(optional but recommended)
- *				#define GWIN_NEED_CONSOLE 	TRUE
- */
-
-#include "ch.h"
-#include "hal.h"
-#include "chprintf.h"
-#include "gdisp.h"
-#include "gwin.h"
-
-/* The handles for our three consoles */
-GHandle GW1, GW2, GW3;
-
-/* The streams for our three consoles */
-BaseSequentialStream *S1, *S2, *S3;
-
-int main(void) {
-	uint8_t i;
-
-	halInit();
-	chSysInit();
-
-	/* initialize and clear the display */
-	gdispInit();
-	gdispClear(Black);
-
-	/* create the three console windows and set a font for each */
-	GW1 = gwinCreateConsole(NULL, 0, 0, gdispGetWidth(), gdispGetHeight()/2, &fontUI2Double);
-	GW2 = gwinCreateConsole(NULL, 0, gdispGetHeight()/2, gdispGetWidth()/2, gdispGetHeight(), &fontSmall);
-	GW3 = gwinCreateConsole(NULL, gdispGetWidth()/2, gdispGetHeight()/2, gdispGetWidth(), gdispGetHeight(), &fontSmall);
-
-	/* Set the fore- and background colors for each console */
-	gwinSetColor(GW1, Green);
-	gwinSetBgColor(GW1, Black);
-	gwinSetColor(GW2, White);
-	gwinSetBgColor(GW2, Blue);
-	gwinSetColor(GW3, Black);
-	gwinSetBgColor(GW3, Red);
-
-	/* clear all console windows - to set background */
-	gwinClear(GW1);
-	gwinClear(GW2);
-	gwinClear(GW3);
-
-	/* receive the stream pointers of each console */
-	S1 = gwinGetConsoleStream(GW1);
-	S2 = gwinGetConsoleStream(GW2);
-	S3 = gwinGetConsoleStream(GW3);
-
-	/* Output some data on the first console */
-	for(i = 0; i < 10; i++) {
-		chprintf(S1, "Hello ChibiOS/GFX!\r\n");
-	}
-
-	/* Output some data on the second console */
-	for(i = 0; i < 16; i++) {
-		chprintf(S2, "Message Nr.: %d\r\n", i+1);
-	}
-
-	/* Output some data on the third console */
-	for(i = 0; i < 18; i++) {
-		chprintf(S3, "Message Nr.: %d\r\n", i+1);
-	}
-
-	while(TRUE) {
-		chThdSleepMilliseconds(500);
-	}
-}
-
+/*

+    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/>.

+*/

+

+/**

+ *	The following stuff is optional in your gfxconf.h:

+ *

+ *				#define GDISP_NEED_SCROLL	TRUE	(optional but recommended if your GDISP driver supports it)

+ */

+

+#include "ch.h"

+#include "hal.h"

+#include "chprintf.h"

+#include "gfx.h"

+

+/* The handles for our three consoles */

+GHandle GW1, GW2, GW3;

+

+/* The streams for our three consoles */

+BaseSequentialStream *S1, *S2, *S3;

+

+int main(void) {

+	uint8_t i;

+

+	halInit();

+	chSysInit();

+

+	/* initialize and clear the display */

+	gdispInit();

+	gdispClear(Black);

+

+	/* create the three console windows and set a font for each */

+	GW1 = gwinCreateConsole(NULL, 0, 0, gdispGetWidth(), gdispGetHeight()/2, &fontUI2Double);

+	GW2 = gwinCreateConsole(NULL, 0, gdispGetHeight()/2, gdispGetWidth()/2, gdispGetHeight(), &fontSmall);

+	GW3 = gwinCreateConsole(NULL, gdispGetWidth()/2, gdispGetHeight()/2, gdispGetWidth(), gdispGetHeight(), &fontSmall);

+

+	/* Set the fore- and background colors for each console */

+	gwinSetColor(GW1, Green);

+	gwinSetBgColor(GW1, Black);

+	gwinSetColor(GW2, White);

+	gwinSetBgColor(GW2, Blue);

+	gwinSetColor(GW3, Black);

+	gwinSetBgColor(GW3, Red);

+

+	/* clear all console windows - to set background */

+	gwinClear(GW1);

+	gwinClear(GW2);

+	gwinClear(GW3);

+

+	/* receive the stream pointers of each console */

+	S1 = gwinGetConsoleStream(GW1);

+	S2 = gwinGetConsoleStream(GW2);

+	S3 = gwinGetConsoleStream(GW3);

+

+	/* Output some data on the first console */

+	for(i = 0; i < 10; i++) {

+		chprintf(S1, "Hello ChibiOS/GFX!\r\n");

+	}

+

+	/* Output some data on the second console */

+	for(i = 0; i < 16; i++) {

+		chprintf(S2, "Message Nr.: %d\r\n", i+1);

+	}

+

+	/* Output some data on the third console */

+	for(i = 0; i < 18; i++) {

+		chprintf(S3, "Message Nr.: %d\r\n", i+1);

+	}

+

+	while(TRUE) {

+		chThdSleepMilliseconds(500);

+	}

+}

+

diff --git a/demos/modules/ginput_touch_driver_test/gfxconf.h b/demos/modules/ginput_touch_driver_test/gfxconf.h
new file mode 100644
index 00000000..a6d40f06
--- /dev/null
+++ b/demos/modules/ginput_touch_driver_test/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			TRUE

+#define GFX_USE_GWIN			TRUE

+#define GFX_USE_GEVENT			TRUE

+#define GFX_USE_GTIMER			TRUE

+#define GFX_USE_GINPUT			TRUE

+

+/* 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	TRUE

+#define GDISP_NEED_ASYNC		FALSE

+#define GDISP_NEED_MSGAPI		FALSE

+

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

+#define GWIN_NEED_BUTTON		TRUE

+#define GWIN_NEED_CONSOLE		TRUE

+#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		TRUE

+#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/ginput_touch_driver_test/main.c b/demos/modules/ginput_touch_driver_test/main.c
index 78f29f86..d8fe1739 100644
--- a/demos/modules/ginput_touch_driver_test/main.c
+++ b/demos/modules/ginput_touch_driver_test/main.c
@@ -18,30 +18,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-/*

- * Make sure you have the following enabled in your halconf.h:

- *

- *	#define GFX_USE_GDISP TRUE

- *	#define GFX_USE_GINPUT TRUE

- *	#define GFX_USE_GEVENT TRUE

- *	#define GFX_USE_GTIMER TRUE

- *	#define GFX_USE_GWIN TRUE

- *

- *	#define GWIN_NEED_CONSOLE TRUE

- *	#define GWIN_NEED_BUTTON TRUE

- *

- *	#define GINPUT_NEED_MOUSE TRUE

- *	#define GINPUT_NEED_TOUCH TRUE

- *

- *	#define GDISP_NEED_CLIP TRUE

- */

-

 #include "ch.h"

 #include "hal.h"

 #include "chprintf.h"

-#include "gdisp.h"

-#include "ginput.h"

-#include "gwin.h"

+#include "gfx.h"

 

 static GConsoleObject			gc;

 static GButtonObject			gNext;

diff --git a/demos/modules/graph/gfxconf.h b/demos/modules/graph/gfxconf.h
new file mode 100644
index 00000000..23a675b9
--- /dev/null
+++ b/demos/modules/graph/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			TRUE

+#define GFX_USE_GWIN			TRUE

+#define GFX_USE_GEVENT			FALSE

+#define GFX_USE_GTIMER			FALSE

+#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			FALSE

+#define GDISP_NEED_CIRCLE		TRUE

+#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			TRUE

+

+/* 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/graph/main.c b/demos/modules/graph/main.c
new file mode 100644
index 00000000..bd2da2f6
--- /dev/null
+++ b/demos/modules/graph/main.c
@@ -0,0 +1,54 @@
+#include "ch.h"

+#include "hal.h"

+#include "gfx.h"

+#include "math.h"

+

+int data[5][2] = {

+	{ 0, 0 },

+	{ 10, 10 },

+	{ 20, 20 },

+	{ 30, 30 },

+	{ 40, 40 }

+};

+

+GGraphObject	g;

+

+GGraphStyle GraphStyle2 = {

+	{ GGRAPH_POINT_DOT, 0, Green },			// point

+	{ GGRAPH_LINE_DOT, 2, Gray },			// line

+	{ GGRAPH_LINE_SOLID, 0, White },		// x axis

+	{ GGRAPH_LINE_SOLID, 0, White },		// y axis

+	{ GGRAPH_LINE_NONE, 0, White, 0 },		// x grid

+	{ GGRAPH_LINE_NONE, 0, White, 0 },		// y grid

+	GWIN_GRAPH_STYLE_XAXIS_ARROWS|GWIN_GRAPH_STYLE_YAXIS_ARROWS		// flags

+};

+

+int main(void) {

+	GHandle		gh;

+	uint16_t 	i;

+	

+	halInit();

+	chSysInit();

+

+	gdispInit();

+	gdispClear(Black);

+	

+	gh = gwinCreateGraph(0, 0, gdispGetWidth(), gdispGetHeight());

+

+	gwinGraphSetOrigin(gh, 150, 150);

+	gwinGraphDrawAxis(gh);

+	

+	for(i = 0; i < 2500; i++)

+		gwinGraphDrawPoint(gh, i-170, 80*sin(2*0.2*M_PI*i/180));

+

+	gwinGraphStartSet(gh);

+	gwinGraphSetStyle(gh, &GraphStyle2);

+	

+	for(i = 0; i < 2500; i++)

+		gwinGraphDrawPoint(gh, i/5-150, 95*sin(2*0.2*M_PI*i/180));

+

+	while(TRUE) {

+		chThdSleepMilliseconds(100);	

+	}

+}

+

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;

+}

+

diff --git a/demos/modules/window/gfxconf.h b/demos/modules/window/gfxconf.h
new file mode 100644
index 00000000..80c4b327
--- /dev/null
+++ b/demos/modules/window/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			TRUE

+#define GFX_USE_GWIN			TRUE

+#define GFX_USE_GEVENT			FALSE

+#define GFX_USE_GTIMER			FALSE

+#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		TRUE

+#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/window/main.c b/demos/modules/window/main.c
index c70c94db..88f71be3 100644
--- a/demos/modules/window/main.c
+++ b/demos/modules/window/main.c
@@ -1,72 +1,62 @@
-/*
-    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 the following stuff enabled in your halconf.h:
- *
- *				#define GFX_USE_GDISP		TRUE
- *				#define GDISP_NEED_SCROLL	TRUE
- *				#define GDISP_NEED_CLIP		TRUE	(optional but recommended)
- */
-
-
-#include "ch.h"
-#include "hal.h"
-#include "gdisp.h"
-#include "gwin.h"
-
-/* The handles for our two Windows */
-GHandle GW1, GW2;
-
-int main(void) {
-    halInit();
-    chSysInit();
-
-    /* Initialize and clear the display */
-    gdispInit();
-    gdispClear(Lime);
-
-    /* Create two windows */
-    GW1 = gwinCreateWindow(NULL, 20, 10, 200, 150);
-    GW2 = gwinCreateWindow(NULL, 50, 190, 150, 100);
-
-    /* Set fore- and background colors for both windows */
-    gwinSetColor(GW1, Black);
-    gwinSetBgColor(GW1, White);
-    gwinSetColor(GW2, White);
-    gwinSetBgColor(GW2, Blue);
-
-    /* Clear both windows - to set background color */
-    gwinClear(GW1);
-    gwinClear(GW2);
-
-    /*  
-     * Draw two filled circles at the same coordinate
-     * of each window to demonstrate the relative coordinates
-     * of windows
-     */
-    gwinFillCircle(GW1, 20, 20, 15);
-    gwinFillCircle(GW2, 20, 20, 15);
-
-    while(TRUE) {
-        chThdSleepMilliseconds(500);
-    }   
-}
-
+/*

+    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"

+

+/* The handles for our two Windows */

+GHandle GW1, GW2;

+

+int main(void) {

+    halInit();

+    chSysInit();

+

+    /* Initialize and clear the display */

+    gdispInit();

+    gdispClear(Lime);

+

+    /* Create two windows */

+    GW1 = gwinCreateWindow(NULL, 20, 10, 200, 150);

+    GW2 = gwinCreateWindow(NULL, 50, 190, 150, 100);

+

+    /* Set fore- and background colors for both windows */

+    gwinSetColor(GW1, Black);

+    gwinSetBgColor(GW1, White);

+    gwinSetColor(GW2, White);

+    gwinSetBgColor(GW2, Blue);

+

+    /* Clear both windows - to set background color */

+    gwinClear(GW1);

+    gwinClear(GW2);

+

+    /*  

+     * Draw two filled circles at the same coordinate

+     * of each window to demonstrate the relative coordinates

+     * of windows

+     */

+    gwinFillCircle(GW1, 20, 20, 15);

+    gwinFillCircle(GW2, 20, 20, 15);

+

+    while(TRUE) {

+        chThdSleepMilliseconds(500);

+    }   

+}

+