diff options
Diffstat (limited to 'c/src/lib/libbsp')
36 files changed, 71 insertions, 67 deletions
diff --git a/c/src/lib/libbsp/arm/edb7312/timer/timer.c b/c/src/lib/libbsp/arm/edb7312/timer/timer.c index c17ee5a18a..b795122ff3 100644 --- a/c/src/lib/libbsp/arm/edb7312/timer/timer.c +++ b/c/src/lib/libbsp/arm/edb7312/timer/timer.c @@ -46,7 +46,7 @@ void benchmark_timer_initialize( void ) /* This value is in microseconds. */ #define LEAST_VALID 1 /* Don't trust a clicks value lower than this */ -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint16_t t; uint32_t total; diff --git a/c/src/lib/libbsp/arm/gba/timer/timer.c b/c/src/lib/libbsp/arm/gba/timer/timer.c index 058dfcb715..9aad10312b 100644 --- a/c/src/lib/libbsp/arm/gba/timer/timer.c +++ b/c/src/lib/libbsp/arm/gba/timer/timer.c @@ -94,7 +94,7 @@ void benchmark_timer_initialize( void ) * @param None * @return Timer value in microseconds */ -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint32_t ticks; uint32_t total; diff --git a/c/src/lib/libbsp/arm/lpc176x/benchmark_timer/benchmark_timer.c b/c/src/lib/libbsp/arm/lpc176x/benchmark_timer/benchmark_timer.c index a8f2855660..2aa4910751 100644 --- a/c/src/lib/libbsp/arm/lpc176x/benchmark_timer/benchmark_timer.c +++ b/c/src/lib/libbsp/arm/lpc176x/benchmark_timer/benchmark_timer.c @@ -32,7 +32,7 @@ void benchmark_timer_initialize( void ) benchmark_timer_base = lpc176x_timer_get_timer_value( LPC176X_TIMER_1 ); } -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint32_t delta = lpc176x_timer_get_timer_value( LPC176X_TIMER_1 ) - benchmark_timer_base; @@ -42,4 +42,4 @@ uint32_t benchmark_timer_read( void ) void benchmark_timer_disable_subtracting_average_overhead( bool find_avg_ovhead ) { -}
\ No newline at end of file +} diff --git a/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c b/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c index 8b4bc675f0..c700d04566 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c +++ b/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c @@ -22,7 +22,6 @@ #include <rtems.h> #include <bsp.h> #include <rtems/btimer.h> -#include <rtems/timerdrv.h> #include <bsp/system-clocks.h> @@ -35,7 +34,7 @@ void benchmark_timer_initialize(void) benchmark_timer_base = lpc24xx_timer(); } -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t delta = lpc24xx_timer() - benchmark_timer_base; diff --git a/c/src/lib/libbsp/arm/lpc32xx/misc/timer.c b/c/src/lib/libbsp/arm/lpc32xx/misc/timer.c index 3edae37787..5079452d8c 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/misc/timer.c +++ b/c/src/lib/libbsp/arm/lpc32xx/misc/timer.c @@ -21,7 +21,6 @@ #include <rtems.h> #include <rtems/btimer.h> -#include <rtems/timerdrv.h> #include <bsp.h> @@ -32,7 +31,7 @@ void benchmark_timer_initialize(void) benchmark_timer_base = lpc32xx_timer(); } -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { return lpc32xx_timer() - benchmark_timer_base; } diff --git a/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c b/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c index 7e83e4096d..e90af08290 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c +++ b/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c @@ -17,7 +17,7 @@ */ #include <rtems.h> -#include <rtems/timerdrv.h> +#include <rtems/btimer.h> #include <bsp/raspberrypi.h> static bool benchmark_timer_find_average_overhead = false; @@ -29,7 +29,7 @@ void benchmark_timer_initialize(void) benchmark_timer_base = BCM2835_REG(BCM2835_GPU_TIMER_CLO); } -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t delta = BCM2835_REG(BCM2835_GPU_TIMER_CLO) - benchmark_timer_base; diff --git a/c/src/lib/libbsp/arm/tms570/clock/benchmark_timer.c b/c/src/lib/libbsp/arm/tms570/clock/benchmark_timer.c index b45f0f4919..a2a0304737 100644 --- a/c/src/lib/libbsp/arm/tms570/clock/benchmark_timer.c +++ b/c/src/lib/libbsp/arm/tms570/clock/benchmark_timer.c @@ -28,7 +28,6 @@ #include <bsp.h> #include <bsp/system-clocks.h> #include <rtems/btimer.h> -#include <rtems/timerdrv.h> bool benchmark_timer_find_average_overhead = false; @@ -39,7 +38,7 @@ void benchmark_timer_initialize(void) benchmark_timer_base = _CPU_Counter_read(); } -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t delta = _CPU_Counter_read() - benchmark_timer_base; diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c index 8c3235be74..953db03f8f 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/timer.c +++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c @@ -51,9 +51,9 @@ volatile uint32_t Ttimer_val; bool benchmark_timer_find_average_overhead = true; volatile unsigned int fastLoop1ms, slowLoop1ms; -void (*benchmark_timer_initialize_function)(void) = 0; -uint32_t (*benchmark_timer_read_function)(void) = 0; -void (*Timer_exit_function)(void) = 0; +void (*benchmark_timer_initialize_function)(void) = 0; +benchmark_timer_t (*benchmark_timer_read_function)(void) = 0; +void (*Timer_exit_function)(void) = 0; /* timer (int 08h) Interrupt Service Routine (defined in 'timerisr.s') */ extern void timerisr(void); diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c b/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c index 5eb02159c6..bba2eee164 100644 --- a/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c +++ b/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c @@ -47,7 +47,7 @@ void benchmark_timer_initialize(void) /* This value is in microseconds. */ #define LEAST_VALID 4 /* Don't trust a clicks value lower than this */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t ticks; uint32_t total; diff --git a/c/src/lib/libbsp/lm32/shared/timer/timer.c b/c/src/lib/libbsp/lm32/shared/timer/timer.c index 98eb576f9f..aa39c1a86c 100644 --- a/c/src/lib/libbsp/lm32/shared/timer/timer.c +++ b/c/src/lib/libbsp/lm32/shared/timer/timer.c @@ -76,7 +76,7 @@ void benchmark_timer_initialize( void ) /* This value is in microseconds. */ #define LEAST_VALID 4 /* Don't trust a clicks value lower than this */ -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint32_t ticks; uint32_t total; diff --git a/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c b/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c index 5ce906c723..0b5aa997ec 100644 --- a/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c +++ b/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c @@ -41,7 +41,7 @@ void benchmark_timer_initialize(void) TABSR = 0x55; } -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t count; 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; diff --git a/c/src/lib/libbsp/mips/csb350/timer/timer.c b/c/src/lib/libbsp/mips/csb350/timer/timer.c index 8fe45e5d1e..30dbfe836b 100644 --- a/c/src/lib/libbsp/mips/csb350/timer/timer.c +++ b/c/src/lib/libbsp/mips/csb350/timer/timer.c @@ -29,7 +29,7 @@ void benchmark_timer_initialize(void) #define LEAST_VALID 1 /* Don't trust a value lower than this */ /* tx39 simulator can count instructions. :) */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t total; uint32_t cnt; diff --git a/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c b/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c index c60779fed6..a956c4b81c 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c +++ b/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c @@ -55,7 +55,7 @@ void benchmark_timer_initialize(void) /* mongoose-v can count cycles. :) */ #include <rtems/bspIo.h> -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t clicks; uint32_t total; diff --git a/c/src/lib/libbsp/mips/jmr3904/timer/timer.c b/c/src/lib/libbsp/mips/jmr3904/timer/timer.c index bce4d9d65d..ca97cd3a0b 100644 --- a/c/src/lib/libbsp/mips/jmr3904/timer/timer.c +++ b/c/src/lib/libbsp/mips/jmr3904/timer/timer.c @@ -44,7 +44,7 @@ void benchmark_timer_initialize(void) #define LEAST_VALID 1 /* Don't trust a value lower than this */ /* tx39 simulator can count instructions. :) */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t total; diff --git a/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c b/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c index 744cba58a8..e37c821f7e 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c +++ b/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c @@ -94,7 +94,7 @@ void benchmark_timer_initialize( void ) #define LEAST_VALID AVG_OVERHEAD /* Don't trust a value lower than this */ -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint32_t timer_wraps; uint32_t timer_snap; diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c index 78423b235b..e9b59dc756 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c @@ -53,7 +53,7 @@ void benchmark_timer_initialize( void ) /* This value is in microseconds. */ #define LEAST_VALID 1 /* Don't trust a clicks value lower than this */ -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint32_t clicks; uint32_t total; diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c index 961a16b2ec..5ca7152a54 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c @@ -1,4 +1,5 @@ -/* timerisr.s +/** + * @file * * If required this ISR is used to bump a count of interval "overflow" * interrupts which have occurred since the timer was started. The @@ -9,10 +10,12 @@ * handler you can write. This should be the only interrupt which can * occur during the measured time period. * - * NOTE: This file is USUALLY in assembly and is LEAN AND MEAN. - * Any code in this isr is pure overhead which can perturb - * the accuracy of the Timing Test Suite. - * + * @note This file is USUALLY in assembly and is LEAN AND MEAN. + * Any code in this isr is pure overhead which can perturb + * the accuracy of the Timing Test Suite. + */ + +/* * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). * @@ -22,6 +25,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> extern uint32_t _Timer_interrupts; diff --git a/c/src/lib/libbsp/or1k/or1ksim/timer/timer.c b/c/src/lib/libbsp/or1k/or1ksim/timer/timer.c index ec3c33ed0f..e5f3fd6267 100644 --- a/c/src/lib/libbsp/or1k/or1ksim/timer/timer.c +++ b/c/src/lib/libbsp/or1k/or1ksim/timer/timer.c @@ -32,7 +32,7 @@ void benchmark_timer_initialize(void) #define AVG_OVERHEAD 0 #define LEAST_VALID 1 -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint64_t clicks; uint64_t total; diff --git a/c/src/lib/libbsp/powerpc/score603e/timer/timer.c b/c/src/lib/libbsp/powerpc/score603e/timer/timer.c index fbe2b006e2..f1f131273c 100644 --- a/c/src/lib/libbsp/powerpc/score603e/timer/timer.c +++ b/c/src/lib/libbsp/powerpc/score603e/timer/timer.c @@ -42,7 +42,7 @@ void benchmark_timer_initialize() * benchmark_timer_read */ -uint32_t benchmark_timer_read() +benchmark_timer_t benchmark_timer_read() { uint64_t clicks; uint64_t total64; diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c b/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c index 10d8568881..06c43c56be 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c +++ b/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c @@ -85,7 +85,7 @@ benchmark_timer_initialize (void) /* * Return timer value in microsecond units */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t retval; retval = *(uint32_t*)&m8xx.tcn1; diff --git a/c/src/lib/libbsp/shared/timerstub.c b/c/src/lib/libbsp/shared/timerstub.c index 50e3e4429b..d1e3313115 100644 --- a/c/src/lib/libbsp/shared/timerstub.c +++ b/c/src/lib/libbsp/shared/timerstub.c @@ -15,7 +15,7 @@ void benchmark_timer_initialize(void) { } -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { if (benchmark_timer_find_average_overhead) return 1; diff --git a/c/src/lib/libbsp/sparc/erc32/timer/timer.c b/c/src/lib/libbsp/sparc/erc32/timer/timer.c index c6772e5635..4cf638e735 100644 --- a/c/src/lib/libbsp/sparc/erc32/timer/timer.c +++ b/c/src/lib/libbsp/sparc/erc32/timer/timer.c @@ -62,7 +62,7 @@ void benchmark_timer_initialize(void) #define LEAST_VALID 13 /* Don't trust a value lower than this */ #endif -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t total; diff --git a/c/src/lib/libbsp/sparc/leon2/timer/timer.c b/c/src/lib/libbsp/sparc/leon2/timer/timer.c index 0cbe0bff6c..de115c965a 100644 --- a/c/src/lib/libbsp/sparc/leon2/timer/timer.c +++ b/c/src/lib/libbsp/sparc/leon2/timer/timer.c @@ -58,7 +58,7 @@ void benchmark_timer_initialize(void) /* to start/stop the timer. */ #define LEAST_VALID 2 /* 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/sparc/leon3/timer/timer.c b/c/src/lib/libbsp/sparc/leon3/timer/timer.c index e7aa7f36ae..40bdeb87bb 100644 --- a/c/src/lib/libbsp/sparc/leon3/timer/timer.c +++ b/c/src/lib/libbsp/sparc/leon3/timer/timer.c @@ -57,7 +57,7 @@ void benchmark_timer_initialize(void) /* to start/stop the timer. */ #define LEAST_VALID 2 /* Don't trust a value lower than this */ -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t total; |