From 8b94c03fdcba19ab748b3380cf6fd1d7a1fb528c Mon Sep 17 00:00:00 2001 From: "Jeffrey O. Hill" Date: Wed, 6 Feb 2013 08:27:37 +0100 Subject: nios2: Set CPU_ISR_PASSES_FRAME_POINTER to FALSE This reflects what is currently happening. Define CPU_Interrupt_frame type to void to prevent accidental usage. --- cpukit/score/cpu/nios2/nios2-iic-irq.c | 2 +- cpukit/score/cpu/nios2/rtems/score/cpu.h | 24 ++---------------------- 2 files changed, 3 insertions(+), 23 deletions(-) (limited to 'cpukit/score/cpu') diff --git a/cpukit/score/cpu/nios2/nios2-iic-irq.c b/cpukit/score/cpu/nios2/nios2-iic-irq.c index 5750f1311f..31e2ba9ad8 100644 --- a/cpukit/score/cpu/nios2/nios2-iic-irq.c +++ b/cpukit/score/cpu/nios2/nios2-iic-irq.c @@ -73,7 +73,7 @@ RTEMS_INLINE_ROUTINE void __IIC_Handler(void) if (active & mask) { if ( _ISR_Vector_table[ vector] ) - (*_ISR_Vector_table[ vector ])(vector, NULL); + (*_ISR_Vector_table[ vector ])(vector); active &= ~mask; } mask <<= 1; diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu.h b/cpukit/score/cpu/nios2/rtems/score/cpu.h index 6db6d1d46c..b0e94c5a31 100644 --- a/cpukit/score/cpu/nios2/rtems/score/cpu.h +++ b/cpukit/score/cpu/nios2/rtems/score/cpu.h @@ -51,7 +51,7 @@ extern "C" { #define CPU_ALLOCATE_INTERRUPT_STACK TRUE -#define CPU_ISR_PASSES_FRAME_POINTER 1 +#define CPU_ISR_PASSES_FRAME_POINTER FALSE #define CPU_HARDWARE_FP FALSE @@ -149,27 +149,7 @@ typedef struct { #define _CPU_Context_Get_SP( _context ) \ (_context)->sp -typedef struct { - uint32_t r1; - uint32_t r2; - uint32_t r3; - uint32_t r4; - uint32_t r5; - uint32_t r6; - uint32_t r7; - uint32_t r8; - uint32_t r9; - uint32_t r10; - uint32_t r11; - uint32_t r12; - uint32_t r13; - uint32_t r14; - uint32_t r15; - uint32_t ra; - uint32_t gp; - uint32_t et; - uint32_t ea; -} CPU_Interrupt_frame; +typedef void CPU_Interrupt_frame; typedef struct { uint32_t r1; -- cgit v1.2.3