RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
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.
This commit is contained in:
Joel Sherrill
2007-09-12 15:23:44 +00:00
parent 23f19746d4
commit f93630db63
9 changed files with 94 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c
View File

@@ -26,6 +26,7 @@
*/
#include <rtems/system.h>
#include <rtems/score/powerpc.h>
#include <rtems/score/isr.h>
#include <rtems/bspIo.h>
#include <libcpu/raw_exception.h>
#include <libcpu/cpuIdent.h>
@@ -385,7 +386,7 @@ int ppc_vector_is_valid(rtems_vector vector)
int ppc_set_exception (const rtems_raw_except_connect_data* except)
{
unsigned int level;
ISR_Level level;
if (!ppc_vector_is_valid(except->exceptIndex)) {
printk("ppc_set_exception: vector %d is not valid\n",
@@ -407,7 +408,7 @@ int ppc_set_exception (const rtems_raw_except_connect_data* except)
return 0;
}
_CPU_ISR_Disable(level);
_ISR_Disable(level);
raw_except_table [except->exceptIndex] = *except;
codemove((void*)ppc_get_vector_addr(except->exceptIndex),
@@ -416,7 +417,7 @@ int ppc_set_exception (const rtems_raw_except_connect_data* except)
PPC_CACHE_ALIGNMENT);
except->on(except);
_CPU_ISR_Enable(level);
_ISR_Enable(level);
return 1;
}
@@ -433,7 +434,7 @@ int ppc_get_current_exception (rtems_raw_except_connect_data* except)
int ppc_delete_exception (const rtems_raw_except_connect_data* except)
{
unsigned int level;
ISR_Level level;
if (!ppc_vector_is_valid(except->exceptIndex)){
return 0;
@@ -450,7 +451,7 @@ int ppc_delete_exception (const rtems_raw_except_connect_data* except)
except->hdl.raw_hdl_size)) {
return 0;
}
_CPU_ISR_Disable(level);
_ISR_Disable(level);
except->off(except);
codemove((void*)ppc_get_vector_addr(except->exceptIndex),
@@ -462,7 +463,7 @@ int ppc_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);
_ISR_Enable(level);
return 1;
}
@@ -472,8 +473,8 @@ int ppc_delete_exception (const rtems_raw_except_connect_data* except)
*/
int ppc_init_exceptions (rtems_raw_except_global_settings* config)
{
unsigned i;
unsigned int level;
int i;
ISR_Level level;
/*
* store various accelerators
@@ -482,7 +483,7 @@ int ppc_init_exceptions (rtems_raw_except_global_settings* config)
local_settings = config;
default_raw_except_entry = config->defaultRawEntry;
_CPU_ISR_Disable(level);
_ISR_Disable(level);
for (i=0; i <= LAST_VALID_EXC; i++) {
if (!ppc_vector_is_valid(i)){
@@ -499,7 +500,7 @@ int ppc_init_exceptions (rtems_raw_except_global_settings* config)
raw_except_table[i].off(&raw_except_table[i]);
}
}
_CPU_ISR_Enable(level);
_ISR_Enable(level);
return 1;
}