2009-06-05 Joel Sherrill <joel.sherrill@OARcorp.com>

	* preinstall.am, pxa255/clock/clock.c, pxa255/ffuart/ffuart.c,
	pxa255/irq/bsp_irq_init.c, pxa255/timer/timer.c: Fix typos and update
	timer.

1 files changed, 16 insertions, 19 deletions

diff --git a/c/src/lib/libcpu/arm/pxa255/clock/clock.c b/c/src/lib/libcpu/arm/pxa255/clock/clock.c
index d0fe9ecab4..0bb96a00a3 100755
--- a/c/src/lib/libcpu/arm/pxa255/clock/clock.c
+++ b/c/src/lib/libcpu/arm/pxa255/clock/clock.c
@@ -34,18 +34,15 @@ static unsigned long period_num;
  */
 static void clock_isr_on(const rtems_irq_connect_data *unused)
 {
-
   /*Clear the interrupt bit */
   XSCALE_OS_TIMER_TSR = 0x1;
-  
-    
+
   /* enable timer interrupt */
   XSCALE_OS_TIMER_IER |= 0x1;
 
   period_num = TIMER_RATE*(Configuration.microseconds_per_tick/10000);
 
   XSCALE_OS_TIMER_MR0 = XSCALE_OS_TIMER_TCR + period_num;
-   
 }
 
 /**
@@ -77,13 +74,15 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq)
 rtems_isr Clock_isr(rtems_vector_number vector);
 
 /* 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,
-                                         clock_isr_on,
-                                         clock_isr_off,
-                                         clock_isr_is_on,
-                                         3,     /* unused for ARM cpus */
-                                         0 };   /* unused for ARM cpus */
+rtems_irq_connect_data clock_isr_data = {
+  XSCALE_IRQ_OS_TIMER,
+  (rtems_irq_hdl)Clock_isr,
+  clock_isr_on,
+  clock_isr_off,
+  clock_isr_is_on,
+  3,     /* unused for ARM cpus */
+  0      /* unused for ARM cpus */
+};
 
 
 #define Clock_driver_support_install_isr( _new, _old ) \
@@ -91,10 +90,7 @@ rtems_irq_connect_data clock_isr_data = {XSCALE_IRQ_OS_TIMER,
 
 void Clock_driver_support_initialize_hardware(void)
 {
- 
-
   period_num = TIMER_RATE*(Configuration.microseconds_per_tick/10000);
- 
 }
 
 
@@ -102,15 +98,16 @@ void Clock_driver_support_initialize_hardware(void)
 
 #define Clock_driver_support_at_tick() \
   do { \
-    ;\									
-    XSCALE_OS_TIMER_TSR = 0x1;/* read the status to clear the int */	\
-    XSCALE_OS_TIMER_MR0 = XSCALE_OS_TIMER_TCR + period_num;/*Add the match register*/ \    
-    ;\						
+    /* read the status to clear the int */ \
+    XSCALE_OS_TIMER_TSR = 0x1; \
+    \
+    /*Add the match register*/ \
+    XSCALE_OS_TIMER_MR0 = XSCALE_OS_TIMER_TCR + period_num; \
   } while (0)
 
 void Clock_driver_support_shutdown_hardware( void )
 {
-    BSP_remove_rtems_irq_handler(&clock_isr_data);
+  BSP_remove_rtems_irq_handler(&clock_isr_data);
 }
 
 #include "../../../../libbsp/shared/clockdrv_shell.h"