Changeset 567455b6 in rtems


Ignore:
Timestamp:
Feb 14, 2020, 12:57:20 PM (5 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
5, master
Children:
ba46b936
Parents:
ad85c00
git-author:
Sebastian Huber <sebastian.huber@…> (02/14/20 12:57:20)
git-committer:
Sebastian Huber <sebastian.huber@…> (02/25/20 06:15:19)
Message:

config: Add _SMP_Processor_configure_maximum

Move the processor maximum configuration constant out of the
configuration table.

Update #3875.

Location:
cpukit/include/rtems
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/include/rtems/confdefs.h

    rad85c00 r567455b6  
    26402640    #ifdef RTEMS_SMP
    26412641      #ifdef _CONFIGURE_SMP_APPLICATION
    2642         true,
     2642        true
    26432643      #else
    2644         false,
     2644        false
    26452645      #endif
    26462646    #endif
    2647     #ifdef RTEMS_SMP
    2648       _CONFIGURE_MAXIMUM_PROCESSORS,
    2649     #endif
    26502647  };
     2648
     2649  #ifdef RTEMS_SMP
     2650    const uint32_t _SMP_Processor_configured_maximum =
     2651      _CONFIGURE_MAXIMUM_PROCESSORS;
     2652  #endif
    26512653
    26522654  const uintptr_t _Workspace_Size = CONFIGURE_EXECUTIVE_RAM_SIZE;
  • cpukit/include/rtems/config.h

    rad85c00 r567455b6  
    3131#include <rtems/score/isr.h>
    3232#include <rtems/score/memory.h>
     33#include <rtems/score/smp.h>
    3334#include <rtems/score/stack.h>
    3435#include <rtems/score/userextdata.h>
     
    8788    bool                         smp_enabled;
    8889  #endif
    89 
    90   #ifdef RTEMS_SMP
    91     uint32_t                     maximum_processors;
    92   #endif
    9390} rtems_configuration_table;
    9491
     
    205202 * @return The configured maximum count of processors.
    206203 */
    207 #ifdef RTEMS_SMP
    208   #define rtems_configuration_get_maximum_processors() \
    209         (Configuration.maximum_processors)
    210 #else
    211   #define rtems_configuration_get_maximum_processors() \
    212         1
    213 #endif
     204#define rtems_configuration_get_maximum_processors() \
     205        (_SMP_Processor_configured_maximum)
    214206
    215207#ifdef __cplusplus
  • cpukit/include/rtems/score/smp.h

    rad85c00 r567455b6  
    3737 */
    3838
     39/**
     40 * @brief The configured processor maximum.
     41 *
     42 * In SMP configurations, this constant is defined by the application
     43 * configuration via <rtems/confdefs.h>, otherwise it is a compile-time
     44 * constant with the value one.
     45 */
     46#if defined(RTEMS_SMP)
     47  extern const uint32_t _SMP_Processor_configured_maximum;
     48#else
     49  #define _SMP_Processor_configured_maximum 1
     50#endif
     51
    3952#if defined( RTEMS_SMP )
    4053  extern uint32_t _SMP_Processor_maximum;
Note: See TracChangeset for help on using the changeset viewer.