# HG changeset patch # User Mychaela Falconia # Date 1529649483 0 # Node ID ff91db8c9eb8a0875dcc7d7b872e1f6f6b6d89c7 # Parent 91e8dac34adafbc32112171cd395918ac3e46f07 OSL: os_com_fl.c compiles diff -r 91e8dac34ada -r ff91db8c9eb8 components/frame_na7_db_fl --- a/components/frame_na7_db_fl Fri Jun 22 05:56:16 2018 +0000 +++ b/components/frame_na7_db_fl Fri Jun 22 06:38:03 2018 +0000 @@ -33,3 +33,12 @@ cfile_plain $SRCDIR/prf_func.c cfile_plain $SRCDIR/frm_ext.c cfile_plain $SRCDIR/frame_version.c + +# OSL + +# drop -o3 +CFLAGS="-mw -x -pw2 -o -me -mt -g -mn" + +SRCDIR=$SRC/gpf2/osl + +cfile_plain $SRCDIR/os_com_fl.c diff -r 91e8dac34ada -r ff91db8c9eb8 src/gpf2/osl/os_com_fl.c --- a/src/gpf2/osl/os_com_fl.c Fri Jun 22 05:56:16 2018 +0000 +++ b/src/gpf2/osl/os_com_fl.c Fri Jun 22 06:38:03 2018 +0000 @@ -6,8 +6,7 @@ /* set of included headers from COFF symtab: */ #include #include -#include "gpfconf.h" /* FreeCalypso addition */ -#include "../../nucleus/nucleus.h" +#include "nucleus.h" #include "typedefs.h" #include "os.h" #include "gdi.h" @@ -152,11 +151,13 @@ continue; if (susp = ComTable[i].FreeSemCB.sm_suspension_list) { if (susp->sm_suspended_task == (NU_TASK*)tcb) - return(ComTable[i].FreeSemCB.sm_name + 1); + return((unsigned char *) + ComTable[i].FreeSemCB.sm_name + 1); susp = (SM_SUSPEND *) susp->sm_suspend_link.cs_next; for (susp2 = susp; ; ) { if (susp2->sm_suspended_task == (NU_TASK*)tcb) - return(ComTable[i].FreeSemCB.sm_name+1); + return((unsigned char *) + ComTable[i].FreeSemCB.sm_name + 1); susp2 = (SM_SUSPEND *) susp2->sm_suspend_link.cs_next; if (susp2 == susp) @@ -165,11 +166,13 @@ } if (susp = ComTable[i].UsedSemCB.sm_suspension_list) { if (susp->sm_suspended_task == (NU_TASK*)tcb) - return(ComTable[i].UsedSemCB.sm_name + 1); + return((unsigned char *) + ComTable[i].UsedSemCB.sm_name + 1); susp = (SM_SUSPEND *) susp->sm_suspend_link.cs_next; for (susp2 = susp; ; ) { if (susp2->sm_suspended_task == (NU_TASK*)tcb) - return(ComTable[i].UsedSemCB.sm_name+1); + return((unsigned char *) + ComTable[i].UsedSemCB.sm_name + 1); susp2 = (SM_SUSPEND *) susp2->sm_suspend_link.cs_next; if (susp2 == susp) @@ -296,7 +299,7 @@ != NU_SUCCESS) return(OS_ERROR); for (i = 1; i <= MaxCommunications; i++) - bzero(&ComTable[i], sizeof(T_OS_COM_TABLE_ENTRY)); + memset(&ComTable[i], 0, sizeof(T_OS_COM_TABLE_ENTRY)); return(OS_OK); }