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.

4 files changed, 40 insertions, 52 deletions

diff --git a/bsps/shared/dev/clock/arm-generic-timer.c b/bsps/shared/dev/clock/arm-generic-timer.c
index 1188800170..ba159f6833 100644
--- a/bsps/shared/dev/clock/arm-generic-timer.c
+++ b/bsps/shared/dev/clock/arm-generic-timer.c
@@ -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"
diff --git a/bsps/shared/dev/clock/clockimpl.h b/bsps/shared/dev/clock/clockimpl.h
index c58a6eb079..592046ec27 100644
--- a/bsps/shared/dev/clock/clockimpl.h
+++ b/bsps/shared/dev/clock/clockimpl.h
@@ -63,6 +63,13 @@
 #error "Fast Idle PLUS n ISRs per tick is not supported"
 #endif
 
+#if defined(BSP_FEATURE_IRQ_EXTENSION) || \
+    (CPU_SIMPLE_VECTORED_INTERRUPTS != TRUE)
+typedef void * Clock_isr_argument;
+#else
+typedef rtems_vector_number Clock_isr_argument;
+#endif
+
 /**
  * @brief Do nothing by default.
  */
@@ -81,7 +88,7 @@
  * @brief Do nothing by default.
  */
 #ifndef Clock_driver_support_at_tick
-  #define Clock_driver_support_at_tick()
+  #define Clock_driver_support_at_tick( arg ) do { (void) arg; } while (0)
 #endif
 
 /**
@@ -96,8 +103,9 @@
  * instead of the default.
  */
 #ifndef Clock_driver_timecounter_tick
