projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix SPI1 activation bug. Now SPI1 on at91sam7x is fully functional.
[bertos.git]
/
bertos
/
kern
/
sem.c
diff --git
a/bertos/kern/sem.c
b/bertos/kern/sem.c
index 0f31fa067b9fff651945b60076adaf3e855e05f4..ac4e7d969bb4afa5bd505a182a16a59b9a31372f 100644
(file)
--- a/
bertos/kern/sem.c
+++ b/
bertos/kern/sem.c
@@
-27,22
+27,23
@@
* the GNU General Public License.
*
* Copyright 2001, 2004 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2001, 2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2000, 2001 Bernardo Innocenti <bernie@develer.com>
- *
+ * Copyright 1999, 2000, 2001 Bernie Innocenti <bernie@codewiz.org>
* -->
*
* \brief Semaphore based synchronization services.
*
* \version $Id$
* -->
*
* \brief Semaphore based synchronization services.
*
* \version $Id$
- *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
*/
#include "sem.h"
*/
#include "sem.h"
+#include <cfg/debug.h>
+
+#include <cpu/irq.h> // ASSERT_IRQ_DISABLED()
+
#include <kern/proc.h>
#include <kern/proc_p.h>
#include <kern/signal.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)
{
INLINE void sem_verify(struct Semaphore *s)
{
@@
-53,7
+54,6
@@
INLINE void sem_verify(struct Semaphore *s)
ASSERT(s->nest_count < 128); // heuristic max
}
ASSERT(s->nest_count < 128); // heuristic max
}
-
/**
* \brief Initialize a Semaphore structure.
*/
/**
* \brief Initialize a Semaphore structure.
*/
@@
-128,7
+128,7
@@
void sem_obtain(struct Semaphore *s)
* be locked for us.
*/
proc_permit();
* be locked for us.
*/
proc_permit();
- proc_s
chedule
();
+ proc_s
witch
();
}
else
{
}
else
{
@@
-178,7
+178,7
@@
void sem_release(struct Semaphore *s)
{
s->nest_count = 1;
s->owner = proc;
{
s->nest_count = 1;
s->owner = proc;
-
SCHED_ENQUEUE(proc
);
+
ATOMIC(SCHED_ENQUEUE(proc)
);
}
}
}
}