2008-08-19 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* include/bsp.h, network/network.c, spi/spi_init.c, startup/cpuinit.c,
	startup/uboot_support.c: Fixed warnings.

6 files changed, 19 insertions, 10 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
index 6570be61d1..f6a7b4dfcc 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-19	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* include/bsp.h, network/network.c, spi/spi_init.c, startup/cpuinit.c,
+	startup/uboot_support.c: Fixed warnings.
+
 2008-08-18	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* Makefile.am, startup/bspstart.c, startup/cpuinit.c: For the
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h b/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h
index 4a725b65e7..c5408fe839 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h
@@ -215,6 +215,8 @@ extern uint32_t bsp_clicks_per_usec;
 
 void mpc83xx_zero_4( void *dest, size_t n);
 
+void cpu_init( void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/network/network.c b/c/src/lib/libbsp/powerpc/gen83xx/network/network.c
index 90a50bec6a..a3b80dac3f 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/network/network.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/network/network.c
@@ -156,9 +156,11 @@ int BSP_tsec_attach
   /*
    * set interrupt number for given interface
    */
-  config->irno = ((unitNumber == 1)
-		  ? BSP_IPIC_IRQ_TSEC1_TX
-		  : BSP_IPIC_IRQ_TSEC2_TX);
+  config->irno = (unsigned) (
+      unitNumber == 1
+      ? BSP_IPIC_IRQ_TSEC1_TX
+      : BSP_IPIC_IRQ_TSEC2_TX
+    );
   /*
    * call attach function of board independent driver
    */
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c b/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
index b065ffc6f0..ded34467a9 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
@@ -296,7 +296,7 @@ rtems_status_code bsp_register_spi
 \*=========================================================================*/
 {
   int ret_code;
-  int spi_busno;
+  unsigned spi_busno;
 
   /*
    * init I2C library (if not already done)
@@ -369,7 +369,7 @@ rtems_status_code bsp_register_spi
   if (ret_code < 0) {
     return -ret_code;
   }
-  spi_busno = ret_code;
+  spi_busno = (unsigned) ret_code;
 
 #if defined( MPC8313ERDB)
 
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c
index b7c4fcb4bc..c07b414713 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c
@@ -91,7 +91,7 @@
 #define SET_IBAT(n,uv,lv) {IBAT_MTSPR(lv,IBAT##n##L);IBAT_MTSPR(uv,IBAT##n##U);}
 #endif
 
-void calc_dbat_regvals(BAT *bat_ptr,
+static void calc_dbat_regvals(BAT *bat_ptr,
 		       uint32_t base_addr,
 		       uint32_t size,
 		       boolean flg_w,
@@ -107,7 +107,7 @@ void calc_dbat_regvals(BAT *bat_ptr,
    * determine block mask, that overlaps the whole block
    */
   end_addr = base_addr+size-1;
-  block_mask = ~0;
+  block_mask = 0xffffffff;
   while ((end_addr & block_mask) != (base_addr & block_mask)) {
     block_mask <<= 1;
   }
@@ -125,7 +125,7 @@ void calc_dbat_regvals(BAT *bat_ptr,
   bat_ptr->batl.pp = flg_bpp; 
 }
 
-void clear_mmu_regs(void)
+static void clear_mmu_regs(void)
 {
   uint32_t i;
   /*
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/uboot_support.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/uboot_support.c
index 578490789a..579fb79556 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/uboot_support.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/uboot_support.c
@@ -19,8 +19,8 @@
 #if defined(HAS_UBOOT)
 /* XXX TODO fill in with real information */
 /* Base address of U-Boot environment variables */
-const uint8_t *uboot_environment      = (const char *)0x00000000;
+const uint8_t *uboot_environment      = (const uint8_t *) 0x00000000;
 
 /* Length of area reserved for U-Boot environment variables */
-const size_t  *uboot_environment_size = 0x10000;
+const size_t  *uboot_environment_size = (const size_t *) 0x00010000;
 #endif