forked from Imagelibrary/rtems
2000-09-25 Joel Sherrill <joel@OARcorp.com>
* clock/ckinit.c: Removed include of <bsp.h>. Also switch to macros to get configuration data. * timer/timer.c: Removed include of <bsp.h>. Fixed comment that said 4650 (a mips part).
This commit is contained in:
@@ -1,3 +1,10 @@
|
|||||||
|
2000-09-25 Joel Sherrill <joel@OARcorp.com>
|
||||||
|
|
||||||
|
* clock/ckinit.c: Removed include of <bsp.h>. Also switch to
|
||||||
|
macros to get configuration data.
|
||||||
|
* timer/timer.c: Removed include of <bsp.h>. Fixed comment
|
||||||
|
that said 4650 (a mips part).
|
||||||
|
|
||||||
2000-09-22 Joel Sherrill <joel@OARcorp.com>
|
2000-09-22 Joel Sherrill <joel@OARcorp.com>
|
||||||
|
|
||||||
* clock/clock.S: Commented out non-GNU assembly.
|
* clock/clock.S: Commented out non-GNU assembly.
|
||||||
|
|||||||
@@ -21,10 +21,12 @@ static char _sccsid[] = "@(#)ckinit.c 03/15/96 1.1\n";
|
|||||||
|
|
||||||
#include <rtems.h>
|
#include <rtems.h>
|
||||||
#include <rtems/libio.h>
|
#include <rtems/libio.h>
|
||||||
#include <bsp.h>
|
/* #include <bsp.h> */
|
||||||
|
|
||||||
#include "clock.h"
|
#include "clock.h"
|
||||||
|
|
||||||
|
extern int CPU_CLOCK_RATE_MHZ; /* provided in bsp */
|
||||||
|
|
||||||
#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ ) /* equivalent to CPU clock speed in MHz */
|
#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ ) /* equivalent to CPU clock speed in MHz */
|
||||||
|
|
||||||
void Clock_exit( void );
|
void Clock_exit( void );
|
||||||
@@ -123,13 +125,13 @@ void Install_clock(
|
|||||||
* wants a clock tick.
|
* wants a clock tick.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if ( BSP_Configuration.ticks_per_timeslice ) {
|
if ( rtems_configuration_get_ticks_per_timeslice() ) {
|
||||||
Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
|
Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
|
||||||
/*
|
/*
|
||||||
* Hardware specific initialize goes here
|
* Hardware specific initialize goes here
|
||||||
*/
|
*/
|
||||||
|
|
||||||
a29k_timer_rate = BSP_Configuration.microseconds_per_tick * CLOCKS_PER_MICROSECOND;
|
a29k_timer_rate = rtems_configuration_get_microseconds_per_tick() * CLOCKS_PER_MICROSECOND;
|
||||||
a29k_init_timer( a29k_timer_rate );
|
a29k_init_timer( a29k_timer_rate );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,7 +148,7 @@ void Install_clock(
|
|||||||
|
|
||||||
void Clock_exit( void )
|
void Clock_exit( void )
|
||||||
{
|
{
|
||||||
if ( BSP_Configuration.ticks_per_timeslice ) {
|
if ( rtems_configuration_get_ticks_per_timeslice() ) {
|
||||||
|
|
||||||
/* a29k: turn off the timer interrupts */
|
/* a29k: turn off the timer interrupts */
|
||||||
a29k_disable_timer();
|
a29k_disable_timer();
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ static char _sccsid[] = "@(#)timer.c 05/07/96 1.4\n";
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <rtems.h>
|
#include <rtems.h>
|
||||||
#include <bsp.h>
|
/* #include <bsp.h> */
|
||||||
|
|
||||||
#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ )
|
#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ )
|
||||||
#define TIMER_MAX_VALUE 0xffffffff
|
#define TIMER_MAX_VALUE 0xffffffff
|
||||||
@@ -45,7 +45,7 @@ void Timer_initialize( void )
|
|||||||
* Somehow start the timer
|
* Somehow start the timer
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Timer on 4650 is always running */
|
/* Timer is always running */
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user