# HG changeset patch
# User bartv
# Date 1042977910 0
# Node ID 148c41b548dc18fb05767ae719a3a4f2e6e6a627
# Parent  acf7e0451d91ca646445dc22807e8ef492cf51c1
Fix build failures caused by using the wrong register #define

diff --git a/packages/hal/powerpc/mpc8xx/current/ChangeLog b/packages/hal/powerpc/mpc8xx/current/ChangeLog
--- a/packages/hal/powerpc/mpc8xx/current/ChangeLog
+++ b/packages/hal/powerpc/mpc8xx/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-18  Bart Veer  <bartv@ecoscentric.com>
+
+	* src/variant.S: _mpc8xx_reset caused build failures with current
+	tools.
+
 2002-12-02  Gary Thomas  <gthomas@ecoscentric.com>
 
 	* src/variant.S (_mpc8xx_reset): New function, used to cause a
@@ -217,6 +222,7 @@ 2000-02-07  Jesper Skov  <jskov@redhat.c
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 2003 Bart Veer
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
 //
 // eCos is free software; you can redistribute it and/or modify it under
diff --git a/packages/hal/powerpc/mpc8xx/current/src/variant.S b/packages/hal/powerpc/mpc8xx/current/src/variant.S
--- a/packages/hal/powerpc/mpc8xx/current/src/variant.S
+++ b/packages/hal/powerpc/mpc8xx/current/src/variant.S
@@ -8,6 +8,7 @@
 #####ECOSGPLCOPYRIGHTBEGIN####
 ## -------------------------------------------
 ## This file is part of eCos, the Embedded Configurable Operating System.
+## Copyright (C) 2003 Bart Veer
 ## Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
 ## Copyright (C) 2002 Gary Thomas
 ##
@@ -100,7 +101,7 @@ hal_interrupt_objects:
         ori     r3,r3,0x0080  // Bit 24
 	stw	r3,PLPRCR(r4)
         mfmsr   r3
-        lwi     r5,~MSR_ME
+        lwi     r5,~CYGARC_REG_MSR_ME
         and     r3,r3,r5
         mtmsr   r3