2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>

* timer/timer.c: Include <rtems/btimer.h>.
	Fix benchmark_timer_read() definition.
This commit is contained in:
Ralf Corsepius
2011-02-09 08:38:15 +00:00
parent 44d775307c
commit d085040aef
22 changed files with 76 additions and 11 deletions

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -11,6 +11,7 @@
#include <rtems.h>
#include <bsp.h>
#include <rtems/btimer.h>
#include <stdlib.h>
int Ttimer_val;
@@ -93,7 +94,7 @@ void benchmark_timer_initialize(void)
/* (3 ticks) to start/stop the timer. */
#define LEAST_VALID 4 /* Don't trust a value lower than this */
int benchmark_timer_read(void)
uint32_t benchmark_timer_read(void)
{
register uint32_t clicks;
register uint32_t total;

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -28,8 +28,8 @@
*/
#include <stdlib.h>
#include <bsp.h>
#include <rtems/btimer.h>
#include <bsp/irq.h>
#include <libcpu/cpuModel.h>

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -11,6 +11,7 @@
#include <rtems.h>
#include <bsp.h>
#include <rtems/btimer.h>
#include <stdlib.h>
volatile uint32_t Ttimer_val; /* Updated from ISR!!! */
@@ -119,7 +120,7 @@ void benchmark_timer_initialize(void)
/* (3 ticks) to start/stop the timer. */
#define LEAST_VALID 4 /* Don't trust a value lower than this */
int benchmark_timer_read(void)
uint32_t benchmark_timer_read(void)
{
register uint32_t clicks, total;
register uint8_t lsb, msb;

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -10,6 +10,7 @@
*/
#include <bsp.h>
#include <rtems/btimer.h>
#include <varvects.h>

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -5,6 +5,7 @@
*/
#include <rtems.h>
#include <rtems/btimer.h>
#include <bsp.h>
void
@@ -21,7 +22,7 @@ benchmark_timer_initialize(void)
/*
* Return timer value in microsecond units
*/
int
uint32_t
benchmark_timer_read(void)
{
return MCF5282_TIMER3_DTCN;

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -11,6 +11,7 @@
#include <rtems.h>
#include <bsp.h>
#include <rtems/btimer.h>
#include <rtems/m68k/m68302.h>
#define TMR2_VAL 0x071b /* Timer mode register
@@ -65,7 +66,7 @@ void benchmark_timer_initialize( void )
/*
* Return timer value in 1/2-microsecond units
*/
int benchmark_timer_read( void )
uint32_t benchmark_timer_read( void )
{
uint16_t clicks;
uint32_t total;

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -36,6 +36,7 @@
#include <rtems.h>
#include <bsp.h>
#include <rtems/btimer.h>
#include <m340uart.h>
#include <m340timer.h>
#include <m68340.h>
@@ -251,7 +252,7 @@ void benchmark_timer_initialize (void)
Output parameters: -
Description: Return timer value in microsecond units
*****************************************************/
int
uint32_t
benchmark_timer_read (void)
{
/* there's CLOCK_SPEED / 16 micro seconds between two timer register decrement */

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -14,6 +14,7 @@
#include <rtems.h>
#include <bsp.h>
#include <rtems/btimer.h>
#include <rtems/m68k/m68302.h>
#define TMR2_VAL 0x071b /* Timer mode register
@@ -68,7 +69,7 @@ void benchmark_timer_initialize( void )
/*
* Return timer value in 1/2-microsecond units
*/
int benchmark_timer_read( void )
uint32_t benchmark_timer_read( void )
{
uint16_t clicks;
uint32_t total;

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -15,6 +15,7 @@
#include <rtems.h>
#include <bsp.h>
#include <rtems/btimer.h>
void
benchmark_timer_initialize(void)
@@ -34,7 +35,7 @@ benchmark_timer_initialize(void)
/*
* Return timer value in microsecond units
*/
int
uint32_t
benchmark_timer_read(void)
{
return MCF5282_TIMER3_DTCN;

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -20,6 +20,7 @@
#include <assert.h>
#include <bsp.h>
#include <rtems/btimer.h>
uint64_t Timer_driver_Start_time;
@@ -43,7 +44,7 @@ void benchmark_timer_initialize()
* benchmark_timer_read
*/
int benchmark_timer_read()
uint32_t benchmark_timer_read()
{
uint64_t clicks;
uint64_t total64;

View File

@@ -1,3 +1,8 @@
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -50,6 +50,7 @@
#include <rtems.h>
#include <bsp.h>
#include <rtems/btimer.h>
#include <mpc8xx.h>
bool benchmark_timer_find_average_overhead;
@@ -86,9 +87,9 @@ benchmark_timer_initialize (void)
/*
* Return timer value in microsecond units
*/
int benchmark_timer_read(void)
uint32_t benchmark_timer_read(void)
{
int retval;
uint32_t retval;
retval = *(uint32_t*)&m8xx.tcn1;
retval = retval * 1000000LL / BSP_bus_frequency;
return retval;