FreeCalypso > hg > fc-magnetite

changeset 499:27db9775cbab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OSL: os_sem_fl.c compiles
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 24 Jun 2018 22:39:27 +0000
parents dfa8771e84b1
children 094ecae40880
files components/frame_na7_db_fl src/gpf2/osl/os_sem_fl.c
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/components/frame_na7_db_fl	Sun Jun 24 21:32:13 2018 +0000
+++ b/components/frame_na7_db_fl	Sun Jun 24 22:39:27 2018 +0000
@@ -47,3 +47,4 @@
 cfile_plain $SRCDIR/os_mem_fl.c
 cfile_plain $SRCDIR/os_mis_fl.c
 cfile_plain $SRCDIR/os_pro_fl.c
+cfile_plain $SRCDIR/os_sem_fl.c
--- a/src/gpf2/osl/os_sem_fl.c	Sun Jun 24 21:32:13 2018 +0000
+++ b/src/gpf2/osl/os_sem_fl.c	Sun Jun 24 22:39:27 2018 +0000
@@ -6,8 +6,7 @@
 /* set of included headers from COFF symtab: */
 #include <stdio.h>
 #include <string.h>
-#include "gpfconf.h"	/* FreeCalypso addition */
-#include "../../nucleus/nucleus.h"
+#include "nucleus.h"
 #include "typedefs.h"
 #include "os.h"
 #include "gdi.h"
@@ -73,7 +72,7 @@
 			!= NU_SUCCESS)
 		return(OS_ERROR);
 	for (i = 1; i <= MaxSemaphores; i++)
-		bzero(&SemTable[i], sizeof(T_OS_SEM_TABLE_ENTRY));
+		memset(&SemTable[i], 0, sizeof(T_OS_SEM_TABLE_ENTRY));
 	return(OS_OK);
 }
 
@@ -142,12 +141,13 @@
 		if (!susp)
 			continue;
 		if (susp->sm_suspended_task == (NU_TASK *)tcb)
-			return(SemTable[i].SemCB.sm_name);
+			return((unsigned char *) SemTable[i].SemCB.sm_name);
 		susp = (SM_SUSPEND *)susp->sm_suspend_link.cs_next;
 		for (susp_loopchk = susp; susp != susp_loopchk;
 		     susp = (SM_SUSPEND *)susp->sm_suspend_link.cs_next)
 			if (susp->sm_suspended_task == (NU_TASK *)tcb)
-				return(SemTable[i].SemCB.sm_name);
+				return((unsigned char *)
+					SemTable[i].SemCB.sm_name);
 	}
 	return(0);
 }