diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:16:02 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:16:02 +0000 |
commit | c83c3254d417d29e2d6809ebd3e6832105505da0 (patch) | |
tree | 8d4b68981fb529080f815fc5a824d88de500d166 /c/src/lib/libbsp/i386/shared/irq/idt.c | |
parent | 2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-c83c3254d417d29e2d6809ebd3e6832105505da0.tar.bz2 |
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* shared/irq/idt.c, shared/irq/irq.c, shared/irq/irq_init.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.
Diffstat (limited to 'c/src/lib/libbsp/i386/shared/irq/idt.c')
-rw-r--r-- | c/src/lib/libbsp/i386/shared/irq/idt.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/i386/shared/irq/idt.c b/c/src/lib/libbsp/i386/shared/irq/idt.c index ddaeadd878..07c748bf44 100644 --- a/c/src/lib/libbsp/i386/shared/irq/idt.c +++ b/c/src/lib/libbsp/i386/shared/irq/idt.c @@ -62,7 +62,7 @@ int i386_set_idt_entry (const rtems_raw_irq_connect_data* irq) { interrupt_gate_descriptor* idt_entry_tbl; unsigned limit; - unsigned int level; + rtems_interrupt_level level; i386_get_info_from_IDTR (&idt_entry_tbl, &limit); @@ -83,13 +83,13 @@ int i386_set_idt_entry (const rtems_raw_irq_connect_data* irq) return 0; } - _CPU_ISR_Disable(level); + rtems_interrupt_disable(level); raw_irq_table [irq->idtIndex] = *irq; create_interrupt_gate_descriptor (&idt_entry_tbl[irq->idtIndex], irq->hdl); irq->on(irq); - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); return 1; } @@ -100,7 +100,7 @@ void _CPU_ISR_install_vector (uint32_t vector, interrupt_gate_descriptor* idt_entry_tbl; unsigned limit; interrupt_gate_descriptor new; - unsigned int level; + rtems_interrupt_level level; i386_get_info_from_IDTR (&idt_entry_tbl, &limit); @@ -110,14 +110,14 @@ void _CPU_ISR_install_vector (uint32_t vector, if (vector >= limit) { return; } - _CPU_ISR_Disable(level) + rtems_interrupt_disable(level); * ((unsigned int *) oldHdl) = idt_entry_tbl[vector].low_offsets_bits | (idt_entry_tbl[vector].high_offsets_bits << 16); create_interrupt_gate_descriptor(&new, hdl); idt_entry_tbl[vector] = new; - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); } int i386_get_current_idt_entry (rtems_raw_irq_connect_data* irq) @@ -144,7 +144,7 @@ int i386_delete_idt_entry (const rtems_raw_irq_connect_data* irq) { interrupt_gate_descriptor* idt_entry_tbl; unsigned limit; - unsigned int level; + rtems_interrupt_level level; i386_get_info_from_IDTR (&idt_entry_tbl, &limit); @@ -164,7 +164,7 @@ int i386_delete_idt_entry (const rtems_raw_irq_connect_data* irq) if (get_hdl_from_vector(irq->idtIndex) != irq->hdl){ return 0; } - _CPU_ISR_Disable(level); + rtems_interrupt_disable(level); idt_entry_tbl[irq->idtIndex] = default_idt_entry; @@ -173,7 +173,7 @@ int i386_delete_idt_entry (const rtems_raw_irq_connect_data* irq) raw_irq_table[irq->idtIndex] = default_raw_irq_entry; raw_irq_table[irq->idtIndex].idtIndex = irq->idtIndex; - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); return 1; } @@ -185,7 +185,7 @@ int i386_init_idt (rtems_raw_irq_global_settings* config) { unsigned limit; unsigned i; - unsigned level; + rtems_interrupt_level level; interrupt_gate_descriptor* idt_entry_tbl; i386_get_info_from_IDTR (&idt_entry_tbl, &limit); @@ -203,7 +203,7 @@ int i386_init_idt (rtems_raw_irq_global_settings* config) local_settings = config; default_raw_irq_entry = config->defaultRawEntry; - _CPU_ISR_Disable(level); + rtems_interrupt_disable(level); create_interrupt_gate_descriptor (&default_idt_entry, default_raw_irq_entry.hdl); @@ -218,7 +218,7 @@ int i386_init_idt (rtems_raw_irq_global_settings* config) raw_irq_table[i].off(&raw_irq_table[i]); } } - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); return 1; } |