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

2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* timer/timer.c: Rename timer driver methods to follow RTEMS
	programming conventions.
This commit is contained in:
Joel Sherrill
2008-08-31 16:47:17 +00:00
parent 674a980f1c
commit 424ee2ba6a
12 changed files with 83 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/sparc/erc32/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
2008-08-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* gnatsupp/gnatsupp.c, timer/timer.c: Add missing prototypes.

20
c/src/lib/libbsp/sparc/erc32/timer/timer.c
View File

@@ -22,24 +22,24 @@
#include <bsp.h>
rtems_boolean Timer_driver_Find_average_overhead;
rtems_boolean benchmark_timerfind_average_overhead;
rtems_boolean Timer_driver_Is_initialized = FALSE;
rtems_boolean benchmark_timeris_initialized = FALSE;
void Timer_initialize(void)
void benchmark_timerinitialize(void)
{
/*
* Timer runs long and accurate enough not to require an interrupt.
*/
if ( Timer_driver_Is_initialized == FALSE ) {
if ( benchmark_timeris_initialized == FALSE ) {
/* approximately 1 us per countdown */
ERC32_MEC.General_Purpose_Timer_Scalar = CLOCK_SPEED - 1;
ERC32_MEC.General_Purpose_Timer_Counter = 0xffffffff;
} else {
Timer_driver_Is_initialized = TRUE;
benchmark_timeris_initialized = TRUE;
}
ERC32_MEC_Set_General_Purpose_Timer_Control(
@@ -63,7 +63,7 @@ void Timer_initialize(void)
#define LEAST_VALID 13 /* Don't trust a value lower than this */
#endif
int Read_timer(void)
int benchmark_timerread(void)
{
uint32_t total;
@@ -71,7 +71,7 @@ int Read_timer(void)
total = 0xffffffff - total;
if ( Timer_driver_Find_average_overhead == 1 )
if ( benchmark_timerfind_average_overhead == 1 )
return total; /* in one microsecond units */
if ( total < LEAST_VALID )
@@ -80,14 +80,14 @@ int Read_timer(void)
return total - AVG_OVERHEAD;
}
rtems_status_code Empty_function( void )
rtems_status_code benchmark_timerempty_function( void )
{
return RTEMS_SUCCESSFUL;
}
void Set_find_average_overhead(
void benchmark_timerdisable_subtracting_average_overhead(
rtems_boolean find_flag
)
{
Timer_driver_Find_average_overhead = find_flag;
benchmark_timerfind_average_overhead = find_flag;
}

5
c/src/lib/libbsp/sparc/leon2/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
2008-08-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* cchip/cchip.c, gnatsupp/gnatsupp.c, timer/timer.c: Add missing

20
c/src/lib/libbsp/sparc/leon2/timer/timer.c
View File

@@ -22,24 +22,24 @@
#include <bsp.h>
rtems_boolean Timer_driver_Find_average_overhead;
rtems_boolean benchmark_timerfind_average_overhead;
rtems_boolean Timer_driver_Is_initialized = FALSE;
rtems_boolean benchmark_timeris_initialized = FALSE;
void Timer_initialize(void)
void benchmark_timerinitialize(void)
{
/*
* Timer runs long and accurate enough not to require an interrupt.
*/
if ( Timer_driver_Is_initialized == FALSE ) {
if ( benchmark_timeris_initialized == FALSE ) {
/* approximately 1 us per countdown */
LEON_REG.Timer_Counter_2 = 0xffffff;
LEON_REG.Timer_Reload_2 = 0xffffff;
} else {
Timer_driver_Is_initialized = TRUE;
benchmark_timeris_initialized = TRUE;
}
LEON_REG.Timer_Control_2 = (
@@ -53,7 +53,7 @@ void Timer_initialize(void)
/* to start/stop the timer. */
#define LEAST_VALID 2 /* Don't trust a value lower than this */
int Read_timer(void)
int benchmark_timerread(void)
{
uint32_t total;
@@ -61,7 +61,7 @@ int Read_timer(void)
total = 0xffffff - total;
if ( Timer_driver_Find_average_overhead == 1 )
if ( benchmark_timerfind_average_overhead == 1 )
return total; /* in one microsecond units */
if ( total < LEAST_VALID )
@@ -70,14 +70,14 @@ int Read_timer(void)
return total - AVG_OVERHEAD;
}
rtems_status_code Empty_function( void )
rtems_status_code benchmark_timerempty_function( void )
{
return RTEMS_SUCCESSFUL;
}
void Set_find_average_overhead(
void benchmark_timerdisable_subtracting_average_overhead(
rtems_boolean find_flag
)
{
Timer_driver_Find_average_overhead = find_flag;
benchmark_timerfind_average_overhead = find_flag;
}

5
c/src/lib/libbsp/sparc/leon3/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
2008-08-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* startup/bspstart.c: Remove bogus local declarations.

20
c/src/lib/libbsp/sparc/leon3/timer/timer.c
View File

@@ -30,24 +30,24 @@
#define LEON3_TIMER_INDEX 0
#endif
rtems_boolean Timer_driver_Find_average_overhead;
rtems_boolean benchmark_timerfind_average_overhead;
rtems_boolean Timer_driver_Is_initialized = FALSE;
rtems_boolean benchmark_timeris_initialized = FALSE;
extern volatile LEON3_Timer_Regs_Map *LEON3_Timer_Regs;
void Timer_initialize(void)
void benchmark_timerinitialize(void)
{
/*
* Timer runs long and accurate enough not to require an interrupt.
*/
if (LEON3_Timer_Regs) {
if ( Timer_driver_Is_initialized == FALSE ) {
if ( benchmark_timeris_initialized == FALSE ) {
/* approximately 1 us per countdown */
LEON3_Timer_Regs->timer[LEON3_TIMER_INDEX].reload = 0xffffff;
LEON3_Timer_Regs->timer[LEON3_TIMER_INDEX].value = 0xffffff;
} else {
Timer_driver_Is_initialized = TRUE;
benchmark_timeris_initialized = TRUE;
}
LEON3_Timer_Regs->timer[LEON3_TIMER_INDEX].conf = LEON3_GPTIMER_EN | LEON3_GPTIMER_LD;
}
@@ -57,7 +57,7 @@ void Timer_initialize(void)
/* to start/stop the timer. */
#define LEAST_VALID 2 /* Don't trust a value lower than this */
int Read_timer(void)
int benchmark_timerread(void)
{
uint32_t total;
@@ -66,7 +66,7 @@ int Read_timer(void)
total = 0xffffff - total;
if ( Timer_driver_Find_average_overhead == 1 )
if ( benchmark_timerfind_average_overhead == 1 )
return total; /* in one microsecond units */
if ( total < LEAST_VALID )
@@ -77,14 +77,14 @@ int Read_timer(void)
return 0;
}
rtems_status_code Empty_function( void )
rtems_status_code benchmark_timerempty_function( void )
{
return RTEMS_SUCCESSFUL;
}
void Set_find_average_overhead(
void benchmark_timerdisable_subtracting_average_overhead(
rtems_boolean find_flag
)
{
Timer_driver_Find_average_overhead = find_flag;
benchmark_timerfind_average_overhead = find_flag;
}