diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-05 14:50:36 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-05 14:50:36 +0000 |
commit | f0f450aabb7e1b7b52bc0de14a9622e97af9e2ed (patch) | |
tree | a2411831c5a31a0a1952e1b49d678b528d940dfb /cpukit | |
parent | 2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-f0f450aabb7e1b7b52bc0de14a9622e97af9e2ed.tar.bz2 |
2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>
* sapi/include/confdefs.h: Account for needed a Classic API Timer when
using the Shared Memory MPCI driver.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/sapi/include/confdefs.h | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 4808f47f55..da47184448 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com> + * sapi/include/confdefs.h: Account for needed a Classic API Timer when + using the Shared Memory MPCI driver. + +2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com> + * score/include/rtems/score/mpci.h, score/inline/rtems/score/threadmp.inl, score/src/mpci.c: Eliminate dependencies between MP .h files. diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 34b14ecb50..c97ba757b6 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -662,6 +662,8 @@ extern rtems_configuration_table Configuration; */ #ifdef CONFIGURE_MP_APPLICATION + #define CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 1 + #ifndef CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE #ifndef CONFIGURE_MP_NODE_NUMBER @@ -711,6 +713,7 @@ extern rtems_configuration_table Configuration; #else #define CONFIGURE_MULTIPROCESSING_TABLE NULL + #define CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0 #endif /* CONFIGURE_MP_APPLICATION */ #endif /* RTEMS_MULTIPROCESSING */ @@ -1531,7 +1534,8 @@ extern rtems_configuration_table Configuration; */ #define CONFIGURE_MEMORY_FOR_CLASSIC \ (CONFIGURE_MEMORY_FOR_TASK_VARIABLES(CONFIGURE_MAXIMUM_TASK_VARIABLES) + \ - CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS) + \ + CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS + \ + CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER ) + \ CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_MAXIMUM_SEMAPHORES + \ CONFIGURE_LIBIO_SEMAPHORES + CONFIGURE_TERMIOS_SEMAPHORES) + \ CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES) + \ @@ -1691,7 +1695,7 @@ extern rtems_configuration_table Configuration; rtems_api_configuration_table Configuration_RTEMS_API = { CONFIGURE_MAXIMUM_TASKS, CONFIGURE_NOTEPADS_ENABLED, - CONFIGURE_MAXIMUM_TIMERS, + CONFIGURE_MAXIMUM_TIMERS + CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER, CONFIGURE_MAXIMUM_SEMAPHORES + CONFIGURE_LIBIO_SEMAPHORES + CONFIGURE_TERMIOS_SEMAPHORES, CONFIGURE_MAXIMUM_MESSAGE_QUEUES, |