2005-01-04 Joel Sherrill <joel@OARcorp.com>

	* at91rm9200/clock/clock.c, at91rm9200/irq/irq.c, at91rm9200/pmc/pmc.c,
	mc9328mxl/clock/clockdrv.c, mc9328mxl/irq/irq.c, mc9328mxl/irq/irq.h,
	shared/arm920/mmu.c: Remove warnings.

3 files changed, 13 insertions, 11 deletions

diff --git a/c/src/lib/libcpu/arm/mc9328mxl/clock/clockdrv.c b/c/src/lib/libcpu/arm/mc9328mxl/clock/clockdrv.c
index 4d26cb0251..385ab07f06 100644
--- a/c/src/lib/libcpu/arm/mc9328mxl/clock/clockdrv.c
+++ b/c/src/lib/libcpu/arm/mc9328mxl/clock/clockdrv.c
@@ -19,6 +19,7 @@
 #include <bsp.h>
 #include <irq.h>
 #include <mc9328mxl.h>
+#include <rtems/bspIo.h>  /* for printk */
 
 /* this is defined in ../../../shared/clockdrv_shell.c */
 rtems_isr Clock_isr(rtems_vector_number vector);
@@ -57,10 +58,11 @@ rtems_irq_connect_data clock_isr_data = {BSP_INT_TIMER1,
 /**
  * Installs the clock ISR. You shouldn't need to change this.
  */
-#define Clock_driver_support_install_isr( _new, _old )                      \
-  do {                                                                      \
-      BSP_install_rtems_irq_handler(&clock_isr_data);                       \
-     } while(0)
+#define Clock_driver_support_install_isr( _new, _old ) \
+  do {                                                 \
+      (_old) = NULL;                                   \
+      BSP_install_rtems_irq_handler(&clock_isr_data);  \
+  } while(0)
 
 
 /**
diff --git a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c b/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c
index c9a83044c4..6b06695d38 100644
--- a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c
+++ b/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c
@@ -36,9 +36,9 @@ static int isValidInterrupt(int irq)
 int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 {
     rtems_interrupt_level level;
-    uint32_t *bsp_tbl;
+    rtems_irq_hdl *bsp_tbl;
 
-    bsp_tbl = (uint32_t*)&bsp_vector_table;
+    bsp_tbl = &bsp_vector_table;
     
     if (!isValidInterrupt(irq->name)) {
       return 0;
@@ -80,9 +80,9 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 {
     rtems_interrupt_level level;
-    uint32_t *bsp_tbl;
+    rtems_irq_hdl *bsp_tbl;
 
-    bsp_tbl = (uint32_t*)&bsp_vector_table;
+    bsp_tbl = &bsp_vector_table;
   
     if (!isValidInterrupt(irq->name)) {
       return 0;
diff --git a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.h b/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.h
index 93c61b100b..edb7a651f4 100644
--- a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.h
+++ b/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.h
@@ -104,9 +104,6 @@ typedef enum {
     BSP_MAX_INT
 } rtems_irq_symbolic_name;
 
-extern void *bsp_vector_table;
-#define VECTOR_TABLE &bsp_vector_table;
-  											   
 typedef unsigned char  rtems_irq_level;
 typedef unsigned char  rtems_irq_trigger;
 
@@ -117,6 +114,9 @@ typedef void (*rtems_irq_enable)    (const struct __rtems_irq_connect_data__*);
 typedef void (*rtems_irq_disable)   (const struct __rtems_irq_connect_data__*);
 typedef int  (*rtems_irq_is_enabled)(const struct __rtems_irq_connect_data__*);
 
+extern rtems_irq_hdl bsp_vector_table;
+#define VECTOR_TABLE bsp_vector_table
+  											   
 typedef struct __rtems_irq_connect_data__ {
     /* IRQ line */
     rtems_irq_symbolic_name       name;