diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-11-28 18:15:51 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-11-28 18:15:51 +0000 |
| commit | 75ad73760f33b0d2b30061919d8d4b4bf0b4277b (patch) | |
| tree | fa1952b4f64567b4a808aa2c9dbb7d672f517c38 /c/src/lib/libbsp/powerpc/support/old_exception_processing | |
| parent | 2001-11-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-75ad73760f33b0d2b30061919d8d4b4bf0b4277b.tar.bz2 | |
2001-11-28 Joel Sherrill <joel@OARcorp.com>,
This was tracked as PR91.
* rtems/score/cpu.h: Added CPU_PROVIDES_ISR_IS_IN_PROGRESS macro which
is used to specify if the port uses the standard macro for this (FALSE).
A TRUE setting indicates the port provides its own implementation.
* rtems/score/c_isr.inl: Deleted and contents merged into cpu.c.
* cpu.c: Received contents of c_isr.inl.
* Makefile.am: Deleted reference to c_isr.inl.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/support/old_exception_processing')
5 files changed, 35 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog b/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog index 514a006ddf..bee7d01726 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog @@ -1,3 +1,13 @@ +2001-11-28 Joel Sherrill <joel@OARcorp.com>, + + This was tracked as PR91. + * rtems/score/cpu.h: Added CPU_PROVIDES_ISR_IS_IN_PROGRESS macro which + is used to specify if the port uses the standard macro for this (FALSE). + A TRUE setting indicates the port provides its own implementation. + * rtems/score/c_isr.inl: Deleted and contents merged into cpu.c. + * cpu.c: Received contents of c_isr.inl. + * Makefile.am: Deleted reference to c_isr.inl. + 2001-11-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * .cvsignore: Add aclocal.m4, autom4te.*, config.*, configure. diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am index 476397992e..66af1d137e 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am @@ -13,8 +13,7 @@ C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h \ - rtems/score/c_isr.inl rtems/score/ppc_offs.h +include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/ppc_offs.h # Assembly source names S_FILES = cpu_asm.S @@ -28,8 +27,7 @@ TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%) # FIXME: This should not be here. -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score/cpu.h \ - $(PROJECT_INCLUDE)/rtems/score/c_isr.inl +PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score/cpu.h TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c index 1d6845cb69..5b8fcb6259 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c @@ -873,3 +873,19 @@ unsigned32 ppc_exception_vector_addr( return Top; } +/*PAGE + * + * This is the PowerPC specific implementation of the routine which + * returns TRUE if an interrupt is in progress. + * + * NOTE: This is the same as the generic version. But since the + * PowerPC is still supporting old and new exception processing + * models and the new exception processing model has a hardware + * way of doing this, we have to provide this capability here + * for symmetry. + */ + +boolean _ISR_Is_in_progress( void ) +{ + return (_ISR_Nest_level != 0); +} diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/c_isr.inl b/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/c_isr.inl deleted file mode 100644 index 706d4f7e4f..0000000000 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/c_isr.inl +++ /dev/null @@ -1,4 +0,0 @@ -RTEMS_INLINE_ROUTINE boolean _ISR_Is_in_progress( void ) -{ - return (_ISR_Nest_level != 0); -} diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/cpu.h b/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/cpu.h index 935f4ca0d3..cdcfd85a62 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/cpu.h +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/cpu.h @@ -653,6 +653,13 @@ SCORE_EXTERN struct { #define CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER (PPC_INTERRUPT_MAX - 1) /* + * This is defined if the port has a special way to report the ISR nesting + * level. Most ports maintain the variable _ISR_Nest_level. + */ + +#define CPU_PROVIDES_ISR_IS_IN_PROGRESS TRUE + +/* * Should be large enough to run all RTEMS tests. This insures * that a "reasonable" small application should not have any problems. */ |