changeset 501:c4117b996197

OSL: os_tim_fl.c compiles
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 24 Jun 2018 23:53:33 +0000
parents 094ecae40880
children b4dd8c7e84ce
files components/frame_na7_db_fl src/gpf2/osl/os_tim_fl.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/components/frame_na7_db_fl	Sun Jun 24 22:42:26 2018 +0000
+++ b/components/frame_na7_db_fl	Sun Jun 24 23:53:33 2018 +0000
@@ -48,3 +48,4 @@
 cfile_plain $SRCDIR/os_mis_fl.c
 cfile_plain $SRCDIR/os_pro_fl.c
 cfile_plain $SRCDIR/os_sem_fl.c
+cfile_plain $SRCDIR/os_tim_fl.c
--- a/src/gpf2/osl/os_tim_fl.c	Sun Jun 24 22:42:26 2018 +0000
+++ b/src/gpf2/osl/os_tim_fl.c	Sun Jun 24 23:53:33 2018 +0000
@@ -6,8 +6,7 @@
 
 /* set of included headers from COFF symtab: */
 #include <stdio.h>
-#include "gpfconf.h"	/* FreeCalypso addition */
-#include "../../nucleus/nucleus.h"
+#include "nucleus.h"
 #include "typedefs.h"
 #include "os.h"
 #include "gdi.h"
@@ -35,7 +34,11 @@
 NU_SEMAPHORE TimSemCB;
 NU_TIMER os_timer_cb;
 
+#ifdef __GNUC__
 #define	BARRIER	asm volatile ("": : :"memory")
+#else
+#define	BARRIER	/* prayer */
+#endif
 
 GLOBAL LONG
 os_set_tick(int os_system_tick)