X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fsem.c;fp=kern%2Fsem.c;h=7b3b472965999f53b13ac200af5ac1260ceed101;hb=7f5d3d3799955d4ef380bb9199a8e32c6dc72ae1;hp=6f1a773f23493e333ee31cde3fb48d598ca29a33;hpb=4144653aea67c800a8219abd3b36e27ae6ab1bd3;p=bertos.git

diff --git a/kern/sem.c b/kern/sem.c
index 6f1a773f..7b3b4729 100755
--- a/kern/sem.c
+++ b/kern/sem.c
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.11  2006/02/24 01:17:05  bernie
+ *#* Update for new emulator.
+ *#*
  *#* Revision 1.10  2005/11/04 16:20:02  bernie
  *#* Fix reference to README.devlib in header.
  *#*
@@ -47,10 +50,9 @@
  *#*/
 
 #include "sem.h"
-#include "proc.h"
-#include "proc_p.h"
-#include "signal.h"
-#include "hw.h"
+#include <kern/proc.h>
+#include <kern/proc_p.h>
+#include <kern/signal.h>
 #include <cfg/debug.h>
 
 INLINE void sem_verify(struct Semaphore *s)
@@ -139,7 +141,7 @@ void sem_obtain(struct Semaphore *s)
 	}
 	else
 	{
-		ASSERT(ISLISTEMPTY(&s->wait_queue));
+		ASSERT(LIST_EMPTY(&s->wait_queue));
 
 		/* The semaphore was free: lock it */
 		s->owner = CurrentProcess;
@@ -181,7 +183,7 @@ void sem_release(struct Semaphore *s)
 		s->owner = NULL;
 
 		/* Give semaphore to the first applicant, if any */
-		if (UNLIKELY((proc = (Process *)REMHEAD(&s->wait_queue))))
+		if (UNLIKELY((proc = (Process *)list_remHead(&s->wait_queue))))
 		{
 			s->nest_count = 1;
 			s->owner = proc;