2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>

	PR 1257/bsps
	* mpc5xx/exceptions/raw_exception.c, mpc5xx/irq/irq.c,
	mpc6xx/exceptions/raw_exception.c,
	mpc8260/exceptions/raw_exception.c,
	mpc8xx/exceptions/raw_exception.c, new-exceptions/raw_exception.c,
	ppc403/ictrl/ictrl.c, ppc403/irq/ictrl.c: Code outside of cpukit
	should use the public API for
	rtems_interrupt_disable/rtems_interrupt_enable. By bypassing the
	public API and directly accessing _CPU_ISR_Disable and
	_CPU_ISR_Enable, they were bypassing the compiler memory barrier
	directive which could lead to problems. This patch also changes the
	type of the variable passed into these routines and addresses minor
	style issues.

2 files changed, 21 insertions, 23 deletions

diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.c b/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.c
index d1049923db..ea5a4e085c 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.c
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.c
@@ -20,11 +20,9 @@
  *  found in found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
  *
- * $Id$
  */
 
-#include <rtems/system.h>
-#include <rtems/score/cpu.h>
+#include <rtems.h>
 #include <rtems/score/powerpc.h>
 #include <libcpu/raw_exception.h>
 #include <libcpu/cpuIdent.h>
@@ -75,7 +73,7 @@ int mpc5xx_vector_is_valid(rtems_vector vector)
 
 int mpc5xx_set_exception  (const rtems_raw_except_connect_data* except)
 {
-  unsigned int level;
+  rtems_interrupt_level level;
 
   if (!mpc5xx_vector_is_valid(except->exceptIndex)) {
     return 0;
@@ -92,14 +90,14 @@ int mpc5xx_set_exception  (const rtems_raw_except_connect_data* except)
     return 0;
   }
 
-  _CPU_ISR_Disable(level);
+  rtems_interrupt_disable(level);
   
   raw_except_table[except->exceptIndex] = *except;
 
   exception_handler_table[except->exceptIndex] = except->hdl.raw_hdl;
   except->on(except);
   
-  _CPU_ISR_Enable(level);
+  rtems_interrupt_enable(level);
   return 1;
 }
 
@@ -116,7 +114,7 @@ int mpc5xx_get_current_exception (rtems_raw_except_connect_data* except)
 
 int mpc5xx_delete_exception (const rtems_raw_except_connect_data* except)
 {
-  unsigned int level;
+  rtems_interrupt_level level;
   
   if (!mpc5xx_vector_is_valid(except->exceptIndex)){
     return 0;
@@ -132,7 +130,7 @@ int mpc5xx_delete_exception (const rtems_raw_except_connect_data* except)
     return 0;
   }
 
-  _CPU_ISR_Disable(level);
+  rtems_interrupt_disable(level);
 
   except->off(except);
   exception_handler_table[except->exceptIndex] = 
@@ -141,7 +139,7 @@ int mpc5xx_delete_exception (const rtems_raw_except_connect_data* except)
   raw_except_table[except->exceptIndex] = default_raw_except_entry;
   raw_except_table[except->exceptIndex].exceptIndex = except->exceptIndex;
 
-  _CPU_ISR_Enable(level);
+  rtems_interrupt_enable(level);
     
   return 1;
 }
@@ -154,8 +152,8 @@ int mpc5xx_delete_exception (const rtems_raw_except_connect_data* except)
  */
 int mpc5xx_init_exceptions (rtems_raw_except_global_settings* config)
 {
-  unsigned 			i;
-  unsigned int level;
+  unsigned 		i;
+  rtems_interrupt_level level;
   
   /*
    * store various accelerators
@@ -164,7 +162,7 @@ int mpc5xx_init_exceptions (rtems_raw_except_global_settings* config)
   local_settings 		= config;
   default_raw_except_entry 	= config->defaultRawEntry;
 
-  _CPU_ISR_Disable(level);
+  rtems_interrupt_disable(level);
 
   for (i = 0; i < NUM_EXCEPTIONS; i++) {
     exception_handler_table[i] = raw_except_table[i].hdl.raw_hdl;
@@ -176,7 +174,7 @@ int mpc5xx_init_exceptions (rtems_raw_except_global_settings* config)
       raw_except_table[i].off(&raw_except_table[i]);
     }
   }
-  _CPU_ISR_Enable(level);
+  rtems_interrupt_enable(level);
 
   return 1;
 }
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c
index ef457a67a2..ae3489de40 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c
@@ -206,7 +206,7 @@ int CPU_irq_enabled_at_usiu(const rtems_irq_number irqLine)
 
 int CPU_install_rtems_irq_handler	(const rtems_irq_connect_data* irq)
 {
-    unsigned int level;
+    rtems_interrupt_level       level;
   
     if (!isValidInterrupt(irq->name)) {
       return 0;
@@ -222,7 +222,7 @@ int CPU_install_rtems_irq_handler	(const rtems_irq_connect_data* irq)
       return 0;
     }
 
-    _CPU_ISR_Disable(level);
+    rtems_interrupt_disable(level);
 
     /*
      * store the data provided by user
@@ -254,7 +254,7 @@ int CPU_install_rtems_irq_handler	(const rtems_irq_connect_data* irq)
      */
     irq->on(irq);
     
-    _CPU_ISR_Enable(level);
+    rtems_interrupt_enable(level);
 
     return 1;
 }
@@ -271,7 +271,7 @@ int CPU_get_current_rtems_irq_handler	(rtems_irq_connect_data* irq)
 
 int CPU_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 {
-    unsigned int level;
+    rtems_interrupt_level       level;
   
     if (!isValidInterrupt(irq->name)) {
       return 0;
@@ -286,7 +286,7 @@ int CPU_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) {
       return 0;
     }
-    _CPU_ISR_Disable(level);
+    rtems_interrupt_disable(level);
 
     /*
      * Disable interrupt on device
@@ -316,7 +316,7 @@ int CPU_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
      */
     rtems_hdl_tbl[irq->name] = default_rtems_entry;
 
-    _CPU_ISR_Enable(level);
+    rtems_interrupt_enable(level);
 
     return 1;
 }
@@ -327,8 +327,8 @@ int CPU_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 
 int CPU_rtems_irq_mngt_set	(rtems_irq_global_settings* config)
 {
-    int i;
-    unsigned int level;
+    int                    i;
+    rtems_interrupt_level  level;
 
    /*
     * Store various code accelerators
@@ -337,7 +337,7 @@ int CPU_rtems_irq_mngt_set	(rtems_irq_global_settings* config)
     default_rtems_entry 	= config->defaultEntry;
     rtems_hdl_tbl 		= config->irqHdlTbl;
 
-    _CPU_ISR_Disable(level);
+    rtems_interrupt_disable(level);
 
     /*
      * Start with UIMB IRQ
@@ -387,7 +387,7 @@ int CPU_rtems_irq_mngt_set	(rtems_irq_global_settings* config)
 	rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
       }
     }
-    _CPU_ISR_Enable(level);
+    rtems_interrupt_enable(level);
     return 1;
 }