[PATCH 2/4] score: Delete STATES_WAITING_FOR_BUFFER

Sebastian Huber sebastian.huber at embedded-brains.de
Tue Jan 10 14:35:05 UTC 2017


---
 cpukit/libdebugger/rtems-debugger-threads.c   |  1 -
 cpukit/libmisc/monitor/mon-prmisc.c           |  2 --
 cpukit/score/include/rtems/score/statesimpl.h | 20 +-------------------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/cpukit/libdebugger/rtems-debugger-threads.c b/cpukit/libdebugger/rtems-debugger-threads.c
index 89c1b9e..aa4cb72 100644
--- a/cpukit/libdebugger/rtems-debugger-threads.c
+++ b/cpukit/libdebugger/rtems-debugger-threads.c
@@ -519,7 +519,6 @@ rtems_debugger_thread_state_str(rtems_debugger_thread* thread,
     { "LIFE",   STATES_LIFE_IS_CHANGING },
     { "SUSP",   STATES_SUSPENDED },
     { "Wbar",   STATES_WAITING_FOR_BARRIER },
-    { "Wbuf",   STATES_WAITING_FOR_BUFFER },
     { "Wcvar",  STATES_WAITING_FOR_CONDITION_VARIABLE },
     { "Wevnt",  STATES_WAITING_FOR_EVENT },
     { "Wisig",  STATES_INTERRUPTIBLE_BY_SIGNAL },
diff --git a/cpukit/libmisc/monitor/mon-prmisc.c b/cpukit/libmisc/monitor/mon-prmisc.c
index a49b084..5f10df1 100644
--- a/cpukit/libmisc/monitor/mon-prmisc.c
+++ b/cpukit/libmisc/monitor/mon-prmisc.c
@@ -112,14 +112,12 @@ rtems_monitor_dump_priority(rtems_task_priority priority)
     return fprintf(stdout,"%3" PRId32, priority);
 }
 
-
 static const rtems_assoc_t rtems_monitor_state_assoc[] = {
     { "DELAY",  STATES_DELAYING, 0 },
     { "DORM",   STATES_DORMANT, 0 },
     { "LIFE",   STATES_LIFE_IS_CHANGING, 0 },
     { "SUSP",   STATES_SUSPENDED, 0 },
     { "Wbar",   STATES_WAITING_FOR_BARRIER, 0 },
-    { "Wbuf",   STATES_WAITING_FOR_BUFFER, 0 },
     { "Wcvar",  STATES_WAITING_FOR_CONDITION_VARIABLE, 0 },
     { "Wevnt",  STATES_WAITING_FOR_EVENT, 0 },
     { "Wisig",  STATES_INTERRUPTIBLE_BY_SIGNAL, 0 },
diff --git a/cpukit/score/include/rtems/score/statesimpl.h b/cpukit/score/include/rtems/score/statesimpl.h
index e321a34..82bcd79 100644
--- a/cpukit/score/include/rtems/score/statesimpl.h
+++ b/cpukit/score/include/rtems/score/statesimpl.h
@@ -46,8 +46,6 @@ extern "C" {
 #define STATES_DELAYING                        0x00000008
 /** This macro corresponds to a task waiting until a specific TOD. */
 #define STATES_WAITING_FOR_TIME                0x00000010
-/** This macro corresponds to a task waiting for a variable length buffer. */
-#define STATES_WAITING_FOR_BUFFER              0x00000020
 /** This macro corresponds to a task waiting for a fixed size segment. */
 #define STATES_WAITING_FOR_SEGMENT             0x00000040
 /** This macro corresponds to a task waiting for a message. */
@@ -99,8 +97,7 @@ extern "C" {
 #define STATES_WAITING_FOR_SYS_LOCK_CONDITION  0x20000000
 
 /** This macro corresponds to a task waiting for a local object operation. */
-#define STATES_LOCALLY_BLOCKED ( STATES_WAITING_FOR_BUFFER             | \
-                                 STATES_WAITING_FOR_SEGMENT            | \
+#define STATES_LOCALLY_BLOCKED ( STATES_WAITING_FOR_SEGMENT            | \
                                  STATES_WAITING_FOR_MESSAGE            | \
                                  STATES_WAITING_FOR_SEMAPHORE          | \
                                  STATES_WAITING_FOR_MUTEX              | \
@@ -238,21 +235,6 @@ RTEMS_INLINE_ROUTINE bool _States_Is_delaying (
 }
 
 /**
- * This function returns true if the WAITING_FOR_BUFFER state is set in
- * the_states, and false otherwise.
- *
- * @param[in] the_states is the task state set to test
- *
- * @return This method returns true if the desired state condition is set.
- */
-RTEMS_INLINE_ROUTINE bool _States_Is_waiting_for_buffer (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_BUFFER);
-}
-
-/**
  * This function returns true if the WAITING_FOR_SEGMENT state is set in
  * the_states, and false otherwise.
  *
-- 
1.8.4.5




More information about the devel mailing list