summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2014-10-20 10:57:44 -0500
committerJoel Sherrill <joel.sherrill@oarcorp.com>2014-10-20 10:57:44 -0500
commit21ee1c8dce9673e3ae1b544f0a2422798f0ea58a (patch)
tree2f7bbf8a392f09b2a7f4877cfc98df094d964f55
parentc2e32ffc7d78de4e672f1e76bfeec0af73a772b1 (diff)
downloadrtems-21ee1c8dce9673e3ae1b544f0a2422798f0ea58a.tar.bz2
m68k/gen68360: Fix warnings
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/include/bsp.h5
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/startup/init68360.c11
2 files changed, 13 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
index c51a906620..cb9c1a3403 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
@@ -102,6 +102,11 @@ rtems_isr_entry set_vector(
#define PGH360_PB_SPI_EEP_CE_MSK (1<< 0)
#endif /* defined(PGH360) */
+/*
+ * Prototypes for BSP methods which cross file boundaries
+ */
+void _Init68360(void);
+
#ifdef __cplusplus
}
#endif
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c b/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c
index b39a9e150f..67fed27a3b 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c
@@ -1,6 +1,8 @@
/*
* MC68360 support routines
- *
+ */
+
+/*
* W. Eric Norum
* Saskatchewan Accelerator Laboratory
* University of Saskatchewan
@@ -8,7 +10,6 @@
* eric@skatter.usask.ca
*/
-#include <rtems.h>
#include <bsp.h>
#include <rtems/m68k/m68360.h>
@@ -45,11 +46,12 @@ void _Init68360 (void)
int i;
rtems_isr_entry *vbr;
unsigned long ramSize;
+
+#if (defined (__mc68040__))
volatile unsigned long *RamBase_p;
RamBase_p = (volatile unsigned long *)&RamBase;
-#if (defined (__mc68040__))
/*
*******************************************
* Motorola 68040 and companion-mode 68360 *
@@ -645,6 +647,9 @@ void _Init68360 (void)
m360.mcr = 0x4C7F;
#else
+ volatile unsigned long *RamBase_p;
+
+ RamBase_p = (volatile unsigned long *)&RamBase;
/*
***************************************************
* Generic Standalone Motorola 68360 *