-static void Clock_driver_timecounter_tick( void )
+static void Clock_driver_timecounter_tick( Clock_isr_argument arg )
 {
+  (void) arg;
 #if defined(CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER)
   rtems_clock_tick();
 #elif defined(RTEMS_SMP) && defined(CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR)
@@ -159,20 +167,11 @@ static bool _Clock_Has_watchdogs(const Per_CPU_Control *cpu)
  *
  *  This is the clock tick interrupt handler.
  *
- *  @param vector Vector number.
+ *  @param arg is the clock interrupt handler argument.
  */
-#if defined(BSP_FEATURE_IRQ_EXTENSION) || \
-    (CPU_SIMPLE_VECTORED_INTERRUPTS != TRUE)
-void Clock_isr(void *arg);
-void Clock_isr(void *arg)
+void Clock_isr( Clock_isr_argument arg );
+void Clock_isr( Clock_isr_argument arg )
 {
-#else
-rtems_isr Clock_isr(rtems_vector_number vector);
-rtems_isr Clock_isr(
-  rtems_vector_number vector
-)
-{
-#endif
   /*
    *  Accurate count of ISRs
    */
@@ -180,7 +179,7 @@ rtems_isr Clock_isr(
 
   #if CLOCK_DRIVER_USE_FAST_IDLE
     {
-      Clock_driver_timecounter_tick();
+      Clock_driver_timecounter_tick( arg );
 
       if (_SMP_Get_processor_maximum() == 1) {
         struct timecounter *tc;
@@ -210,7 +209,7 @@ rtems_isr Clock_isr(
         }
       }
 
-      Clock_driver_support_at_tick();
+      Clock_driver_support_at_tick( arg );
     }
   #else
     /*
@@ -218,14 +217,14 @@ rtems_isr Clock_isr(
      *
      *  The counter/timer may or may not be set to automatically reload.
      */
-    Clock_driver_support_at_tick();
+    Clock_driver_support_at_tick( arg );
 
     #if CLOCK_DRIVER_ISRS_PER_TICK
       /*
        *  The driver is multiple ISRs per clock tick.
        */
       if ( !Clock_driver_isrs ) {
-        Clock_driver_timecounter_tick();
+        Clock_driver_timecounter_tick( arg );
 
         Clock_driver_isrs = CLOCK_DRIVER_ISRS_PER_TICK_VALUE;
       }
@@ -234,7 +233,7 @@ rtems_isr Clock_isr(
       /*
        *  The driver is one ISR per clock tick.
        */
-      Clock_driver_timecounter_tick();
+      Clock_driver_timecounter_tick( arg );
     #endif
   #endif
 }
diff --git a/bsps/shared/dev/clock/xil-ttc.c b/bsps/shared/dev/clock/xil-ttc.c
index 5121773a6f..340c428a48 100644
--- a/bsps/shared/dev/clock/xil-ttc.c
+++ b/bsps/shared/dev/clock/xil-ttc.c
@@ -157,7 +157,7 @@ static void zynqmp_ttc_clock_driver_support_initialize_hardware(void)
  *
  * @retval Void
  */
-static void zynqmp_ttc_clock_driver_support_at_tick( void )
+static void zynqmp_ttc_clock_driver_support_at_tick(ttc_clock_context *tc)
 {
   uint32_t irq_flags;
   uint32_t cval;
@@ -181,49 +181,41 @@ static void zynqmp_ttc_clock_driver_support_at_tick( void )
      */
     now = XTtcPs_ReadReg(BSP_SELECTED_TTC_ADDR, XTTCPS_COUNT_VALUE_OFFSET);
     delta = now - cval;
-    if(delta > ttc_clock_instance.irq_match_interval) {
+    if(delta > tc->irq_match_interval) {
      cval = now;
-     ttc_clock_instance.tick_miss++;
+     tc->tick_miss++;
     }
-    cval += ttc_clock_instance.irq_match_interval;
+    cval += tc->irq_match_interval;
     XTtcPs_WriteReg(BSP_SELECTED_TTC_ADDR, XTTCPS_MATCH_0_OFFSET, cval);
   }
   /* Else, something is set up wrong, only match should be enabled */
 }
 
-/**
- * @brief registers RTI interrupt handler
- *
- * @param[in] Clock_isr new ISR handler
- * @param[in] Old_ticker old ISR handler (unused and type broken)
- *
- * @retval Void
- */
 static void zynqmp_ttc_clock_driver_support_install_isr(
-  rtems_isr_entry Clock_isr
+  rtems_interrupt_handler handler
 )
 {
-  rtems_status_code sc = RTEMS_SUCCESSFUL;
+  rtems_status_code sc;
 
   sc = rtems_interrupt_handler_install(
     BSP_SELECTED_TTC_IRQ,
     "Clock",
     RTEMS_INTERRUPT_UNIQUE,
-    (rtems_interrupt_handler) Clock_isr,
-    NULL
+    handler,
+    &ttc_clock_instance
   );
   if ( sc != RTEMS_SUCCESSFUL ) {
     rtems_fatal_error_occurred(0xdeadbeef);
   }
 }
 
-#define Clock_driver_support_at_tick \
-  zynqmp_ttc_clock_driver_support_at_tick
+#define Clock_driver_support_at_tick(arg) \
+  zynqmp_ttc_clock_driver_support_at_tick(arg)
 
 #define Clock_driver_support_initialize_hardware \
   zynqmp_ttc_clock_driver_support_initialize_hardware
 
-#define Clock_driver_support_install_isr(Clock_isr) \
-  zynqmp_ttc_clock_driver_support_install_isr( Clock_isr )
+#define Clock_driver_support_install_isr(isr) \
+  zynqmp_ttc_clock_driver_support_install_isr(isr)
 
 #include "../../../shared/dev/clock/clockimpl.h"
diff --git a/bsps/shared/grlib/btimer/tlib_ckinit.c b/bsps/shared/grlib/btimer/tlib_ckinit.c
index 8a5ee33842..e2179090fa 100644
--- a/bsps/shared/grlib/btimer/tlib_ckinit.c
+++ b/bsps/shared/grlib/btimer/tlib_ckinit.c
@@ -433,10 +433,10 @@ static const struct ops ops_irqamp = {
     } \
   } while (0)
 
-#define Clock_driver_timecounter_tick() \
+#define Clock_driver_timecounter_tick(arg) \
   tlib_clock_timecounter_tick()
 
-#define Clock_driver_support_at_tick() \
+#define Clock_driver_support_at_tick(arg) \
   do { \
     rtems_device_driver ret; \
     ret = tlib_clock_at_tick(); \