GOS module, for operating system independance

GMISC fast floating point trig
GMISC fast fixed point trig

2 files changed, 10 insertions, 20 deletions

diff --git a/demos/modules/gdisp/gdisp_images_animated/gfxconf.h b/demos/modules/gdisp/gdisp_images_animated/gfxconf.h
index cd368e95..9a734924 100644
--- a/demos/modules/gdisp/gdisp_images_animated/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_images_animated/gfxconf.h
@@ -9,12 +9,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		TRUE
@@ -47,11 +48,4 @@
 #define GDISP_NEED_IMAGE_PNG		FALSE
 #define GDISP_NEED_IMAGE_ACCOUNTING	FALSE
 
-/* Features for the GWIN sub-system. */
-#define GWIN_NEED_BUTTON		FALSE
-#define GWIN_NEED_CONSOLE		FALSE
-
-/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE		FALSE
-
 #endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/gdisp_images_animated/main.c b/demos/modules/gdisp/gdisp_images_animated/main.c
index d5c3d712..8502dcf9 100644
--- a/demos/modules/gdisp/gdisp_images_animated/main.c
+++ b/demos/modules/gdisp/gdisp_images_animated/main.c
@@ -18,8 +18,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ch.h"
-#include "hal.h"
 #include "gfx.h"
 
 #define USE_IMAGE_CACHE			FALSE						// Only if you want to get performance at the expense of RAM
@@ -51,11 +49,9 @@ static gdispImage myImage;
  */
 int main(void) {
 	coord_t			swidth, sheight;
-	systime_t		delay;
+	delaytime_t		delay;
 
-	halInit();			// Initialize the Hardware
-	chSysInit();		// Initialize the OS
-	gdispInit();		// Initialize the display
+	gfxInit();		// Initialize the display
 
 	gdispClear(MY_BG_COLOR);
 
@@ -67,7 +63,7 @@ int main(void) {
 #if USE_MEMORY_FILE
 	gdispImageSetMemoryReader(&myImage, testanim);
 #else
-	gdispImageSetSimulFileReader(&myImage, "testanim.gif");
+	gdispImageSetFileReader(&myImage, "testanim.gif");
 #endif
 
 	if (gdispImageOpen(&myImage) == GDISP_IMAGE_ERR_OK) {
@@ -87,14 +83,14 @@ int main(void) {
 			}
 			SHOW_ERROR(Yellow);
 			if (delay != TIME_IMMEDIATE)
-				chThdSleepMilliseconds(delay);
+				gfxSleepMilliseconds(delay);
 		}
 		gdispImageClose(&myImage);
 	} else
 		SHOW_ERROR(Red);
 
 	while(1) {
-		chThdSleepMilliseconds(1000);
+		gfxSleepMilliseconds(1000);
 	}
 
 	return 0;