forked from Imagelibrary/rtems
bsps: Avoid unused argument in clock interrupt
Pass the parameter of the clock interrupt handler to Clock_driver_support_at_tick() and Clock_driver_timecounter_tick(). This makes it possible to use the interrupt handler argument in clock drivers. Use the interrupt handler provided by Clock_driver_support_install_isr() to avoid local delarations of Clock_isr(). Update #4862.
This commit is contained in:
@@ -54,15 +54,12 @@ typedef struct {
|
||||
|
||||
static arm_gt_clock_context arm_gt_clock_instance;
|
||||
|
||||
/* This is defined in dev/clock/clockimpl.h */
|
||||
void Clock_isr(rtems_irq_hdl_param arg);
|
||||
|
||||
static void arm_gt_clock_at_tick(void)
|
||||
static void arm_gt_clock_at_tick(arm_gt_clock_context *ctx)
|
||||
{
|
||||
uint64_t cval;
|
||||
uint32_t interval;
|
||||
|
||||
interval = arm_gt_clock_instance.interval;
|
||||
interval = ctx->interval;
|
||||
cval = arm_gt_clock_get_compare_value();
|
||||
cval += interval;
|
||||
arm_gt_clock_set_compare_value(cval);
|
||||
@@ -71,7 +68,7 @@ static void arm_gt_clock_at_tick(void)
|
||||
#endif /* ARM_GENERIC_TIMER_UNMASK_AT_TICK */
|
||||
}
|
||||
|
||||
static void arm_gt_clock_handler_install(void)
|
||||
static void arm_gt_clock_handler_install(rtems_interrupt_handler handler)
|
||||
{
|
||||
rtems_status_code sc;
|
||||
|
||||
@@ -79,8 +76,8 @@ static void arm_gt_clock_handler_install(void)
|
||||
arm_gt_clock_instance.irq,
|
||||
"Clock",
|
||||
RTEMS_INTERRUPT_UNIQUE,
|
||||
(rtems_interrupt_handler) Clock_isr,
|
||||
NULL
|
||||
handler,
|
||||
&arm_gt_clock_instance
|
||||
);
|
||||
if (sc != RTEMS_SUCCESSFUL) {
|
||||
bsp_fatal(BSP_ARM_FATAL_GENERIC_TIMER_CLOCK_IRQ_INSTALL);
|
||||
@@ -185,14 +182,14 @@ RTEMS_SYSINIT_ITEM(
|
||||
RTEMS_SYSINIT_ORDER_FIRST
|
||||
);
|
||||
|
||||
#define Clock_driver_support_at_tick() \
|
||||
arm_gt_clock_at_tick()
|
||||
#define Clock_driver_support_at_tick(arg) \
|
||||
arm_gt_clock_at_tick(arg)
|
||||
|
||||
#define Clock_driver_support_initialize_hardware() \
|
||||
arm_gt_clock_initialize()
|
||||
|
||||
#define Clock_driver_support_install_isr(isr) \
|
||||
arm_gt_clock_handler_install()
|
||||
arm_gt_clock_handler_install(isr)
|
||||
|
||||
/* Include shared source clock driver code */
|
||||
#include "../../shared/dev/clock/clockimpl.h"
|
||||
|
||||
Reference in New Issue
Block a user