projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo.
[bertos.git]
/
kern
/
sem.c
diff --git
a/kern/sem.c
b/kern/sem.c
index 6f1a773f23493e333ee31cde3fb48d598ca29a33..304e64fdde27e4c2b0d557b869b087743628ef6d 100755
(executable)
--- a/
kern/sem.c
+++ b/
kern/sem.c
@@
-1,4
+1,4
@@
-/*
!
+/*
*
* \file
* <!--
* Copyright 2001, 2004 Develer S.r.l. (http://www.develer.com/)
* \file
* <!--
* Copyright 2001, 2004 Develer S.r.l. (http://www.develer.com/)
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.12 2006/07/19 12:56:27 bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* 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.
*#*
*#* Revision 1.10 2005/11/04 16:20:02 bernie
*#* Fix reference to README.devlib in header.
*#*
@@
-47,10
+53,9
@@
*#*/
#include "sem.h"
*#*/
#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)
#include <cfg/debug.h>
INLINE void sem_verify(struct Semaphore *s)
@@
-61,7
+66,7
@@
INLINE void sem_verify(struct Semaphore *s)
}
}
-/*
!
+/*
*
* \brief Initialize a Semaphore structure.
*/
void sem_init(struct Semaphore *s)
* \brief Initialize a Semaphore structure.
*/
void sem_init(struct Semaphore *s)
@@
-72,7
+77,7
@@
void sem_init(struct Semaphore *s)
}
}
-/*
!
+/*
*
* \brief Attempt to lock a semaphore without waiting.
*
* \return true in case of success, false if the semaphore
* \brief Attempt to lock a semaphore without waiting.
*
* \return true in case of success, false if the semaphore
@@
-101,7
+106,7
@@
bool sem_attempt(struct Semaphore *s)
}
}
-/*
!
+/*
*
* \brief Lock a semaphore.
*
* If the semaphore is already owned by another process, the caller
* \brief Lock a semaphore.
*
* If the semaphore is already owned by another process, the caller
@@
-139,7
+144,7
@@
void sem_obtain(struct Semaphore *s)
}
else
{
}
else
{
- ASSERT(
ISLIST
EMPTY(&s->wait_queue));
+ ASSERT(
LIST_
EMPTY(&s->wait_queue));
/* The semaphore was free: lock it */
s->owner = CurrentProcess;
/* The semaphore was free: lock it */
s->owner = CurrentProcess;
@@
-149,7
+154,7
@@
void sem_obtain(struct Semaphore *s)
}
}
-/*
!
+/*
*
* \brief Release a lock on a previously locked semaphore.
*
* If the nesting count of the semaphore reaches zero,
* \brief Release a lock on a previously locked semaphore.
*
* If the nesting count of the semaphore reaches zero,
@@
-181,7
+186,7
@@
void sem_release(struct Semaphore *s)
s->owner = NULL;
/* Give semaphore to the first applicant, if any */
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;
{
s->nest_count = 1;
s->owner = proc;