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/gtimer/gfxconf.h | 9 +++++----
 demos/modules/gtimer/main.c    | 7 ++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'demos/modules/gtimer')

diff --git a/demos/modules/gtimer/gfxconf.h b/demos/modules/gtimer/gfxconf.h
index 931357a5..8e996d52 100644
--- a/demos/modules/gtimer/gfxconf.h
+++ b/demos/modules/gtimer/gfxconf.h
@@ -28,11 +28,12 @@
 #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			FALSE
-#define GFX_USE_GWIN			FALSE
-#define GFX_USE_GEVENT			FALSE
 #define GFX_USE_GTIMER			TRUE
-#define GFX_USE_GINPUT			FALSE
 
 #endif /* _GFXCONF_H */
diff --git a/demos/modules/gtimer/main.c b/demos/modules/gtimer/main.c
index 403491ea..6d09d594 100644
--- a/demos/modules/gtimer/main.c
+++ b/demos/modules/gtimer/main.c
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ch.h"
-#include "hal.h"
 #include "gfx.h"
 
 GTimer GT1, GT2;
@@ -44,8 +42,7 @@ void callback2(void* arg) {
 }
  
 int main(void) {
-    halInit();
-    chSysInit();
+    gfxInit();
  
     /* initialize the timers */
     gtimerInit(&GT1);
@@ -58,7 +55,7 @@ int main(void) {
     gtimerStart(&GT2, callback2, NULL, FALSE, 1000);
 
 	while(TRUE) {
-		chThdSleepMilliseconds(500);
+		gfxSleepMilliseconds(500);
 	}
 
 	return 0;
-- 
cgit v1.2.3