From 7fbfde42aabbcd30cffba2fba35158236c0a6c6c Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Sat, 25 May 2013 01:26:52 +1000
Subject: GOS module, for operating system independance GMISC fast floating
 point trig GMISC fast fixed point trig

---
 demos/modules/ginput/touch_driver_test/gfxconf.h | 5 +++++
 demos/modules/ginput/touch_driver_test/main.c    | 8 ++------
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'demos/modules/ginput/touch_driver_test')

diff --git a/demos/modules/ginput/touch_driver_test/gfxconf.h b/demos/modules/ginput/touch_driver_test/gfxconf.h
index 87787527..ee96f23c 100644
--- a/demos/modules/ginput/touch_driver_test/gfxconf.h
+++ b/demos/modules/ginput/touch_driver_test/gfxconf.h
@@ -28,6 +28,11 @@
 #ifndef _GFXCONF_H
 #define _GFXCONF_H
 
+/* The operating system to use - one of these must be defined */
+#define GFX_USE_OS_CHIBIOS		TRUE
+#define GFX_USE_OS_WIN32		FALSE
+#define GFX_USE_OS_POSIX		FALSE
+
 /* GFX sub-systems to turn on */
 #define GFX_USE_GDISP			TRUE
 #define GFX_USE_GWIN			TRUE
diff --git a/demos/modules/ginput/touch_driver_test/main.c b/demos/modules/ginput/touch_driver_test/main.c
index 80c85273..424b2587 100644
--- a/demos/modules/ginput/touch_driver_test/main.c
+++ b/demos/modules/ginput/touch_driver_test/main.c
@@ -25,10 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ch.h"
-#include "hal.h"
-#include "chprintf.h"
 #include "gfx.h"
+#include "chprintf.h"
 
 static GConsoleObject			gc;
 static GButtonObject			gNext;
@@ -49,9 +47,7 @@ int main(void) {
 	GEventType				deviceType;
 	font_t					font;
 
-	halInit();			// Initialise the Hardware
-	chSysInit();		// Initialize the OS
-	gdispInit();		// Initialize the display
+	gfxInit();		// Initialize the display
 
 	// Get the display dimensions
 	swidth = gdispGetWidth();
-- 
cgit v1.2.3