Ticket #1922: extern_fix3.diff

File extern_fix3.diff, 4.9 KB (added by Petr Benes, on 10/02/11 at 20:38:43)

EDF and CBS scheduler: extern declarations fix -version 3

  • cpukit/score/include/rtems/score/schedulercbs.h 

    diff --git a/cpukit/score/include/rtems/score/schedulercbs.h b/cpukit/score/include/rtems/score/schedulercbs.h
index a319dfe..2f5d9bf 100644
    a b typedef struct { 
    130130 * List of servers. The @a Scheduler_CBS_Server is the index to the array
    131131 * of pointers to @a _Scheduler_CBS_Server_list.
    132132 */
    133 Scheduler_CBS_Server **_Scheduler_CBS_Server_list;
     133extern Scheduler_CBS_Server **_Scheduler_CBS_Server_list;
    134134
    135135/**
    136136 *  @brief Scheduler CBS Unblock

  • cpukit/score/src/schedulercbs.c 

    diff --git a/cpukit/score/src/schedulercbs.c b/cpukit/score/src/schedulercbs.c
index d29279e..9964055 100644
    a b  
    1919#include <rtems/score/schedulercbs.h>
    2020#include <rtems/rtems/signal.h>
    2121
     22Scheduler_CBS_Server **_Scheduler_CBS_Server_list;
     23
    2224void _Scheduler_CBS_Budget_callout(
    2325  Thread_Control *the_thread
    2426)

  • testsuites/sptests/spcbssched02/system.h 

    diff --git a/testsuites/sptests/spcbssched02/system.h b/testsuites/sptests/spcbssched02/system.h
index b34ab10..b1758c1 100644
    a b rtems_task Task_Periodic( 
    5252
    5353/* global variables */
    5454
    55 rtems_id   Task_id;
    56 rtems_name Task_name;
    57 rtems_id   Task_id2;
    58 rtems_name Task_name2;
    59 rtems_task_priority Priority;
    60 time_t  Period;
    61 time_t  Execution;
    62 time_t  Phase;
     55TEST_EXTERN rtems_id   Task_id;
     56TEST_EXTERN rtems_name Task_name;
     57TEST_EXTERN rtems_id   Task_id2;
     58TEST_EXTERN rtems_name Task_name2;
     59TEST_EXTERN rtems_task_priority Priority;
     60TEST_EXTERN time_t  Period;
     61TEST_EXTERN time_t  Execution;
     62TEST_EXTERN time_t  Phase;
    6363
    6464/* end of include file */

  • testsuites/sptests/spcbssched03/system.h 

    diff --git a/testsuites/sptests/spcbssched03/system.h b/testsuites/sptests/spcbssched03/system.h
index 23736a3..6dfddc1 100644
    a b rtems_task Tasks_Aperiodic( 
    6464
    6565TEST_EXTERN rtems_id   Task_id[ 1+NUM_TASKS ];     /* array of task ids */
    6666TEST_EXTERN rtems_name Task_name[ 1+NUM_TASKS ];   /* array of task names */
    67 extern rtems_task_priority Priorities[ 1+NUM_TASKS ];
    68 extern uint32_t  Periods[ 1 + NUM_PERIODIC_TASKS ];
    69 extern uint32_t  Phases[1 + NUM_TASKS];
    70 extern uint32_t  Execution[1 + NUM_TASKS];
    71 bool Violating_task[1 + NUM_PERIODIC_TASKS];
     67TEST_EXTERN rtems_task_priority Priorities[ 1+NUM_TASKS ];
     68TEST_EXTERN uint32_t  Periods[ 1 + NUM_PERIODIC_TASKS ];
     69TEST_EXTERN uint32_t  Phases[1 + NUM_TASKS];
     70TEST_EXTERN uint32_t  Execution[1 + NUM_TASKS];
     71TEST_EXTERN bool Violating_task[1 + NUM_PERIODIC_TASKS];
    7272
    7373/* end of include file */

  • testsuites/sptests/spedfsched02/system.h 

    diff --git a/testsuites/sptests/spedfsched02/system.h b/testsuites/sptests/spedfsched02/system.h
index 8007684..5603d16 100644
    a b TEST_EXTERN rtems_name Task_name[ 7 ]; /* array of task names */ 
    6060
    6161TEST_EXTERN struct counters Count;       /* iteration counters */
    6262TEST_EXTERN struct counters Temporary_count;
    63 extern rtems_task_priority Priorities[ 7 ];
     63TEST_EXTERN rtems_task_priority *Priorities;
    6464
    6565/* end of include file */

  • testsuites/sptests/spedfsched02/task1.c 

    diff --git a/testsuites/sptests/spedfsched02/task1.c b/testsuites/sptests/spedfsched02/task1.c
index 7354f29..98c8788 100644
    a b  
    2727
    2828uint32_t      Periods[7]    = { 0,   2,   2,   2,   2, 100, 0 };
    2929uint32_t      Iterations[7] = { 0,  50,  50,  50,  50,   1, TA6_ITERATIONS };
    30 rtems_task_priority Priorities[7] = { 0,   2,   2,   2,   2,  100, 1 };
     30rtems_task_priority Prio[7] = { 0,   2,   2,   2,   2,  100, 1 };
    3131
    3232rtems_task Task_1_through_6(
    3333  rtems_task_argument argument
    … … rtems_task Task_1_through_6( 
    4040  uint32_t          failed;
    4141  rtems_status_code status;
    4242
     43  Priorities = Prio;
     44
    4345  status = rtems_rate_monotonic_create( argument, &rmid );
    4446  directive_failed( status, "rtems_rate_monotonic_create" );
    4547  put_name( Task_name[ argument ], FALSE );

  • testsuites/sptests/spedfsched03/system.h 

    diff --git a/testsuites/sptests/spedfsched03/system.h b/testsuites/sptests/spedfsched03/system.h
index 01f6399..f490607 100644
    a b rtems_task Tasks_Aperiodic( 
    6363
    6464TEST_EXTERN rtems_id   Task_id[ 1+NUM_TASKS ];     /* array of task ids */
    6565TEST_EXTERN rtems_name Task_name[ 1+NUM_TASKS ];   /* array of task names */
    66 extern rtems_task_priority Priorities[ 1+NUM_TASKS ];
    67 extern uint32_t  Periods[ 1 + NUM_PERIODIC_TASKS ];
    68 extern uint32_t  Phases[1 + NUM_TASKS];
    69 extern uint32_t  Execution[1 + NUM_TASKS];
     66TEST_EXTERN rtems_task_priority Priorities[ 1+NUM_TASKS ];
     67TEST_EXTERN uint32_t  Periods[ 1 + NUM_PERIODIC_TASKS ];
     68TEST_EXTERN uint32_t  Phases[1 + NUM_TASKS];
     69TEST_EXTERN uint32_t  Execution[1 + NUM_TASKS];
    7070
    7171/* end of include file */