Changeset 8ca372e in rtems for cpukit/sapi


Ignore:
Timestamp:
Jan 26, 2016, 9:11:48 AM (4 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
1ff8eca
Parents:
6bf44a5
git-author:
Sebastian Huber <sebastian.huber@…> (01/26/16 09:11:48)
git-committer:
Sebastian Huber <sebastian.huber@…> (02/03/16 09:00:57)
Message:

Use linker set for MPCI initialization

Update #2408.

Location:
cpukit/sapi
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • cpukit/sapi/Makefile.am

    r6bf44a5 r8ca372e  
    2020include_rtems_HEADERS += include/rtems/rbtree.h
    2121include_rtems_HEADERS += include/rtems/scheduler.h
    22 include_rtems_HEADERS += include/rtems/sptables.h
    2322include_rtems_HEADERS += include/rtems/timecounter.h
    2423include_rtems_HEADERS += include/rtems/timespec.h
  • cpukit/sapi/include/rtems/config.h

    r6bf44a5 r8ca372e  
    261261   *  This points to the multiprocessing configuration table.
    262262   */
    263   SAPI_EXTERN rtems_multiprocessing_table *_Configuration_MP_table;
     263  extern rtems_multiprocessing_table *_Configuration_MP_table;
    264264#endif
    265265
     
    271271   * be generated by confdefs.h.
    272272   */
    273   extern rtems_multiprocessing_table  Multiprocessing_configuration;
     273  extern rtems_multiprocessing_table Multiprocessing_configuration;
     274
     275  /*
     276   *  This is the default Multiprocessing Configuration Table.
     277   *  It is used in single processor configurations.
     278   */
     279  extern const rtems_multiprocessing_table
     280    _Initialization_Default_multiprocessing_table;
    274281#endif
    275282
  • cpukit/sapi/include/rtems/init.h

    r6bf44a5 r8ca372e  
    3737#include <rtems/rtems/intr.h>
    3838
    39 #if defined(RTEMS_MULTIPROCESSING)
    40 /**
    41  * The following defines the default Multiprocessing Configuration
    42  * Table.  This table is used in a single processor system.
    43  */
    44 extern const rtems_multiprocessing_table
    45   _Initialization_Default_multiprocessing_table;
    46 #endif
    47 
    4839/**
    4940 * @brief Initializes the system and starts multitasking.
  • cpukit/sapi/preinstall.am

    r6bf44a5 r8ca372e  
    8383PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/scheduler.h
    8484
    85 $(PROJECT_INCLUDE)/rtems/sptables.h: include/rtems/sptables.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    86         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/sptables.h
    87 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sptables.h
    88 
    8985$(PROJECT_INCLUDE)/rtems/timecounter.h: include/rtems/timecounter.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    9086        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/timecounter.h
  • cpukit/sapi/src/exinit.c

    r6bf44a5 r8ca372e  
    2121
    2222/*
    23  *  SCORE_INIT and SAPI_INIT are defined so all of the super core and
    24  *  super API data will be included in this object file.
     23 *  SCORE_INIT is defined so all of the super core
     24 *  data will be included in this object file.
    2525 */
    2626
    27 #define SAPI_INIT
    2827#define SCORE_INIT
    2928
     
    4948#include <rtems/score/watchdogimpl.h>
    5049#include <rtems/score/wkspace.h>
    51 
    52 #include <rtems/sptables.h>
    5350
    5451static Objects_Information *
     
    7774   */
    7875
    79   #if defined(RTEMS_MULTIPROCESSING)
    80     /*
    81      *  Initialize the system state based on whether this is an MP system.
    82      *  In an MP configuration, internally we view single processor
    83      *  systems as a very restricted multiprocessor system.
    84      */
    85     _Configuration_MP_table = rtems_configuration_get_user_multiprocessing_table();
    86 
    87     if ( _Configuration_MP_table == NULL ) {
    88       _Configuration_MP_table =
    89         (void *)&_Initialization_Default_multiprocessing_table;
    90     } else {
    91       _System_state_Is_multiprocessing = true;
    92     }
    93   #endif
    94 
    9576  /*
    9677   * Initialize any target architecture specific support as early as possible
    9778   */
    9879  _CPU_Initialize();
    99 
    100   #if defined(RTEMS_MULTIPROCESSING)
    101     _Objects_MP_Handler_early_initialization();
    102   #endif
    10380
    10481  _Thread_Dispatch_initialization();
     
    11693  _Scheduler_Handler_initialization();
    11794
    118   #if defined(RTEMS_MULTIPROCESSING)
    119     _Objects_MP_Handler_initialization();
    120     _MPCI_Handler_initialization( RTEMS_TIMEOUT );
    121   #endif
    122 
    12395  _SMP_Handler_initialize();
    124 }
    125 
    126 static void rtems_initialize_before_drivers(void)
    127 {
    128   #if defined(RTEMS_MULTIPROCESSING)
    129     _MPCI_Create_server();
    130   #endif
    13196}
    13297
     
    146111   */
    147112  _IO_Initialize_all_drivers();
    148 
    149   #if defined(RTEMS_MULTIPROCESSING)
    150     if ( _System_state_Is_multiprocessing ) {
    151       _MPCI_Initialization();
    152       _MPCI_Internal_packets_Send_process_packet(
    153         MPCI_PACKETS_SYSTEM_VERIFY
    154       );
    155     }
    156   #endif
    157113
    158114  /*
     
    184140  _Thread_Create_idle,
    185141  RTEMS_SYSINIT_IDLE_THREADS,
    186   RTEMS_SYSINIT_ORDER_MIDDLE
    187 );
    188 
    189 RTEMS_SYSINIT_ITEM(
    190   rtems_initialize_before_drivers,
    191   RTEMS_SYSINIT_BEFORE_DRIVERS,
    192142  RTEMS_SYSINIT_ORDER_MIDDLE
    193143);
Note: See TracChangeset for help on using the changeset viewer.