From 1800f71707063d8de2458b237e56497b63ab3f73 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 8 Jan 2001 18:16:51 +0000 Subject: 2001-01-08 Joel Sherrill * idtcpu.h: Commented out definition of "wait". It was stupid to use such a common word as a macro. * rtems/score/cpu.h (_CPU_ISR_Disable): Fixed for mips ISA 3. * rtems/score/mips.h: Added include of . * rtems/score/mips.h (mips_enable_in_interrupt_mask): Corrected. --- c/src/exec/score/cpu/mips/ChangeLog | 8 ++++++++ c/src/exec/score/cpu/mips/idtcpu.h | 2 ++ c/src/exec/score/cpu/mips/rtems/score/cpu.h | 3 +-- c/src/exec/score/cpu/mips/rtems/score/mips.h | 6 +++++- 4 files changed, 16 insertions(+), 3 deletions(-) (limited to 'c/src/exec/score') diff --git a/c/src/exec/score/cpu/mips/ChangeLog b/c/src/exec/score/cpu/mips/ChangeLog index aa76ef66c0..39322e3962 100644 --- a/c/src/exec/score/cpu/mips/ChangeLog +++ b/c/src/exec/score/cpu/mips/ChangeLog @@ -1,3 +1,11 @@ +2001-01-08 Joel Sherrill + + * idtcpu.h: Commented out definition of "wait". It was stupid to + use such a common word as a macro. + * rtems/score/cpu.h (_CPU_ISR_Disable): Fixed for mips ISA 3. + * rtems/score/mips.h: Added include of . + * rtems/score/mips.h (mips_enable_in_interrupt_mask): Corrected. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/mips/idtcpu.h b/c/src/exec/score/cpu/mips/idtcpu.h index 02153b184f..bbddf23a1d 100644 --- a/c/src/exec/score/cpu/mips/idtcpu.h +++ b/c/src/exec/score/cpu/mips/idtcpu.h @@ -176,9 +176,11 @@ LICENSED MATERIAL - PROGRAM PROPERTY OF IDT #define WAIT .word 0x42000020 #endif WAIT +/* Disabled by joel -- horrible overload of common word. #ifndef wait #define wait .word 0x42000020 #endif wait +*/ #endif diff --git a/c/src/exec/score/cpu/mips/rtems/score/cpu.h b/c/src/exec/score/cpu/mips/rtems/score/cpu.h index 870d697f6c..c0ed92a642 100644 --- a/c/src/exec/score/cpu/mips/rtems/score/cpu.h +++ b/c/src/exec/score/cpu/mips/rtems/score/cpu.h @@ -40,7 +40,6 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include #include #endif @@ -600,7 +599,7 @@ extern unsigned int mips_interrupt_number_of_vectors; #define _CPU_ISR_Disable( _level ) \ do { \ mips_get_sr( _level ); \ - mips_set_sr( (_level) & ~SR_IEC ); \ + mips_set_sr( (_level) & ~SR_IMASK ); \ } while(0) /* diff --git a/c/src/exec/score/cpu/mips/rtems/score/mips.h b/c/src/exec/score/cpu/mips/rtems/score/mips.h index 1f2740c49d..f95175d362 100644 --- a/c/src/exec/score/cpu/mips/rtems/score/mips.h +++ b/c/src/exec/score/cpu/mips/rtems/score/mips.h @@ -18,6 +18,10 @@ extern "C" { #endif +#ifndef ASM +#include +#endif + /* * This file contains the information required to build * RTEMS for a particular member of the "no cpu" @@ -89,7 +93,7 @@ extern "C" { do { \ unsigned int _sr; \ mips_get_sr( _sr ); \ - _sr |= (_mask) | SR_IEC; \ + _sr |= (_mask); \ mips_set_sr( _sr ); \ } while (0) -- cgit v1.2.3