diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-09 21:52:09 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-09 21:52:09 +0000 |
| commit | 17b73dc766910526c59923f9afcfa11aca4fd548 (patch) | |
| tree | ebc50b79f7b71b898857bbda82e7311224d51425 /cpukit | |
| parent | 2007-11-09 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-17b73dc766910526c59923f9afcfa11aca4fd548.tar.bz2 | |
2007-11-09 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/src/apimutexlock.c, score/src/apimutexunlock.c: Functions were
in opposite files. Whoops!
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/src/apimutexlock.c | 20 | ||||
| -rw-r--r-- | cpukit/score/src/apimutexunlock.c | 20 |
3 files changed, 25 insertions, 20 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 91f6461e84..18d6091cdb 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2007-11-09 Joel Sherrill <joel.sherrill@OARcorp.com> + + * score/src/apimutexlock.c, score/src/apimutexunlock.c: Functions were + in opposite files. Whoops! + 2007-11-09 Joel Sherrill <joel.sherrill@oarcorp.com> * libmisc/shell/shell.c, libmisc/shell/shell.h: Much cleanup but much diff --git a/cpukit/score/src/apimutexlock.c b/cpukit/score/src/apimutexlock.c index ca824a6e6c..3618af1d8a 100644 --- a/cpukit/score/src/apimutexlock.c +++ b/cpukit/score/src/apimutexlock.c @@ -16,15 +16,19 @@ #include <rtems/system.h> #include <rtems/score/apimutex.h> -void _API_Mutex_Unlock( +void _API_Mutex_Lock( API_Mutex_Control *the_mutex ) { - _Thread_Disable_dispatch(); - _CORE_mutex_Surrender( - &the_mutex->Mutex, - the_mutex->Object.id, - NULL - ); - _Thread_Enable_dispatch(); + ISR_Level level; + + _ISR_Disable( level ); + + _CORE_mutex_Seize( + &the_mutex->Mutex, + the_mutex->Object.id, + TRUE, + 0, + level + ); } diff --git a/cpukit/score/src/apimutexunlock.c b/cpukit/score/src/apimutexunlock.c index 3618af1d8a..ca824a6e6c 100644 --- a/cpukit/score/src/apimutexunlock.c +++ b/cpukit/score/src/apimutexunlock.c @@ -16,19 +16,15 @@ #include <rtems/system.h> #include <rtems/score/apimutex.h> -void _API_Mutex_Lock( +void _API_Mutex_Unlock( API_Mutex_Control *the_mutex ) { - ISR_Level level; - - _ISR_Disable( level ); - - _CORE_mutex_Seize( - &the_mutex->Mutex, - the_mutex->Object.id, - TRUE, - 0, - level - ); + _Thread_Disable_dispatch(); + _CORE_mutex_Surrender( + &the_mutex->Mutex, + the_mutex->Object.id, + NULL + ); + _Thread_Enable_dispatch(); } |