From c0af822e77db2c54f322eb493305158b2516c653 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 17 May 2002 18:05:29 +0000
Subject: 2001-05-17	Joel Sherrill <joel@OARcorp.com>

	* mpc6xx/exceptions/raw_exception.c, pc6xx/mmu/pte121.c: Modified
	slightly to reflect recent PowerPC re-organization and avoid warnings.
---
 c/src/lib/libcpu/powerpc/ChangeLog                         | 5 +++++
 c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c | 4 ++--
 c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c               | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'c/src/lib/libcpu/powerpc')

diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 2170a91cb4..5d24e0e672 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-17	Joel Sherrill <joel@OARcorp.com>
+
+	* mpc6xx/exceptions/raw_exception.c, pc6xx/mmu/pte121.c: Modified
+	slightly to reflect recent PowerPC re-organization and avoid warnings.
+
 2001-05-15	Till Straumann <strauman@slac.stanford.edu>
 
 	* mpc6xx/mmu/pte121.c, mpc6xx/mmu/pte121.h: New files. Missed in
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c
index d964cbbe59..8d4a18d075 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c
@@ -22,7 +22,7 @@
  */
 #include <rtems/system.h>
 #include <rtems/score/ppc.h>
-#include <rtems/system.h>
+#include <rtems/bspIo.h>
 #include <libcpu/raw_exception.h>
 #include <libcpu/cpuIdent.h>
 
@@ -121,7 +121,7 @@ int mpc60x_vector_is_valid(rtems_vector vector)
             break;
         case PPC_604:
         case PPC_604e:
-        case PPC_604r:
+        /* case PPC_604r: -- same value as PPC_750 */
             if (!mpc604_vector_is_valid(vector)) {
                 return 0;
             }
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
index adbd35ed23..5e7634b7cc 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
@@ -21,7 +21,7 @@
 #ifndef DEBUG_MAIN
 #include <rtems.h>
 #include <rtems/bspIo.h>
-#include <libcpu/cpu.h>
+#include <libcpu/cpuIdent.h>
 #include <bsp.h>
 #ifdef	DEBUG_EXC
 #include <bsp/vectors.h>
-- 
cgit v1.2.3