2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>

* mp14/delay.c, mp14/evtmtask.c: Pass task Id to TSR.
	* mp14/system.h: Semaphore_task_id and Semaphore_task_name arrays
	were one entry too short.
This commit is contained in:
Joel Sherrill
2008-09-05 21:30:17 +00:00
parent 8cf1c1d318
commit 7753aa9fd5
4 changed files with 20 additions and 12 deletions

View File

@@ -1,3 +1,9 @@
2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>
* mp14/delay.c, mp14/evtmtask.c: Pass task Id to TSR.
* mp14/system.h: Semaphore_task_id and Semaphore_task_name arrays
were one entry too short.
2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com> 2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>
* mp03/delay.c, mp06/task1.c, mp06/node2/mp06-node2.scn, mp07/task1.c: * mp03/delay.c, mp06/task1.c, mp06/node2/mp06-node2.scn, mp07/task1.c:

View File

@@ -20,14 +20,13 @@
rtems_timer_service_routine Delayed_send_event( rtems_timer_service_routine Delayed_send_event(
rtems_id timer_id, rtems_id timer_id,
void *ignored void *id_ptr
) )
{ {
rtems_status_code status; rtems_status_code status;
rtems_id id = *(rtems_id *)id_ptr;
status = rtems_event_send( status = rtems_event_send( id, RTEMS_EVENT_16 );
Task_id[ rtems_object_id_get_index( timer_id ) ], fatal_directive_check_status_only(
RTEMS_EVENT_16 status, RTEMS_SUCCESSFUL, "rtems_event_send" );
);
fatal_directive_check_status_only( status, RTEMS_SUCCESSFUL, "rtems_event_send" );
} }

View File

@@ -24,10 +24,11 @@ rtems_task Delayed_events_task(
rtems_task_argument argument rtems_task_argument argument
) )
{ {
uint32_t count; uint32_t count;
uint32_t previous_mode; uint32_t previous_mode;
rtems_status_code status; rtems_status_code status;
rtems_event_set events; rtems_event_set events;
rtems_id self;
status = rtems_task_mode( status = rtems_task_mode(
RTEMS_PREEMPT | RTEMS_TIMESLICE, RTEMS_PREEMPT | RTEMS_TIMESLICE,
@@ -39,13 +40,15 @@ rtems_task Delayed_events_task(
status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] ); status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
directive_failed( status, "rtems_timer_create" ); directive_failed( status, "rtems_timer_create" );
self = rtems_task_self();
while ( Stop_Test == false ) { while ( Stop_Test == false ) {
for ( count=DELAYED_EVENT_DOT_COUNT; Stop_Test == false && count; count-- ){ for ( count=DELAYED_EVENT_DOT_COUNT; Stop_Test == false && count; count-- ){
status = rtems_timer_fire_after( status = rtems_timer_fire_after(
Timer_id[ 1 ], Timer_id[ 1 ],
1, 1,
Delayed_send_event, Delayed_send_event,
NULL &self
); );
directive_failed( status, "rtems_timer_reset" ); directive_failed( status, "rtems_timer_reset" );

View File

@@ -19,7 +19,7 @@
rtems_timer_service_routine Delayed_send_event( rtems_timer_service_routine Delayed_send_event(
rtems_id timer_id, rtems_id timer_id,
void *ignored_address void *id_ptr
); );
rtems_task Init( rtems_task Init(
@@ -78,8 +78,8 @@ void Exit_test( void );
TEST_EXTERN rtems_id Event_task_id[ 2 ]; /* event task ids */ TEST_EXTERN rtems_id Event_task_id[ 2 ]; /* event task ids */
TEST_EXTERN rtems_id Semaphore_task_id[ 2 ]; /* semaphore task ids */ TEST_EXTERN rtems_id Semaphore_task_id[ 3 ]; /* semaphore task ids */
TEST_EXTERN rtems_name Semaphore_task_name[ 2 ]; /* semaphore task names */ TEST_EXTERN rtems_name Semaphore_task_name[ 3 ]; /* semaphore task names */
TEST_EXTERN rtems_id Queue_task_id[ 3 ]; /* message queue task ids */ TEST_EXTERN rtems_id Queue_task_id[ 3 ]; /* message queue task ids */
TEST_EXTERN rtems_name Queue_task_name[ 3 ]; /* message queue task names */ TEST_EXTERN rtems_name Queue_task_name[ 3 ]; /* message queue task names */