Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

confdefs: Fix cyclic dependency

Browse Source 
Close #4060.
This commit is contained in:
Sebastian Huber
2020-08-21 08:59:10 +02:00
parent 5284e812e2
commit 7661402bc2
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cpukit/include/rtems/confdefs/mpci.h
View File

@@ -6,9 +6,6 @@
* @ingroup RTEMSApplicationConfiguration * @ingroup RTEMSApplicationConfiguration
* *
* @brief Evaluate MPCI Configuration Options * @brief Evaluate MPCI Configuration Options
*
* This header file defines _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT for use by
* other configuration header files.
*/ */
/* /*
@@ -49,6 +46,8 @@
#ifdef CONFIGURE_MP_APPLICATION #ifdef CONFIGURE_MP_APPLICATION
#include <rtems/confdefs/threads.h>
#ifndef CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK #ifndef CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK
#define CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK 0 #define CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK 0
#endif #endif
@@ -83,8 +82,6 @@
#error "CONFIGURE_MP_NODE_NUMBER must be less than or equal to CONFIGURE_MP_MAXIMUM_NODES" #error "CONFIGURE_MP_NODE_NUMBER must be less than or equal to CONFIGURE_MP_MAXIMUM_NODES"
#endif #endif
#define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 1
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -126,10 +123,6 @@ RTEMS_SECTION( ".rtemsstack.mpci" );
} }
#endif #endif
#else /* CONFIGURE_MP_APPLICATION */
#define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
#endif /* CONFIGURE_MP_APPLICATION */ #endif /* CONFIGURE_MP_APPLICATION */
#else /* RTEMS_MULTIPROCESSING */ #else /* RTEMS_MULTIPROCESSING */
@@ -138,8 +131,6 @@ RTEMS_SECTION( ".rtemsstack.mpci" );
#error "CONFIGURE_MP_APPLICATION must not be defined if multiprocessing is disabled" #error "CONFIGURE_MP_APPLICATION must not be defined if multiprocessing is disabled"
#endif #endif
#define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
#endif /* RTEMS_MULTIPROCESSING */ #endif /* RTEMS_MULTIPROCESSING */
#endif /* CONFIGURE_INIT */ #endif /* CONFIGURE_INIT */

7
cpukit/include/rtems/confdefs/threads.h
View File

@@ -44,7 +44,6 @@
#include <rtems/confdefs/bdbuf.h> #include <rtems/confdefs/bdbuf.h>
#include <rtems/confdefs/extensions.h> #include <rtems/confdefs/extensions.h>
#include <rtems/confdefs/mpci.h>
#include <rtems/confdefs/percpu.h> #include <rtems/confdefs/percpu.h>
#include <rtems/confdefs/scheduler.h> #include <rtems/confdefs/scheduler.h>
#include <rtems/confdefs/unlimited.h> #include <rtems/confdefs/unlimited.h>
@@ -197,6 +196,12 @@ const size_t _Thread_Initial_thread_count =
rtems_resource_maximum_per_allocation( _CONFIGURE_TASKS ) + rtems_resource_maximum_per_allocation( _CONFIGURE_TASKS ) +
rtems_resource_maximum_per_allocation( CONFIGURE_MAXIMUM_POSIX_THREADS ); rtems_resource_maximum_per_allocation( CONFIGURE_MAXIMUM_POSIX_THREADS );
#if defined(RTEMS_MULTIPROCESSING) && defined(CONFIGURE_MP_APPLICATION)
#define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 1
#else
#define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
#endif
THREAD_INFORMATION_DEFINE( THREAD_INFORMATION_DEFINE(
_Thread, _Thread,
OBJECTS_INTERNAL_API, OBJECTS_INTERNAL_API,