RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

config: Add _Watchdog_Microseconds_per_tick

Browse Source 
Move the microseconds per tick configuration constant out of the
configuration table.

Add WATCHDOG_MICROSECONDS_PER_TICK_DEFAULT and use it to provide a
default definition of the watchdog ticks constants.

Update #3875.
This commit is contained in:
Sebastian Huber
2020-02-13 17:16:15 +01:00
parent 3b4795b46f
commit b8648bdc0c
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cpukit/include/rtems/confdefs.h
View File

@@ -1955,7 +1955,16 @@ extern "C" {
#error "The CONFIGURE_MICROSECONDS_PER_TICK must be positive" #error "The CONFIGURE_MICROSECONDS_PER_TICK must be positive"
#endif #endif
#define _CONFIGURE_TICKS_PER_SECOND (1000000 / CONFIGURE_MICROSECONDS_PER_TICK) #ifdef CONFIGURE_INIT
const uint32_t _Watchdog_Microseconds_per_tick =
CONFIGURE_MICROSECONDS_PER_TICK;
const uint32_t _Watchdog_Nanoseconds_per_tick =
(uint32_t) 1000 * CONFIGURE_MICROSECONDS_PER_TICK;
const uint32_t _Watchdog_Ticks_per_second =
1000000 / CONFIGURE_MICROSECONDS_PER_TICK;
#endif
/** The configures the number of clock ticks per timeslice. */ /** The configures the number of clock ticks per timeslice. */
#ifndef CONFIGURE_TICKS_PER_TIMESLICE #ifndef CONFIGURE_TICKS_PER_TIMESLICE
@@ -2452,11 +2461,6 @@ struct _reent *__getreent(void)
sizeof( Thread_queue_Configured_heads ); sizeof( Thread_queue_Configured_heads );
#endif #endif
const uint32_t _Watchdog_Nanoseconds_per_tick =
(uint32_t) 1000 * CONFIGURE_MICROSECONDS_PER_TICK;
const uint32_t _Watchdog_Ticks_per_second = _CONFIGURE_TICKS_PER_SECOND;
const size_t _Thread_Initial_thread_count = 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 );
@@ -2622,7 +2626,6 @@ struct _reent *__getreent(void)
*/ */
const rtems_configuration_table Configuration = { const rtems_configuration_table Configuration = {
CONFIGURE_EXECUTIVE_RAM_SIZE, /* required RTEMS workspace */ CONFIGURE_EXECUTIVE_RAM_SIZE, /* required RTEMS workspace */
CONFIGURE_MICROSECONDS_PER_TICK, /* microseconds per clock tick */
CONFIGURE_TICKS_PER_TIMESLICE, /* ticks per timeslice quantum */ CONFIGURE_TICKS_PER_TIMESLICE, /* ticks per timeslice quantum */
CONFIGURE_IDLE_TASK_BODY, /* user's IDLE task */ CONFIGURE_IDLE_TASK_BODY, /* user's IDLE task */
CONFIGURE_IDLE_TASK_STACK_SIZE, /* IDLE task stack size */ CONFIGURE_IDLE_TASK_STACK_SIZE, /* IDLE task stack size */

10
cpukit/include/rtems/config.h
View File

@@ -86,12 +86,6 @@ typedef struct {
*/ */
uintptr_t work_space_size; uintptr_t work_space_size;
/**
* This field specifies the number of microseconds which elapse
* between clock ticks. This is the basis for RTEMS timing.
*/
uint32_t microseconds_per_tick;
/** /**
* This field specifies the number of ticks in each task's timeslice. * This field specifies the number of ticks in each task's timeslice.
*/ */
@@ -162,9 +156,9 @@ uintptr_t rtems_configuration_get_stack_space_size( void );
uint32_t rtems_configuration_get_maximum_extensions( void ); uint32_t rtems_configuration_get_maximum_extensions( void );
#define rtems_configuration_get_microseconds_per_tick() \ #define rtems_configuration_get_microseconds_per_tick() \
(Configuration.microseconds_per_tick) (_Watchdog_Microseconds_per_tick)
#define rtems_configuration_get_milliseconds_per_tick() \ #define rtems_configuration_get_milliseconds_per_tick() \
(Configuration.microseconds_per_tick / 1000) (_Watchdog_Microseconds_per_tick / 1000)
#define rtems_configuration_get_nanoseconds_per_tick() \ #define rtems_configuration_get_nanoseconds_per_tick() \
(_Watchdog_Nanoseconds_per_tick) (_Watchdog_Nanoseconds_per_tick)

8
cpukit/include/rtems/score/watchdogticks.h
View File

@@ -49,6 +49,14 @@ typedef uint32_t Watchdog_Interval;
*/ */
extern volatile Watchdog_Interval _Watchdog_Ticks_since_boot; extern volatile Watchdog_Interval _Watchdog_Ticks_since_boot;
/**
* @brief The watchdog microseconds per tick.
*
* This constant is defined by the application configuration via
* <rtems/confdefs.h>.
*/
extern const uint32_t _Watchdog_Microseconds_per_tick;
/** /**
* @brief The watchdog nanoseconds per tick. * @brief The watchdog nanoseconds per tick.
* *