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.

8 files changed, 28 insertions, 19 deletions

diff --git a/c/src/lib/libcpu/arm/ChangeLog b/c/src/lib/libcpu/arm/ChangeLog
index 43026e9ffe..816fa34c93 100644
--- a/c/src/lib/libcpu/arm/ChangeLog
+++ b/c/src/lib/libcpu/arm/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2005-01-02	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* at91rm9200/Makefile.am, mc9328mxl/Makefile.am,
diff --git a/c/src/lib/libcpu/arm/at91rm9200/clock/clock.c b/c/src/lib/libcpu/arm/at91rm9200/clock/clock.c
index 961ffef7e6..2db626e549 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/clock/clock.c
+++ b/c/src/lib/libcpu/arm/at91rm9200/clock/clock.c
@@ -21,6 +21,7 @@
 #include <bsp.h>
 #include <irq.h>
 #include <at91rm9200.h>
+#include <at91rm9200_pmc.h>
 
 
 rtems_device_major_number rtems_clock_major = ~0;
diff --git a/c/src/lib/libcpu/arm/at91rm9200/irq/irq.c b/c/src/lib/libcpu/arm/at91rm9200/irq/irq.c
index 6bb7be4ac5..a3e0643dd0 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/irq/irq.c
+++ b/c/src/lib/libcpu/arm/at91rm9200/irq/irq.c
@@ -45,7 +45,7 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
      * sources PID (see the at91rm9200_pid for this mapping).  We 
      * convert it to a long word offset to get source's vector register 
      */
-    if (AIC_SVR_REG(irq->name * 4) != default_int_handler) {
+    if (AIC_SVR_REG(irq->name * 4) != (uint32_t) default_int_handler) {
         return 0;
     }
     
@@ -54,7 +54,7 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * store the new handler
      */
-    AIC_SVR_REG(irq->name * 4) = irq->hdl;
+    AIC_SVR_REG(irq->name * 4) = (uint32_t) irq->hdl;
     
     /*
      * unmask interrupt
@@ -87,7 +87,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Check if the handler is actually connected. If not, issue an error.
      */
-    if (AIC_SVR_REG(irq->name * 4) != irq->hdl) {
+    if (AIC_SVR_REG(irq->name * 4) != (uint32_t) irq->hdl) {
       return 0;
     }
     _CPU_ISR_Disable(level);
@@ -107,7 +107,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * restore the default irq value
      */
-    AIC_SVR_REG(irq->name * 4) = default_int_handler;
+    AIC_SVR_REG(irq->name * 4) = (uint32_t) default_int_handler;
     
     _CPU_ISR_Enable(level);
 
diff --git a/c/src/lib/libcpu/arm/at91rm9200/pmc/pmc.c b/c/src/lib/libcpu/arm/at91rm9200/pmc/pmc.c
index b2877f866c..4e522d1aed 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/pmc/pmc.c
+++ b/c/src/lib/libcpu/arm/at91rm9200/pmc/pmc.c
@@ -29,9 +29,9 @@ int at91rm9200_get_slck(void)
 int at91rm9200_get_mck(void)
 {
     uint32_t mck_reg;
-    uint32_t mck_freq;
+    uint32_t mck_freq = 0;  /* to avoid warnings */
     uint32_t pll_reg;
-    int prescaler;
+    int prescaler = 0;  /* to avoid warnings */
 
     mck_reg = PMC_REG(PMC_MCKR);
 
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;
diff --git a/c/src/lib/libcpu/arm/shared/arm920/mmu.c b/c/src/lib/libcpu/arm/shared/arm920/mmu.c
index 967768d911..a2182431cf 100644
--- a/c/src/lib/libcpu/arm/shared/arm920/mmu.c
+++ b/c/src/lib/libcpu/arm/shared/arm920/mmu.c
@@ -77,8 +77,8 @@ void mmu_init(mmu_sect_map_t *map)
     /* create a 1:1 mapping of the entire address space */
     i = 0;
     while(map[i].size != 0) {
-        int c;
-        int b;
+        int c = 0;  /* to avoid uninitialized warnings */
+        int b = 0;  /* to avoid uninitialized warnings */
         int pbase;
         int vbase;
         int sects;