From abb52ce597b68ec441794e0b1ac0ad96c53c6bc3 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@oarcorp.com>
Date: Thu, 19 Apr 2012 13:16:20 -0500
Subject: pxa255 shared: Clock driver clean up and ISR Handler Prototype
 Correction.

---
 c/src/lib/libcpu/arm/pxa255/clock/clock.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/c/src/lib/libcpu/arm/pxa255/clock/clock.c b/c/src/lib/libcpu/arm/pxa255/clock/clock.c
index dadccd7d2e..0bb2b0822f 100755
--- a/c/src/lib/libcpu/arm/pxa255/clock/clock.c
+++ b/c/src/lib/libcpu/arm/pxa255/clock/clock.c
@@ -7,8 +7,6 @@
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
  */
 
 #include <rtems.h>
@@ -71,7 +69,6 @@ static void clock_isr_off(const rtems_irq_connect_data *unused)
   XSCALE_OS_TIMER_TSR = 0x1;
   /* disable timer interrupt*/
   XSCALE_OS_TIMER_IER &= ~0x1;
-  return;
 }
 
 /**
@@ -82,23 +79,21 @@ static void clock_isr_off(const rtems_irq_connect_data *unused)
  */
 static int clock_isr_is_on(const rtems_irq_connect_data *irq)
 {
-    /* check timer interrupt */
+  /* check timer interrupt */
   return XSCALE_OS_TIMER_IER & 0x1;
 }
 
-rtems_isr Clock_isr(rtems_vector_number vector);
+void Clock_isr(rtems_irq_hdl_param arg);
 
-/* Replace the first value with the clock's interrupt name. */
 rtems_irq_connect_data clock_isr_data = {
-  XSCALE_IRQ_OS_TIMER,
-  (rtems_irq_hdl)Clock_isr,
-  NULL,
-  clock_isr_on,
-  clock_isr_off,
-  clock_isr_is_on
+  .name   = XSCALE_IRQ_OS_TIMER,
+  .hdl    = Clock_isr,
+  .handle = NULL,
+  .on     = clock_isr_on,
+  .off    = clock_isr_off,
+  .isOn   = clock_isr_is_on,
 };
 
-
 #define Clock_driver_support_install_isr( _new, _old ) \
   do {						       \
     _old = NULL;				       \
@@ -114,9 +109,6 @@ void Clock_driver_support_initialize_hardware(void)
 #endif
 }
 
-
-#define CLOCK_VECTOR 0
-
 #define Clock_driver_support_at_tick() \
   do { \
     /* read the status to clear the int */ \
-- 
cgit v1.2.3