diff options
Diffstat (limited to 'c/src/lib/libbsp/i386/ts_386ex')
-rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/timer/timer.c | 23 |
2 files changed, 14 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog index 5cf2bee835..dc8cebb907 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog @@ -1,5 +1,10 @@ 2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com> + * timer/timer.c: Eliminate empty function from every benchmark timer + driver. Fix spelling. + +2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com> + * timer/timer.c: Rename timer driver methods to follow RTEMS programming conventions. diff --git a/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c b/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c index 0746869648..5ab4188797 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c +++ b/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c @@ -28,7 +28,7 @@ #include <stdlib.h> volatile uint32_t Ttimer_val; /* Updated from ISR!!! */ -rtems_boolean benchmark_timerfind_average_overhead; +rtems_boolean benchmark_timer_find_average_overhead; extern void timerisr(void); @@ -96,7 +96,7 @@ void Timer_exit(void) } } -void benchmark_timerinitialize(void) +void benchmark_timer_initialize(void) { static rtems_boolean First = TRUE; @@ -106,18 +106,18 @@ void benchmark_timerinitialize(void) First = FALSE; if (!i386_get_current_idt_entry (&old_raw_irq_data)) { - printk("benchmark_timerinitialize: failed to get old raw irq entry.\n"); + printk("benchmark_timer_initialize: failed to get old raw irq entry.\n"); rtems_fatal_error_occurred(1); } if (!i386_delete_idt_entry (&old_raw_irq_data)) { - printk("benchmark_timerinitialize: failed to delete old raw irq entry.\n"); + printk("benchmark_timer_initialize: failed to delete old raw irq entry.\n"); rtems_fatal_error_occurred(1); } atexit(Timer_exit); /* Try not to hose the system at exit. */ if (!i386_set_idt_entry (&timer_raw_irq_data)) { - printk("benchmark_timerinitialize: raw handler installation failed.\n"); + printk("benchmark_timer_initialize: raw handler installation failed.\n"); rtems_fatal_error_occurred(1); } } @@ -133,7 +133,7 @@ void benchmark_timerinitialize(void) /* (3 ticks) to start/stop the timer. */ #define LEAST_VALID 4 /* Don't trust a value lower than this */ -int benchmark_timerread(void) +int benchmark_timer_read(void) { register uint32_t clicks, total; register uint8_t lsb, msb; @@ -155,7 +155,7 @@ int benchmark_timerread(void) clicks = (msb << 8) | lsb; total = Ttimer_val * US_PER_ISR + (US_PER_ISR - clicks); - if ( benchmark_timerfind_average_overhead == 1 ) + if ( benchmark_timer_find_average_overhead == 1 ) return total; /* in one microsecond units */ else if ( total < LEAST_VALID ) return 0; /* below timer resolution */ @@ -163,16 +163,11 @@ int benchmark_timerread(void) return (total - AVG_OVERHEAD); } -rtems_status_code benchmark_timerempty_function( void ) -{ - return RTEMS_SUCCESSFUL; -} - -void benchmark_timerdisable_subtracting_average_overhead( +void benchmark_timer_disable_subtracting_average_overhead( rtems_boolean find_flag ) { - benchmark_timerfind_average_overhead = find_flag; + benchmark_timer_find_average_overhead = find_flag; } /* |