GOS module, for operating system independance

GMISC fast floating point trig
GMISC fast fixed point trig

4 files changed, 12 insertions, 16 deletions

diff --git a/demos/modules/gadc/gfxconf.h b/demos/modules/gadc/gfxconf.h
index 557184cc..17bc5a6b 100644
--- a/demos/modules/gadc/gfxconf.h
+++ b/demos/modules/gadc/gfxconf.h
@@ -33,6 +33,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_TDISP			FALSE
diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c
index 49d9fe22..589fdb9e 100644
--- a/demos/modules/gadc/gwinosc.c
+++ b/demos/modules/gadc/gwinosc.c
@@ -30,10 +30,7 @@
  *
  * This GWIN superset implements a simple audio oscilloscope using the GADC high speed device.
  */
-#include "ch.h"
-#include "hal.h"
 #include "gfx.h"
-
 #include "gwinosc.h"
 
 /* Include internal GWIN routines so we can build our own superset class */
@@ -55,11 +52,11 @@ GHandle gwinCreateScope(GScopeObject *gs, coord_t x, coord_t y, coord_t cx, coor
 
 	/* Initialise the scope object members and allocate memory for buffers */
 	gs->gwin.type = GW_SCOPE;
-	chBSemInit(&gs->bsem, TRUE);
+	gfxSemInit(&gs->bsem, 0, 1);
 	gs->nextx = 0;
-	if (!(gs->lastscopetrace = (coord_t *)chHeapAlloc(NULL, gs->gwin.width * sizeof(coord_t))))
+	if (!(gs->lastscopetrace = (coord_t *)gfxAlloc(gs->gwin.width * sizeof(coord_t))))
 		return 0;
-	if (!(gs->audiobuf = (adcsample_t *)chHeapAlloc(NULL, AUDIOBUFSZ * sizeof(adcsample_t))))
+	if (!(gs->audiobuf = (adcsample_t *)gfxAlloc(AUDIOBUFSZ * sizeof(adcsample_t))))
 		return 0;
 #if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
 	gs->lasty = gs->gwin.height/2;
@@ -93,7 +90,7 @@ void gwinWaitForScopeTrace(GHandle gh) {
 #endif
 
 	/* Wait for a set of audio conversions */
-	chBSemWait(&gs->bsem);
+	gfxSemWait(&gs->bsem, TIME_INFINITE);
 
 	/* Ensure we are drawing in the right area */
 	#if GDISP_NEED_CLIP
diff --git a/demos/modules/gadc/gwinosc.h b/demos/modules/gadc/gwinosc.h
index 11644be4..1a2e7f18 100644
--- a/demos/modules/gadc/gwinosc.h
+++ b/demos/modules/gadc/gwinosc.h
@@ -57,7 +57,7 @@ typedef struct GScopeObject_t {
 	GWindowObject		gwin;					// Base Class
 
 	coord_t				*lastscopetrace;		// To store last scope trace
-	BinarySemaphore		bsem;					// We get signalled on this
+	gfxSem				bsem;					// We get signalled on this
 	adcsample_t			*audiobuf;				// To store audio samples
 	GEventADC			myEvent;				// Information on received samples
 	coord_t				nextx;					// Where we are up to
diff --git a/demos/modules/gadc/main.c b/demos/modules/gadc/main.c
index f506a473..4acf1da7 100644
--- a/demos/modules/gadc/main.c
+++ b/demos/modules/gadc/main.c
@@ -34,11 +34,8 @@
  *
  * It also demonstrates how to write your own custom GWIN window type.
  */
-#include "ch.h"
-#include "hal.h"
-#include "chprintf.h"
-
 #include "gfx.h"
+#include "chprintf.h"
 
 /* Include our custom gwin oscilloscope */
 #include "gwinosc.h"
@@ -143,10 +140,7 @@ int main(void) {
 		font_t					font;
 	#endif
 
-	halInit();
-	chSysInit();
-	gdispInit();
-	gdispClear(Black);
+	gfxInit();
 
 	/* Get the screen dimensions */
 	swidth = gdispGetWidth();