diff options
Diffstat (limited to 'c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.c')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.c | 24 |
1 files changed, 11 insertions, 13 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; } |