projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
acc4fc6
)
Make mutex functions reentrant
author
Keith Packard
<keithp@keithp.com>
Wed, 15 Apr 2009 04:22:31 +0000
(21:22 -0700)
committer
Keith Packard
<keithp@keithp.com>
Wed, 15 Apr 2009 04:22:31 +0000
(21:22 -0700)
ao.h
patch
|
blob
|
history
ao_mutex.c
patch
|
blob
|
history
diff --git
a/ao.h
b/ao.h
index 5574f30fe156fb7262c2e983b0e748496772eae8..39ad9587d2073d45d9edc519b71a24a8077315bf 100644
(file)
--- a/
ao.h
+++ b/
ao.h
@@
-305,10
+305,10
@@
ao_dma_isr(void) interrupt 8;
*/
void
*/
void
-ao_mutex_get(__xdata uint8_t *ao_mutex);
+ao_mutex_get(__xdata uint8_t *ao_mutex)
__reentrant
;
void
void
-ao_mutex_put(__xdata uint8_t *ao_mutex);
+ao_mutex_put(__xdata uint8_t *ao_mutex)
__reentrant
;
/*
* ao_ee.c
/*
* ao_ee.c
diff --git
a/ao_mutex.c
b/ao_mutex.c
index 12c67960751ccc1970a27769ec4c707e730d3fdf..8212a515570506bb740c0f62445f58f43f8fa87b 100644
(file)
--- a/
ao_mutex.c
+++ b/
ao_mutex.c
@@
-18,7
+18,7
@@
#include "ao.h"
void
#include "ao.h"
void
-ao_mutex_get(__xdata uint8_t *mutex)
+ao_mutex_get(__xdata uint8_t *mutex)
__reentrant
{
if (*mutex == ao_cur_task->task_id)
ao_panic(AO_PANIC_MUTEX);
{
if (*mutex == ao_cur_task->task_id)
ao_panic(AO_PANIC_MUTEX);
@@
-30,7
+30,7
@@
ao_mutex_get(__xdata uint8_t *mutex)
}
void
}
void
-ao_mutex_put(__xdata uint8_t *mutex)
+ao_mutex_put(__xdata uint8_t *mutex)
__reentrant
{
if (*mutex != ao_cur_task->task_id)
ao_panic(AO_PANIC_MUTEX);
{
if (*mutex != ao_cur_task->task_id)
ao_panic(AO_PANIC_MUTEX);