diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-03-27 14:59:26 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-03-27 14:59:26 +0000 |
commit | ff8dd26afa8eb060676d496b3770071ddec75e66 (patch) | |
tree | 72f2b82f23db7cb29cd1c0d1fc94f84cb3b3112f /cpukit/score/cpu | |
parent | code changes to remove warnings (diff) | |
download | rtems-ff8dd26afa8eb060676d496b3770071ddec75e66.tar.bz2 |
2010-03-27 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am: Remove unused file.
* irq.c: Removed.
Diffstat (limited to '')
-rw-r--r-- | cpukit/score/cpu/bfin/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/score/cpu/bfin/Makefile.am | 2 | ||||
-rw-r--r-- | cpukit/score/cpu/bfin/cpu.c | 4 | ||||
-rw-r--r-- | cpukit/score/cpu/bfin/cpu_asm.S | 7 | ||||
-rw-r--r-- | cpukit/score/cpu/bfin/irq.c | 111 |
5 files changed, 15 insertions, 114 deletions
diff --git a/cpukit/score/cpu/bfin/ChangeLog b/cpukit/score/cpu/bfin/ChangeLog index 6c7262b964..b7de26fb2f 100644 --- a/cpukit/score/cpu/bfin/ChangeLog +++ b/cpukit/score/cpu/bfin/ChangeLog @@ -1,3 +1,8 @@ +2010-03-27 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am: Remove unused file. + * irq.c: Removed. + 2009-05-25 Allan Hessenflow <allanh@kallisti.com> PR 1417/cpukit diff --git a/cpukit/score/cpu/bfin/Makefile.am b/cpukit/score/cpu/bfin/Makefile.am index c5d1c03267..4eebfcc7c6 100644 --- a/cpukit/score/cpu/bfin/Makefile.am +++ b/cpukit/score/cpu/bfin/Makefile.am @@ -15,7 +15,7 @@ include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/bfin.h \ rtems/score/cpu_asm.h rtems/score/types.h noinst_LIBRARIES = libscorecpu.a -libscorecpu_a_SOURCES = cpu.c irq.c cpu_asm.S +libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(srcdir)/preinstall.am diff --git a/cpukit/score/cpu/bfin/cpu.c b/cpukit/score/cpu/bfin/cpu.c index 47170850b7..58b96bae54 100644 --- a/cpukit/score/cpu/bfin/cpu.c +++ b/cpukit/score/cpu/bfin/cpu.c @@ -11,6 +11,10 @@ * $Id$ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <rtems/system.h> #include <rtems/score/isr.h> #include <rtems/score/wkspace.h> diff --git a/cpukit/score/cpu/bfin/cpu_asm.S b/cpukit/score/cpu/bfin/cpu_asm.S index a9fa913f48..13ca83bc84 100644 --- a/cpukit/score/cpu/bfin/cpu_asm.S +++ b/cpukit/score/cpu/bfin/cpu_asm.S @@ -10,8 +10,8 @@ * Based on earlier version: * * Copyright (c) 2006 by Atos Automacao Industrial Ltda. - * written by Alain Schaefer <alain.schaefer@easc.ch> - * and Antonio Giovanini <antonio@atos.com.br> + * written by Alain Schaefer <alain.schaefer@easc.ch> + * and Antonio Giovanini <antonio@atos.com.br> * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -20,6 +20,9 @@ * $Id$ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <rtems/asm.h> #include <rtems/score/cpu_asm.h> diff --git a/cpukit/score/cpu/bfin/irq.c b/cpukit/score/cpu/bfin/irq.c deleted file mode 100644 index eccb03d3d5..0000000000 --- a/cpukit/score/cpu/bfin/irq.c +++ /dev/null @@ -1,111 +0,0 @@ -/* Blackfin CPU Dependent Source - * - * COPYRIGHT (c) 2006 by Atos Automacao Industrial Ltda. - * written by Alain Schaefer <alain.schaefer@easc.ch> - * and Antonio Giovanini <antonio@atos.com.br> - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - - -#if 0 /* this file no longer used */ - -#include <rtems/system.h> -#include <rtems/score/cpu.h> -#include <rtems/score/isr.h> -#include <rtems/score/thread.h> - -/* - * This routine provides the RTEMS interrupt management. - */ - -#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) - unsigned long *_old_stack_ptr; -#endif - -register unsigned long *stack_ptr asm("SP"); - -void ISR_Handler2(uint32_t vector, void *isr_sp) -{ - register uint32_t level; - - _CPU_ISR_Disable( level ); - - _Thread_Dispatch_disable_level++; - -#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) - if ( _ISR_Nest_level == 0 ) { - /* Install irq stack */ - _old_stack_ptr = stack_ptr; - stack_ptr = _CPU_Interrupt_stack_high; - } -#endif - - _ISR_Nest_level++; - - /* leave it to the ISR to decide if they get reenabled */ - _CPU_ISR_Enable( level ); - - /* call isp */ - if ( _ISR_Vector_table[ vector] ) - (*_ISR_Vector_table[ vector ])( - vector, isr_sp - sizeof(CPU_Interrupt_frame) + 1 ); - - _CPU_ISR_Disable( level ); - - _ISR_Nest_level--; - -#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) - if ( _ISR_Nest_level == 0 ) /* restore old stack pointer */ - stack_ptr = _old_stack_ptr; -#endif - - _Thread_Dispatch_disable_level--; - - _CPU_ISR_Enable( level ); - - if ( _ISR_Nest_level ) - return; - - if ( _Thread_Dispatch_disable_level ) { - _ISR_Signals_to_thread_executing = FALSE; - return; - } - - if ( _Context_Switch_necessary || _ISR_Signals_to_thread_executing ) { - _ISR_Signals_to_thread_executing = FALSE; - _ISR_Thread_Dispatch(); - /*_Thread_Running->Registers.register_rets = current_thread_pc;*/ - } -} - -uint32_t SIC_IAR_Value ( uint8_t Vector ) -{ - switch ( Vector ){ - case 7: - return 0x00000000; - case 8: - return 0x11111111; - case 9: - return 0x22222222; - case 10: - return 0x33333333; - case 11: - return 0x44444444; - case 12: - return 0x55555555; - case 13: - return 0x66666666; - case 14: - return 0x77777777; - case 15: - return 0x88888888; - } -} - -#endif /* 0 */ - |