diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68302/timer/timer.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/idp/timer/timer.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf52235/timer/timer.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5329/timer/timer.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/timer/timer.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/timer/timer.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/timer/timer.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/timer/timer.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/timer/timer.c | 34 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S | 13 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/ods68302/timer/timer.c | 2 |
12 files changed, 35 insertions, 32 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c index a942fe6e35..6749efc054 100644 --- a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c @@ -64,7 +64,7 @@ void benchmark_timer_initialize( void ) /* * Return timer value in 1/2-microsecond units */ -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint16_t clicks; uint32_t total; diff --git a/c/src/lib/libbsp/m68k/idp/timer/timer.c b/c/src/lib/libbsp/m68k/idp/timer/timer.c index 0788e49b40..23ffff7ee6 100644 --- a/c/src/lib/libbsp/m68k/idp/timer/timer.c +++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c @@ -49,7 +49,7 @@ void benchmark_timer_initialize(void) #define AVG_OVERHEAD 9 /* may not be right -- do this later */ #define LEAST_VALID 10 /* Don't trust a value lower than this */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint8_t data; uint8_t msb, osb, lsb; diff --git a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c index 9faed0d3ec..f9122542c2 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c @@ -29,7 +29,7 @@ void benchmark_timer_initialize(void) /* * Return timer value in microsecond units */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { return MCF_DTIM3_DTCN; } diff --git a/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c index 19a951391b..ac0ca6d7d0 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c @@ -29,7 +29,7 @@ void benchmark_timer_initialize(void) /* * Return timer value in microsecond units */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { return MCF_DTIM3_DTCN; } diff --git a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c index 6d3dc85e46..0f762c0a6a 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c @@ -29,7 +29,7 @@ void benchmark_timer_initialize(void) /* * Return timer value in microsecond units */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { return MCF_DTIM3_DTCN; } diff --git a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c index 71a2e48092..8c14f8fe58 100644 --- a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c @@ -38,7 +38,7 @@ void benchmark_timer_initialize( void ) /* * Return timer value in 1/2-microsecond units */ -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint32_t total; total = 0; diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c index d767e686a1..a445b7135a 100644 --- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c @@ -50,7 +50,7 @@ void benchmark_timer_initialize(void) /* (6 countdowns) to start/stop the timer. */ #define LEAST_VALID 10 /* Don't trust a value lower than this */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { /* uint8_t msb, lsb; diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c index 98331c710c..1db32c5456 100644 --- a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c @@ -45,7 +45,7 @@ void benchmark_timer_initialize(void) synchronized whith the counter updates*/ #define LEAST_VALID 10 /* Don't trust a value lower than this */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t total; uint16_t counter_value; diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c index b8bdde858e..579685ca6b 100644 --- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c @@ -50,7 +50,7 @@ void benchmark_timer_initialize(void) /* (3 countdowns) to start/stop the timer. */ #define LEAST_VALID 10U /* Don't trust a value lower than this */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t total; diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c index 556d7bf671..3b5dad496c 100644 --- a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c @@ -1,22 +1,26 @@ -/* timer.c +/** + * @file * - * This file manages the benchmark timer used by the RTEMS Timing Test Suite. - * Each measured time period is demarcated by calls to benchmark_timer_initialize() and - * benchmark_timer_read(). benchmark_timer_read() usually returns the number of microseconds - * since benchmark_timer_initialize() exitted. + * This file manages the benchmark timer used by the RTEMS Timing Test Suite. + * Each measured time period is demarcated by calls to + * benchmark_timer_initialize() and benchmark_timer_read(). + * benchmark_timer_read() usually returns the number of microseconds + * since benchmark_timer_initialize() exitted. * - * These functions are prototyped in rtems/c/src/lib/include/timerdrv.h and - * must be implemented as part of the BSP. + * These functions are prototyped in rtems/btimer.h and + * must be implemented as part of the BSP. * - * This port does not allow the application to select which timer on the - * MVME167 to use for the timer, nor does it allow the application to - * configure the timer. The timer uses the VMEchip2 Tick Timer #1. This timer - * is distinct from the clock, which uses Tick Timer #2 in the VMEchip2. + * This port does not allow the application to select which timer on the + * MVME167 to use for the timer, nor does it allow the application to + * configure the timer. The timer uses the VMEchip2 Tick Timer #1. This timer + * is distinct from the clock, which uses Tick Timer #2 in the VMEchip2. * - * All page references are to the MVME166/MVME167/MVME187 Single Board - * Computer Programmer's Reference Guide (MVME187PG/D2) with the April 1993 + * All page references are to the MVME166/MVME167/MVME187 Single Board + * Computer Programmer's Reference Guide (MVME187PG/D2) with the April 1993 * supplements/addenda (MVME187PG/D2A1). - * + */ + +/* * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). * @@ -104,7 +108,7 @@ void benchmark_timer_initialize(void) * LEAST_VALID is the lowest number this routine should trust. Numbers * below this are "noise" and zero is returned. */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t total; diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S b/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S index d109c9cee3..d96f0996a5 100644 --- a/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S +++ b/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S @@ -1,14 +1,13 @@ -/* timer_isr() +/** + * @file * * This ISR is used to bump a count of interval "overflow" interrupts which * have occurred since the timer was started. The number of overflows is taken * into account in the benchmark_timer_read() routine. - * - * Input parameters: NONE - * - * Output parameters: NONE - * - * COPYRIGHT (c) 1989-1999. + */ + +/* + * COPYRIGHT (c) 1989-2014. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be diff --git a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c index f0afdfdaf4..1e03015127 100644 --- a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c @@ -67,7 +67,7 @@ void benchmark_timer_initialize( void ) /* * Return timer value in 1/2-microsecond units */ -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint16_t clicks; uint32_t total; |