Changeset 9221838 in rtems


Ignore:
Timestamp:
Nov 28, 2007, 10:04:31 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, master
Children:
dd0e6bf
Parents:
12ae8a16
Message:

2007-11-28 Joel Sherrill <joel.sherrill@…>

  • sapi/src/exinit.c, score/include/rtems/score/object.h, score/include/rtems/score/thread.h, score/src/object.c, score/src/thread.c: Conditionally compile out more code that is specific to multiprocessor configurations.
Location:
cpukit
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r12ae8a16 r9221838  
     12007-11-28      Joel Sherrill <joel.sherrill@OARcorp.com>
     2
     3        * sapi/src/exinit.c, score/include/rtems/score/object.h,
     4        score/include/rtems/score/thread.h, score/src/object.c,
     5        score/src/thread.c: Conditionally compile out more code that is
     6        specific to multiprocessor configurations.
     7
    182007-11-28      Joel Sherrill <joel.sherrill@oarcorp.com>
    29
  • cpukit/sapi/src/exinit.c

    r12ae8a16 r9221838  
    22 *  Initialization Manager
    33 *
    4  *  COPYRIGHT (c) 1989-1999.
     4 *  COPYRIGHT (c) 1989-2007.
    55 *  On-Line Applications Research Corporation (OAR).
    66 *
     
    6868{
    6969  rtems_interrupt_level        bsp_level;
    70   rtems_multiprocessing_table *multiprocessing_table;
    7170
    7271  /*
     
    7574   *  switch before the executive is initialized.
    7675   */
    77 
    7876  _ISR_Disable( bsp_level );
    7977
     78  /*
     79   *  Make sure the parameters were not NULL.
     80   */
    8081  if ( configuration_table == NULL )
    8182    _Internal_error_Occurred(
     
    8586    );
    8687
    87   /*
    88    *  Initialize the system state based on whether this is an MP system.
    89    */
    90 
    91 #if defined(RTEMS_MULTIPROCESSING)
    92   multiprocessing_table = configuration_table->User_multiprocessing_table;
    93 
    94   _System_state_Handler_initialization(
    95     (multiprocessing_table) ? TRUE : FALSE
    96   );
    97 #else
    98   multiprocessing_table = NULL;
    99 
    100   _System_state_Handler_initialization( FALSE );
    101 #endif
    102 
    103   /*
    104    *  Grab our own copy of the user's CPU table.
    105    */
    106 
    107   _CPU_Table = *cpu_table;
    108 
    109   /*
    110    *  Provided just for user convenience.
    111    */
    112 
    113   _Configuration_Table    = configuration_table;
    114 #if defined(RTEMS_MULTIPROCESSING)
    115   _Configuration_MP_table = multiprocessing_table;
    116 #endif
    117 
    118   /*
    119    *  Internally we view single processor systems as a very restricted
    120    *  multiprocessor system.
    121    */
    122 
    123   if ( multiprocessing_table == NULL )
    124     multiprocessing_table =
    125       (void *)&_Initialization_Default_multiprocessing_table;
    126 
    12788  if ( cpu_table == NULL )
    12889    _Internal_error_Occurred(
     
    13293    );
    13394
     95#if defined(RTEMS_MULTIPROCESSING)
     96  /*
     97   *  Initialize the system state based on whether this is an MP system.
     98   *  In an MP configuration, internally we view single processor
     99   *  systems as a very restricted multiprocessor system.
     100   */
     101  _Configuration_MP_table = configuration_table->User_multiprocessing_table;
     102
     103  if ( _Configuration_MP_table == NULL ) {
     104    _Configuration_MP_table =
     105      (void *)&_Initialization_Default_multiprocessing_table;
     106    _System_state_Handler_initialization( FALSE );
     107  } else {
     108    _System_state_Handler_initialization( TRUE );
     109  }
     110#else
     111  _System_state_Handler_initialization( FALSE );
     112#endif
     113
     114  /*
     115   *  Grab our own copy of the user's CPU table.
     116   */
     117  _CPU_Table = *cpu_table;
     118
     119  /*
     120   *  Provide pointers just for later convenience.
     121   */
     122  _Configuration_Table    = configuration_table;
     123
    134124  _CPU_Initialize( cpu_table, _Thread_Dispatch );
    135125
     
    158148
    159149  _Objects_Handler_initialization(
    160     multiprocessing_table->node,
    161     multiprocessing_table->maximum_nodes,
    162     multiprocessing_table->maximum_global_objects
     150#if defined(RTEMS_MULTIPROCESSING)
     151    _Configuration_MP_table->node,
     152    _Configuration_MP_table->maximum_nodes,
     153    _Configuration_MP_table->maximum_global_objects
     154#endif
    163155  );
    164156
     
    179171  _Thread_Handler_initialization(
    180172    configuration_table->ticks_per_timeslice,
    181     configuration_table->maximum_extensions,
     173    configuration_table->maximum_extensions
     174#if defined(RTEMS_MULTIPROCESSING)
     175    ,
    182176    multiprocessing_table->maximum_proxies
     177#endif
    183178  );
    184179
  • cpukit/score/include/rtems/score/object.h

    r12ae8a16 r9221838  
    436436 */
    437437void _Objects_Handler_initialization(
     438#if defined(RTEMS_MULTIPROCESSING)
    438439  uint32_t   node,
    439440  uint32_t   maximum_nodes,
    440441  uint32_t   maximum_global_objects
     442#endif
    441443);
    442444
  • cpukit/score/include/rtems/score/thread.h

    r12ae8a16 r9221838  
    77
    88/*
    9  *  COPYRIGHT (c) 1989-2006.
     9 *  COPYRIGHT (c) 1989-2007.
    1010 *  On-Line Applications Research Corporation (OAR).
    1111 *
     
    474474void _Thread_Handler_initialization (
    475475  uint32_t     ticks_per_timeslice,
    476   uint32_t     maximum_extensions,
     476  uint32_t     maximum_extensions
     477#if defined(RTEMS_MULTIPROCESSING)
     478  ,
    477479  uint32_t     maximum_proxies
     480#endif
    478481);
    479482
  • cpukit/score/src/object.c

    r12ae8a16 r9221838  
    33 *
    44 *
    5  *  COPYRIGHT (c) 1989-1999.
     5 *  COPYRIGHT (c) 1989-2007.
    66 *  On-Line Applications Research Corporation (OAR).
    77 *
     
    4444
    4545void _Objects_Handler_initialization(
     46#if defined(RTEMS_MULTIPROCESSING)
    4647  uint32_t   node,
    4748  uint32_t   maximum_nodes,
    4849  uint32_t   maximum_global_objects
     50#endif
    4951)
    5052{
     53#if defined(RTEMS_MULTIPROCESSING)
    5154  if ( node < 1 || node > maximum_nodes )
    5255    _Internal_error_Occurred(
     
    5659    );
    5760
    58 #if defined(RTEMS_MULTIPROCESSING)
    5961  _Objects_Local_node    = node;
    6062  _Objects_Maximum_nodes = maximum_nodes;
  • cpukit/score/src/thread.c

    r12ae8a16 r9221838  
    33 *
    44 *
    5  *  COPYRIGHT (c) 1989-1999.
     5 *  COPYRIGHT (c) 1989-2007.
    66 *  On-Line Applications Research Corporation (OAR).
    77 *
     
    4646void _Thread_Handler_initialization(
    4747  uint32_t     ticks_per_timeslice,
    48   uint32_t     maximum_extensions,
     48  uint32_t     maximum_extensions
     49#if defined(RTEMS_MULTIPROCESSING)
     50  ,
    4951  uint32_t     maximum_proxies
     52#endif
    5053)
    5154{
Note: See TracChangeset for help on using the changeset viewer.