forked from Imagelibrary/rtems
clock: Remove Clock_exit() from API
This function is no longer supported by the standard clock driver implementation (clockimpl.h). Update #3436.
This commit is contained in:
@@ -29,8 +29,6 @@
|
|||||||
|
|
||||||
volatile uint32_t Clock_driver_ticks;
|
volatile uint32_t Clock_driver_ticks;
|
||||||
|
|
||||||
void Clock_exit(void);
|
|
||||||
|
|
||||||
static rtems_isr clockISR(rtems_vector_number vector) {
|
static rtems_isr clockISR(rtems_vector_number vector) {
|
||||||
|
|
||||||
Clock_driver_ticks += 1;
|
Clock_driver_ticks += 1;
|
||||||
@@ -50,7 +48,7 @@ static rtems_isr clockISR(rtems_vector_number vector) {
|
|||||||
* This routine allows the clock driver to exit by masking the interrupt and
|
* This routine allows the clock driver to exit by masking the interrupt and
|
||||||
* disabling the clock's counter.
|
* disabling the clock's counter.
|
||||||
*/
|
*/
|
||||||
void Clock_exit(void)
|
static void Clock_exit(void)
|
||||||
{
|
{
|
||||||
*(uint32_t volatile *) TCNTL = 0;
|
*(uint32_t volatile *) TCNTL = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ Clock_isr (rtems_vector_number vector)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
Clock_exit(void)
|
Clock_exit(void)
|
||||||
{
|
{
|
||||||
uint32_t icr;
|
uint32_t icr;
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ Clock_isr (rtems_vector_number vector)
|
|||||||
rtems_clock_tick();
|
rtems_clock_tick();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
Clock_exit (void)
|
Clock_exit (void)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ Clock_isr (rtems_vector_number vector)
|
|||||||
rtems_clock_hook(vector);
|
rtems_clock_hook(vector);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
Clock_exit(void)
|
Clock_exit(void)
|
||||||
{
|
{
|
||||||
/* disable all timer1 interrupts */
|
/* disable all timer1 interrupts */
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ uint32_t Clock_isrs; /* ISRs until next tick */
|
|||||||
volatile uint32_t Clock_driver_ticks; /* ticks since initialization */
|
volatile uint32_t Clock_driver_ticks; /* ticks since initialization */
|
||||||
static rtems_isr_entry Old_ticker;
|
static rtems_isr_entry Old_ticker;
|
||||||
|
|
||||||
void Clock_exit( void );
|
static void Clock_exit( void );
|
||||||
|
|
||||||
static rtems_isr Clock_isr(rtems_vector_number vector)
|
static rtems_isr Clock_isr(rtems_vector_number vector)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ uint32_t Clock_isrs; /* ISRs until next tick */
|
|||||||
volatile uint32_t Clock_driver_ticks; /* ticks since initialization */
|
volatile uint32_t Clock_driver_ticks; /* ticks since initialization */
|
||||||
rtems_isr_entry Old_ticker;
|
rtems_isr_entry Old_ticker;
|
||||||
|
|
||||||
void Clock_exit( void );
|
static void Clock_exit( void );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ISR Handler
|
* ISR Handler
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ uint32_t Clock_isrs; /* ISRs until next tick */
|
|||||||
volatile uint32_t Clock_driver_ticks; /* ticks since initialization */
|
volatile uint32_t Clock_driver_ticks; /* ticks since initialization */
|
||||||
rtems_isr_entry Old_ticker;
|
rtems_isr_entry Old_ticker;
|
||||||
|
|
||||||
void Clock_exit( void );
|
static void Clock_exit( void );
|
||||||
|
|
||||||
#define CLOCK_VECTOR (VBR0 * 0x10 + 0x9)
|
#define CLOCK_VECTOR (VBR0 * 0x10 + 0x9)
|
||||||
|
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ void init_hbt(void);
|
|||||||
void enable_hbi(void);
|
void enable_hbi(void);
|
||||||
void disable_hbi(void);
|
void disable_hbi(void);
|
||||||
|
|
||||||
void Clock_exit(void);
|
static void Clock_exit(void);
|
||||||
rtems_isr Clock_isr(rtems_vector_number vector);
|
rtems_isr Clock_isr(rtems_vector_number vector);
|
||||||
rtems_isr User_Clock_isr(rtems_vector_number vector);
|
rtems_isr User_Clock_isr(rtems_vector_number vector);
|
||||||
void Install_clock(rtems_isr_entry clock_isr);
|
void Install_clock(rtems_isr_entry clock_isr);
|
||||||
@@ -96,8 +96,6 @@ uint32_t Clock_isrs; /* ISRs until next tick */
|
|||||||
|
|
||||||
rtems_isr_entry Old_ticker;
|
rtems_isr_entry Old_ticker;
|
||||||
|
|
||||||
void Clock_exit( void );
|
|
||||||
|
|
||||||
static uint32_t mips_timer_rate = 0;
|
static uint32_t mips_timer_rate = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ uint32_t Clock_isrs; /* ISRs until next tick */
|
|||||||
*/
|
*/
|
||||||
rtems_isr_entry Old_ticker;
|
rtems_isr_entry Old_ticker;
|
||||||
|
|
||||||
void Clock_exit( void );
|
static void Clock_exit( void );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Isr Handler
|
* Isr Handler
|
||||||
|
|||||||
@@ -197,17 +197,6 @@ int clockIsOn(void* unused)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Clock_exit
|
|
||||||
*
|
|
||||||
* This routine allows the clock driver to exit by masking the interrupt and
|
|
||||||
* disabling the clock's counter.
|
|
||||||
*/
|
|
||||||
void Clock_exit( void )
|
|
||||||
{
|
|
||||||
(void) BSP_disconnect_clock_handler ();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Clock_initialize
|
* Clock_initialize
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ volatile uint32_t Clock_driver_ticks;
|
|||||||
static uint32_t pit_value, tick_time;
|
static uint32_t pit_value, tick_time;
|
||||||
static bool auto_restart;
|
static bool auto_restart;
|
||||||
|
|
||||||
void Clock_exit( void );
|
static void Clock_exit( void );
|
||||||
|
|
||||||
static inline uint32_t get_itimer(void)
|
static inline uint32_t get_itimer(void)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -167,15 +167,6 @@ static int ppc_clock_exception_handler_ppc405(BSP_Exception_frame *frame, unsign
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Clock_exit(void)
|
|
||||||
{
|
|
||||||
/* Set the decrementer to the maximum value */
|
|
||||||
ppc_set_decrementer_register( PPC_CLOCK_DECREMENTER_MAX);
|
|
||||||
|
|
||||||
/* Use default clock handler */
|
|
||||||
ppc_clock_tick = ppc_clock_no_tick;
|
|
||||||
}
|
|
||||||
|
|
||||||
rtems_device_driver Clock_initialize(
|
rtems_device_driver Clock_initialize(
|
||||||
rtems_device_major_number major,
|
rtems_device_major_number major,
|
||||||
rtems_device_minor_number minor,
|
rtems_device_minor_number minor,
|
||||||
|
|||||||
@@ -52,8 +52,6 @@ extern int BSP_connect_clock_handler(rtems_isr_entry);
|
|||||||
extern int BSP_disconnect_clock_handler(void);
|
extern int BSP_disconnect_clock_handler(void);
|
||||||
extern uint32_t bsp_clicks_per_usec;
|
extern uint32_t bsp_clicks_per_usec;
|
||||||
|
|
||||||
void Clock_exit( void );
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ISR Handler
|
* ISR Handler
|
||||||
*/
|
*/
|
||||||
@@ -119,7 +117,7 @@ int clockIsOn(void* unused)
|
|||||||
* Called via atexit()
|
* Called via atexit()
|
||||||
* Remove the clock interrupt handler by setting handler to NULL
|
* Remove the clock interrupt handler by setting handler to NULL
|
||||||
*/
|
*/
|
||||||
void Clock_exit(void)
|
static void Clock_exit(void)
|
||||||
{
|
{
|
||||||
(void) BSP_disconnect_clock_handler ();
|
(void) BSP_disconnect_clock_handler ();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ static unsigned int sh_clicks_per_tick(
|
|||||||
|
|
||||||
volatile uint32_t Clock_driver_ticks;
|
volatile uint32_t Clock_driver_ticks;
|
||||||
|
|
||||||
void Clock_exit( void );
|
static void Clock_exit( void );
|
||||||
static rtems_isr Clock_isr( rtems_vector_number vector );
|
static rtems_isr Clock_isr( rtems_vector_number vector );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -42,6 +42,8 @@
|
|||||||
#include <rtems/score/ispsh7045.h>
|
#include <rtems/score/ispsh7045.h>
|
||||||
#include <rtems/score/iosh7045.h>
|
#include <rtems/score/iosh7045.h>
|
||||||
|
|
||||||
|
static void Clock_exit( void );
|
||||||
|
|
||||||
extern uint32_t bsp_clicks_per_second;
|
extern uint32_t bsp_clicks_per_second;
|
||||||
|
|
||||||
#define _MTU_COUNTER0_MICROSECOND (Clock_MHZ/16)
|
#define _MTU_COUNTER0_MICROSECOND (Clock_MHZ/16)
|
||||||
|
|||||||
@@ -24,6 +24,8 @@
|
|||||||
#include <rtems/score/ispsh7750.h>
|
#include <rtems/score/ispsh7750.h>
|
||||||
#include <rtems/score/iosh7750.h>
|
#include <rtems/score/iosh7750.h>
|
||||||
|
|
||||||
|
static void Clock_exit( void );
|
||||||
|
|
||||||
extern uint32_t bsp_clicks_per_second;
|
extern uint32_t bsp_clicks_per_second;
|
||||||
|
|
||||||
#ifndef CLOCKPRIO
|
#ifndef CLOCKPRIO
|
||||||
|
|||||||
@@ -39,8 +39,6 @@ rtems_device_driver Clock_initialize(
|
|||||||
void *
|
void *
|
||||||
);
|
);
|
||||||
|
|
||||||
void Clock_exit(void);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user