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 
* console/console.c, include/m340timer.h, timer/timer.c: Rename timer
	driver methods to follow RTEMS programming conventions.
This commit is contained in:
Joel Sherrill
2008-08-31 15:55:27 +00:00
parent 0ccb2bbf81
commit 9856277be2
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/m68k/gen68340/ChangeLog
View File

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

2
c/src/lib/libbsp/m68k/gen68340/console/console.c
View File

@@ -553,7 +553,7 @@ rtems_device_driver console_initialize(
*/ */
Init_UART_Table(); Init_UART_Table();
dbugInitialise (); dbugInitialise ();
Fifo_Full_Timer_initialize(); Fifo_Full_benchmark_timerinitialize();
/* /*
* Register the devices * Register the devices

2
c/src/lib/libbsp/m68k/gen68340/include/m340timer.h
View File

@@ -25,7 +25,7 @@
#ifndef __m340timer_H__ #ifndef __m340timer_H__
#define __m340timer_H__ #define __m340timer_H__
extern void Fifo_Full_Timer_initialize (void); extern void Fifo_Full_benchmark_timerinitialize (void);
extern void (*Restart_Fifo_Full_A_Timer)(); extern void (*Restart_Fifo_Full_A_Timer)();
extern void (*Restart_Check_A_Timer)(); extern void (*Restart_Check_A_Timer)();

20
c/src/lib/libbsp/m68k/gen68340/timer/timer.c
View File

@@ -113,12 +113,12 @@ void __do_nothing (void)
#define Fifo_Full_on_B (m340_uart_config[UART_CHANNEL_B].rx_mode==UART_FIFO_FULL && m340_uart_config[UART_CHANNEL_B].enable && m340_uart_config[UART_CHANNEL_B].mode==UART_INTERRUPTS) #define Fifo_Full_on_B (m340_uart_config[UART_CHANNEL_B].rx_mode==UART_FIFO_FULL && m340_uart_config[UART_CHANNEL_B].enable && m340_uart_config[UART_CHANNEL_B].mode==UART_INTERRUPTS)
/****************************************************** /******************************************************
Name: Fifo_Full_Timer_initialize Name: Fifo_Full_benchmark_timerinitialize
Input parameters: - Input parameters: -
Output parameters: - Output parameters: -
Description: initialize Timer 1 for FIFO full mode Description: initialize Timer 1 for FIFO full mode
*****************************************************/ *****************************************************/
void Fifo_Full_Timer_initialize (void) void Fifo_Full_benchmark_timerinitialize (void)
{ {
float max_baud_rate; float max_baud_rate;
int prescaler_output_tap = -1; int prescaler_output_tap = -1;
@@ -218,12 +218,12 @@ void Fifo_Full_Timer_initialize (void)
} }
/****************************************************** /******************************************************
Name: Timer_initialize Name: benchmark_timerinitialize
Input parameters: - Input parameters: -
Output parameters: - Output parameters: -
Description: init Timer for timing test suites Description: init Timer for timing test suites
*****************************************************/ *****************************************************/
void Timer_initialize (void) void benchmark_timerinitialize (void)
{ {
/* Disable the timer */ /* Disable the timer */
TCR2 &= ~m340_SWR; TCR2 &= ~m340_SWR;
@@ -250,20 +250,20 @@ void Timer_initialize (void)
} }
/****************************************************** /******************************************************
Name: Read_timer Name: benchmark_timerread
Input parameters: - Input parameters: -
Output parameters: - Output parameters: -
Description: Return timer value in microsecond units Description: Return timer value in microsecond units
*****************************************************/ *****************************************************/
int int
Read_timer (void) benchmark_timerread (void)
{ {
/* there's CLOCK_SPEED / 16 micro seconds between two timer register decrement */ /* there's CLOCK_SPEED / 16 micro seconds between two timer register decrement */
return (((0xFFFF - TCNTR2) * CLOCK_SPEED) / 16); return (((0xFFFF - TCNTR2) * CLOCK_SPEED) / 16);
} }
/****************************************************** /******************************************************
Name: Empty_function Name: benchmark_timerempty_function
Input parameters: - Input parameters: -
Output parameters: - Output parameters: -
Description: Empty function call used in loops to Description: Empty function call used in loops to
@@ -271,18 +271,18 @@ Read_timer (void)
in Timing Test Suite. in Timing Test Suite.
*****************************************************/ *****************************************************/
rtems_status_code rtems_status_code
Empty_function (void) benchmark_timerempty_function (void)
{ {
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }
/****************************************************** /******************************************************
Name: Set_find_average_overhead Name: benchmark_timerdisable_subtracting_average_overhead
Input parameters: - Input parameters: -
Output parameters: - Output parameters: -
Description: - Description: -
*****************************************************/ *****************************************************/
void void
Set_find_average_overhead(rtems_boolean find_flag) benchmark_timerdisable_subtracting_average_overhead(rtems_boolean find_flag)
{ {
} }