mpc5xx libcpu and ss555 BSP: Fix warnings

5 files changed, 25 insertions, 17 deletions

diff --git a/c/src/lib/libbsp/powerpc/ss555/clock/p_clock.c b/c/src/lib/libbsp/powerpc/ss555/clock/p_clock.c
index d6d339d131..25785b083f 100644
--- a/c/src/lib/libbsp/powerpc/ss555/clock/p_clock.c
+++ b/c/src/lib/libbsp/powerpc/ss555/clock/p_clock.c
@@ -20,11 +20,7 @@
 #include <bsp.h>
 #include <bsp/irq.h>
 #include <rtems/bspIo.h>
-
-extern void clockOn(void*);
-extern void clockOff (void*);
-extern int clockIsOn(void*);
-extern void Clock_isr(void *);
+#include <mpc5xx.h>
 
 static rtems_irq_connect_data clockIrqData = {
   CPU_PERIODIC_TIMER,
diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
index a1a8c55cf4..fbe0c56346 100644
--- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
@@ -1,10 +1,8 @@
-/*  bsp.h
- *
- *  This include file contains all board IO definitions.
- *
+/*
  *  This file includes definitions for the Intec SS555.
- *
- *
+ */
+
+/*
  *  SS555 port sponsored by Defence Research and Development Canada - Suffield
  *  Copyright (C) 2004, Real-Time Systems Inc. (querbach@realtime.bc.ca)
  *
@@ -21,6 +19,8 @@
 #ifndef _BSP_H
 #define _BSP_H
 
+#ifndef ASM
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -79,8 +79,15 @@ extern int BSP_disconnect_clock_handler (void);
 
 extern int BSP_connect_clock_handler (rtems_irq_hdl hdl);
 
+/*
+ *  Prototypes for methods called from .S to support dependency tracking.
+ */
+void _InitSS555(void);
+
 #ifdef __cplusplus
 }
 #endif
 
+#endif /* !ASM */
+
 #endif
diff --git a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h b/c/src/lib/libbsp/powerpc/ss555/irq/irq.h
index 3a0d7a1379..31c4be9a9e 100644
--- a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/ss555/irq/irq.h
@@ -44,6 +44,8 @@ int CPU_get_current_rtems_irq_handler(rtems_irq_connect_data* irq);
 int CPU_remove_rtems_irq_handler(const rtems_irq_connect_data* irq);
 int CPU_rtems_irq_mngt_set(rtems_irq_global_settings* config);
 int CPU_rtems_irq_mngt_get(rtems_irq_global_settings** config);
+void C_dispatch_irq_handler(CPU_Interrupt_frame *frame, unsigned int excNum);
+void C_default_exception_handler(CPU_Exception_frame* excPtr);
 
 /*
  * The SS555 has no external interrupt controller chip, so use the standard
diff --git a/c/src/lib/libbsp/powerpc/ss555/start/start.S b/c/src/lib/libbsp/powerpc/ss555/start/start.S
index c7575b0b63..6a8ef85afc 100644
--- a/c/src/lib/libbsp/powerpc/ss555/start/start.S
+++ b/c/src/lib/libbsp/powerpc/ss555/start/start.S
@@ -1,9 +1,10 @@
-/*  start.S
- *
+/*
  *  This file contains the entry veneer for RTEMS programs on the Intec
  *  SS555 board.  It jumps to the BSP which is responsible for performing
  *  all remaining initialization.
- *
+ */
+
+/*
  * This file is based on several others:
  *
  * (1) start360.s from the gen68360 BSP by
@@ -52,6 +53,8 @@
 #include <rtems/asm.h>
 #include <rtems/powerpc/registers.h>
 
+#include <bsp.h>
+
 /*
  *  The initial stack is set to the top of the internal RAM.
  *
diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c b/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c
index 1f5e879a02..034ae74b1d 100644
--- a/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c
+++ b/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c
@@ -1,8 +1,8 @@
 /*
- *  iss555.c
- *
  *  Intec SS555 initialization routines.
- *
+ */
+
+/*
  *  SS555 port sponsored by Defence Research and Development Canada - Suffield
  *  Copyright (C) 2004, Real-Time Systems Inc. (querbach@realtime.bc.ca)
  *