FreeCalypso > hg > fc-magnetite
changeset 502:b4dd8c7e84ce
OSL: os_tim_ir.c compiles
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sun, 24 Jun 2018 23:58:05 +0000 |
| parents | c4117b996197 |
| children | 0c5f61a73709 |
| files | components/frame_na7_db_ir src/gpf2/osl/os_tim_ir.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/components/frame_na7_db_ir Sun Jun 24 23:53:33 2018 +0000 +++ b/components/frame_na7_db_ir Sun Jun 24 23:58:05 2018 +0000 @@ -46,3 +46,4 @@ cfile_plain $SRCDIR/os_mis_ir.c cfile_plain $SRCDIR/os_pro_ir.c cfile_plain $SRCDIR/os_sem_ir.c +cfile_plain $SRCDIR/os_tim_ir.c
--- a/src/gpf2/osl/os_tim_ir.c Sun Jun 24 23:53:33 2018 +0000 +++ b/src/gpf2/osl/os_tim_ir.c Sun Jun 24 23:58:05 2018 +0000 @@ -8,8 +8,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" @@ -31,7 +30,11 @@ extern NU_SEMAPHORE TimSemCB; extern NU_TIMER os_timer_cb; +#ifdef __GNUC__ #define BARRIER asm volatile ("": : :"memory") +#else +#define BARRIER /* prayer */ +#endif void timer_error(int err)