summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-18 07:00:55 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-21 07:29:38 +0200
commit8765c574b1e87392a60d90b7982fca8ae945e26d (patch)
tree5a96a8e346130699d22c428b6a3cda4ccfe50762
parentscore: Close semaphore object before flush (diff)
downloadrtems-8765c574b1e87392a60d90b7982fca8ae945e26d.tar.bz2
score: Remove id parameter _CORE_mutex_Seize()
Parameter was unused.
-rw-r--r--cpukit/libnetworking/rtems/rtems_glue.c1
-rw-r--r--cpukit/posix/src/mutexlocksupp.c1
-rw-r--r--cpukit/rtems/src/semobtain.c1
-rw-r--r--cpukit/score/include/rtems/score/coremuteximpl.h8
-rw-r--r--cpukit/score/src/apimutexlock.c1
-rw-r--r--cpukit/score/src/coremutexseize.c2
6 files changed, 2 insertions, 12 deletions
diff --git a/cpukit/libnetworking/rtems/rtems_glue.c b/cpukit/libnetworking/rtems/rtems_glue.c
index 17df156284..38c7fd50e8 100644
--- a/cpukit/libnetworking/rtems/rtems_glue.c
+++ b/cpukit/libnetworking/rtems/rtems_glue.c
@@ -394,7 +394,6 @@ rtems_bsdnet_semaphore_obtain (void)
_CORE_mutex_Seize (
&the_networkSemaphore->Core_control.mutex,
executing,
- networkSemaphore,
1, /* wait */
0, /* forever */
&lock_context
diff --git a/cpukit/posix/src/mutexlocksupp.c b/cpukit/posix/src/mutexlocksupp.c
index 0ec9b852b2..9e78c9ea45 100644
--- a/cpukit/posix/src/mutexlocksupp.c
+++ b/cpukit/posix/src/mutexlocksupp.c
@@ -60,7 +60,6 @@ int _POSIX_Mutex_Lock_support(
_CORE_mutex_Seize(
&the_mutex->Mutex,
executing,
- the_mutex->Object.id,
blocking,
timeout,
&lock_context
diff --git a/cpukit/rtems/src/semobtain.c b/cpukit/rtems/src/semobtain.c
index 0b43af43d8..556738fcce 100644
--- a/cpukit/rtems/src/semobtain.c
+++ b/cpukit/rtems/src/semobtain.c
@@ -83,7 +83,6 @@ rtems_status_code rtems_semaphore_obtain(
_CORE_mutex_Seize(
&the_semaphore->Core_control.mutex,
executing,
- id,
wait,
timeout,
&lock_context
diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h
index 7facabb7c5..e423d848d3 100644
--- a/cpukit/score/include/rtems/score/coremuteximpl.h
+++ b/cpukit/score/include/rtems/score/coremuteximpl.h
@@ -212,7 +212,6 @@ void _CORE_mutex_Seize_interrupt_blocking(
* support routine @a _Core_mutex_Seize_interrupt_blocking.
*
* @param[in] the_mutex is the mutex to attempt to lock
- * @param[in] id is the Id of the owning API level Semaphore object
* @param[in] wait is true if the thread is willing to wait
* @param[in] timeout is the maximum number of ticks to block
* @param[in] lock_context is a temporary variable used to contain the ISR
@@ -234,7 +233,6 @@ void _CORE_mutex_Seize_interrupt_blocking(
RTEMS_INLINE_ROUTINE void _CORE_mutex_Seize_body(
CORE_mutex_Control *the_mutex,
Thread_Control *executing,
- Objects_Id id,
bool wait,
Watchdog_Interval timeout,
ISR_lock_Context *lock_context
@@ -269,7 +267,6 @@ RTEMS_INLINE_ROUTINE void _CORE_mutex_Seize_body(
*
* @param[in] _the_mutex is the mutex to attempt to lock
* @param[in] _executing The currently executing thread.
- * @param[in] _id is the Id of the owning API level Semaphore object
* @param[in] _wait is true if the thread is willing to wait
* @param[in] _timeout is the maximum number of ticks to block
* @param[in] _lock_context is a temporary variable used to contain the ISR
@@ -279,16 +276,15 @@ RTEMS_INLINE_ROUTINE void _CORE_mutex_Seize_body(
void _CORE_mutex_Seize(
CORE_mutex_Control *_the_mutex,
Thread_Control *_executing,
- Objects_Id _id,
bool _wait,
Watchdog_Interval _timeout,
ISR_lock_Context *_lock_context
);
#else
#define _CORE_mutex_Seize( \
- _the_mutex, _executing, _id, _wait, _timeout, _lock_context ) \
+ _the_mutex, _executing, _wait, _timeout, _lock_context ) \
_CORE_mutex_Seize_body( \
- _the_mutex, _executing, _id, _wait, _timeout, _lock_context )
+ _the_mutex, _executing, _wait, _timeout, _lock_context )
#endif
CORE_mutex_Status _CORE_mutex_Do_surrender(
diff --git a/cpukit/score/src/apimutexlock.c b/cpukit/score/src/apimutexlock.c
index bcac71a9c3..2e36518c55 100644
--- a/cpukit/score/src/apimutexlock.c
+++ b/cpukit/score/src/apimutexlock.c
@@ -35,7 +35,6 @@ void _API_Mutex_Lock( API_Mutex_Control *the_mutex )
_CORE_mutex_Seize(
&the_mutex->Mutex,
_Thread_Executing,
- the_mutex->Object.id,
true,
0,
&lock_context
diff --git a/cpukit/score/src/coremutexseize.c b/cpukit/score/src/coremutexseize.c
index fa45151d0b..d76c977aba 100644
--- a/cpukit/score/src/coremutexseize.c
+++ b/cpukit/score/src/coremutexseize.c
@@ -28,7 +28,6 @@
void _CORE_mutex_Seize(
CORE_mutex_Control *_the_mutex,
Thread_Control *_executing,
- Objects_Id _id,
bool _wait,
Watchdog_Interval _timeout,
ISR_Level _level
@@ -37,7 +36,6 @@ void _CORE_mutex_Seize(
_CORE_mutex_Seize_body(
_the_mutex,
_executing,
- _id,
_wait,
_timeout,
_level