GOS module, for operating system independance

GMISC fast floating point trig
GMISC fast fixed point trig

2 files changed, 9 insertions, 13 deletions

diff --git a/demos/benchmarks/gfxconf.h b/demos/benchmarks/gfxconf.h
index d12025e5..5185b50e 100644
--- a/demos/benchmarks/gfxconf.h
+++ b/demos/benchmarks/gfxconf.h
@@ -28,12 +28,13 @@
 #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                    FALSE
-#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           FALSE
diff --git a/demos/benchmarks/main.c b/demos/benchmarks/main.c
index c3cef762..d39215f0 100644
--- a/demos/benchmarks/main.c
+++ b/demos/benchmarks/main.c
@@ -25,12 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  */

 

-#include "ch.h"

-#include "hal.h"

-#include "chprintf.h"

 #include "stdlib.h"

 #include "string.h"

 #include "gfx.h"

+#include "chprintf.h"

 

 #define SCB_DEMCR (*(volatile unsigned *)0xE000EDFC)

 #define CPU_RESET_CYCLECOUNTER do { SCB_DEMCR = SCB_DEMCR | 0x01000000; \

@@ -94,7 +92,6 @@ void benchmark(void) {
 	font_t font;

 

     gdispSetOrientation(GDISP_ROTATE_90);

-    gdispClear(Black);

 

 	width = gdispGetWidth();

 	height = gdispGetHeight();

@@ -105,7 +102,7 @@ void benchmark(void) {
 	font = gdispOpenFont("UI2");

 	gdispDrawStringBox(0, height/2, width, 30, "5000 random rectangles", font, White, justifyCenter);

 	

-	chThdSleepMilliseconds(3000);

+	gfxSleepMilliseconds(3000);

 	

 	/* seed for the rand() */

 	srand(DWT_CYCCNT);

@@ -139,14 +136,12 @@ void benchmark(void) {
 }

 

 int main(void) {

-    halInit();

-    chSysInit();

-	gdispInit();

+	gfxInit();

 	

 	benchmark();

     

 	while(TRUE) {

-        chThdSleepMilliseconds(500);

+		gfxSleepMilliseconds(500);

 	}

 

 	return 0;