summaryrefslogtreecommitdiffstats
path: root/cpukit/score/macros
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1995-12-20 15:39:19 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1995-12-20 15:39:19 +0000
commit5c491aef41558df022032b543d826ef4e49493b5 (patch)
tree248c4d31610a83b98c65dc26fb6a9b54b9db77e1 /cpukit/score/macros
parent4442d21c4368382a7cdddeb6547800dd5d6891b8 (diff)
downloadrtems-5c491aef41558df022032b543d826ef4e49493b5.tar.bz2
changes remerged after lost in disk crash -- recovered from snapshot, partially recovered working tree, etc
Diffstat (limited to 'cpukit/score/macros')
-rw-r--r--cpukit/score/macros/rtems/score/tod.inl5
-rw-r--r--cpukit/score/macros/rtems/score/tqdata.inl12
-rw-r--r--cpukit/score/macros/rtems/score/watchdog.inl21
3 files changed, 23 insertions, 15 deletions
diff --git a/cpukit/score/macros/rtems/score/tod.inl b/cpukit/score/macros/rtems/score/tod.inl
index 9360a588b1..ecab4e6eae 100644
--- a/cpukit/score/macros/rtems/score/tod.inl
+++ b/cpukit/score/macros/rtems/score/tod.inl
@@ -51,9 +51,8 @@
*
*/
-#define _TOD_Activate( ticks ) \
- _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, \
- (ticks), WATCHDOG_ACTIVATE_NOW )
+#define _TOD_Activate( _ticks ) \
+ _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, (_ticks) )
#endif
/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/tqdata.inl b/cpukit/score/macros/rtems/score/tqdata.inl
index c0d7ee8e5e..1df3cd5270 100644
--- a/cpukit/score/macros/rtems/score/tqdata.inl
+++ b/cpukit/score/macros/rtems/score/tqdata.inl
@@ -44,5 +44,17 @@
#define _Thread_queue_Get_number_waiting( _the_thread_queue ) \
( (_the_thread_queue)->count )
+/*PAGE
+ *
+ * _Thread_queue_Enter_critical_section
+ *
+ */
+
+#define _Thread_queue_Enter_critical_section( _the_thread_queue ) \
+ do { \
+ (_the_thread_queue)->sync = TRUE; \
+ (_the_thread_queue)->sync_state = THREAD_QUEUE_NOTHING_HAPPENED; \
+ } while ( 0 )
+
#endif
/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/watchdog.inl b/cpukit/score/macros/rtems/score/watchdog.inl
index a8a061b144..d24224f93d 100644
--- a/cpukit/score/macros/rtems/score/watchdog.inl
+++ b/cpukit/score/macros/rtems/score/watchdog.inl
@@ -84,12 +84,11 @@
*
*/
-#define _Watchdog_Insert_ticks( _the_watchdog, _units, _insert_mode ) \
- { \
+#define _Watchdog_Insert_ticks( _the_watchdog, _units ) \
+ do { \
(_the_watchdog)->initial = (_units); \
- _Watchdog_Insert( &_Watchdog_Ticks_chain, \
- (_the_watchdog), (_insert_mode) ); \
- }
+ _Watchdog_Insert( &_Watchdog_Ticks_chain, (_the_watchdog) ); \
+ } while ( 0 )
/*PAGE
*
@@ -97,12 +96,11 @@
*
*/
-#define _Watchdog_Insert_seconds( _the_watchdog, _units, _insert_mode ) \
- { \
+#define _Watchdog_Insert_seconds( _the_watchdog, _units ) \
+ do { \
(_the_watchdog)->initial = (_units); \
- _Watchdog_Insert( &_Watchdog_Seconds_chain, \
- (_the_watchdog), (_insert_mode) ); \
- }
+ _Watchdog_Insert( &_Watchdog_Seconds_chain, (_the_watchdog) ); \
+ } while ( 0 )
/*PAGE
*
@@ -131,8 +129,7 @@
#define _Watchdog_Reset( _the_watchdog ) \
{ \
(void) _Watchdog_Remove( (_the_watchdog) ); \
- _Watchdog_Insert( &_Watchdog_Ticks_chain, \
- (_the_watchdog), WATCHDOG_ACTIVATE_NOW ); \
+ _Watchdog_Insert( &_Watchdog_Ticks_chain, (_the_watchdog) ); \
}
/*PAGE