From 84aee2e9828e2c4d26d4b3ea5326143a3b153494 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 10 Dec 2019 08:09:13 +0100 Subject: mpci: Simplify MPCI configuration Use watchdog for shared memory driver instead of a Classic API Timer. --- cpukit/include/rtems/confdefs.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'cpukit') diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index 3f949b2cfa..922e4d7a9d 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -1817,8 +1817,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; */ #ifdef CONFIGURE_MP_APPLICATION - #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 1 - #ifndef CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE #ifndef CONFIGURE_MP_NODE_NUMBER @@ -1868,11 +1866,9 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; #endif /* CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE */ #else #define CONFIGURE_MULTIPROCESSING_TABLE NULL - #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0 #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0 #endif /* CONFIGURE_MP_APPLICATION */ #else - #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0 #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0 #endif /* RTEMS_MULTIPROCESSING */ /**@}*/ /* end of Multiprocessing Configuration */ @@ -1992,9 +1988,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; #define CONFIGURE_MAXIMUM_TIMERS 0 #endif -#define _CONFIGURE_TIMERS \ - (CONFIGURE_MAXIMUM_TIMERS + _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER) - #ifndef CONFIGURE_MAXIMUM_SEMAPHORES /** This specifies the maximum number of Classic API semaphores. */ #define CONFIGURE_MAXIMUM_SEMAPHORES 0 @@ -2775,8 +2768,8 @@ struct _reent *__getreent(void) ); #endif - #if _CONFIGURE_TIMERS > 0 - TIMER_INFORMATION_DEFINE( _CONFIGURE_TIMERS ); + #if CONFIGURE_MAXIMUM_TIMERS > 0 + TIMER_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_TIMERS ); #endif #if _CONFIGURE_TASKS > 0 -- cgit v1.2.3