2010-04-28 Joel Sherrill <joel.sherrilL@OARcorp.com>

	* irq/irq.h, startup/iss555.c, startup/tm27supp.c: Remove warnings.

4 files changed, 21 insertions, 18 deletions

diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog
index c2e6f3df23..cebcbb87e9 100644
--- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ss555/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-28	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	* irq/irq.h, startup/iss555.c, startup/tm27supp.c: Remove warnings.
+
 2010-03-27	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* startup/start.S: remove bootcard calling warning
diff --git a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h b/c/src/lib/libbsp/powerpc/ss555/irq/irq.h
index 34f7401380..f91e94cdc2 100644
--- a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/ss555/irq/irq.h
@@ -36,6 +36,18 @@ extern "C" {
 #endif
 
 /*
+ *  These are no longer prototyped anywhere else. This appears to be
+ *  remnants of the IRQ code upgrade.
+ *
+ *  --joel 28 April 2010
+ */
+int CPU_install_rtems_irq_handler(const rtems_irq_connect_data* irq);
+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);
+
+/*
  * The SS555 has no external interrupt controller chip, so use the standard
  * routines from the CPU-dependent code.
  */
diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c b/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c
index d7e18913c5..5df0a6b4a5 100644
--- a/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c
+++ b/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c
@@ -26,6 +26,8 @@ SPR_RW(MI_GRA);
 SPR_RW(L2U_GRA);
 SPR_RW(BBCMCR);
 
+extern char int_ram_top[];		/* top of internal ram */
+
 /*
  *  Initialize SS555
  */
@@ -94,8 +96,6 @@ void _InitSS555 (void)
    * extend the internal RAM.  If booting from external RAM, leave it at
    * zero but set it up appropriately.
    */
-  extern char int_ram_top[];		/* top of internal ram */
-
   usiu.memc[0]._or =
       USIU_MEMC_OR_512K			/* bank size */
     | USIU_MEMC_OR_SCY(0)		/* wait states in first beat of burst */
diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c b/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c
index fb48396e04..b8cdbd8dc6 100644
--- a/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c
+++ b/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c
@@ -6,24 +6,11 @@
 
 #include <bsp.h>
 
-void tm27On(void)
-{
-}
-
-void tm27Off(void)
-{
-}
-
-int tm27IsOn(void)
-{
-  return 1;
-}
-
 rtems_irq_connect_data tm27IrqData = {
   CPU_USIU_EXT_IRQ_7,
   (rtems_irq_hdl)0,
-  (rtems_irq_enable)tm27On,
-  (rtems_irq_disable)tm27Off,
-  (rtems_irq_is_enabled)tm27IsOn
+  NULL,
+  NULL,
+  NULL
 };