From 8baeb42d2d1f6e622250e812e771ffef48550738 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 30 Sep 2008 16:23:34 +0000 Subject: 2008-09-30 Joel Sherrill * cpu.c: Fine tune conditional so _CPU_ISR_install_vector is in CPU Kit now. --- cpukit/score/cpu/sh/cpu.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) (limited to 'cpukit/score/cpu/sh/cpu.c') diff --git a/cpukit/score/cpu/sh/cpu.c b/cpukit/score/cpu/sh/cpu.c index bc7ce0a467..cdfb2b12f6 100644 --- a/cpukit/score/cpu/sh/cpu.c +++ b/cpukit/score/cpu/sh/cpu.c @@ -153,7 +153,6 @@ void _CPU_ISR_install_raw_handler( * */ -#if defined(__sh1__) || defined(__sh2__) void _CPU_ISR_install_vector( uint32_t vector, proc_ptr new_handler, @@ -161,32 +160,24 @@ void _CPU_ISR_install_vector( ) { proc_ptr ignored ; -#if 0 - if(( vector <= 113) && ( vector >= 11)) - { -#endif - *old_handler = _ISR_Vector_table[ vector ]; - - /* - * If the interrupt vector table is a table of pointer to isr entry - * points, then we need to install the appropriate RTEMS interrupt - * handler for this vector number. - */ - _CPU_ISR_install_raw_handler(vector, - _Hardware_isr_Table[vector], - &ignored ); - - /* - * We put the actual user ISR address in '_ISR_Vector_table'. - * This will be used by __ISR_Handler so the user gets control. - */ - - _ISR_Vector_table[ vector ] = new_handler; -#if 0 - } + *old_handler = _ISR_Vector_table[ vector ]; + + /* + * If the interrupt vector table is a table of pointer to isr entry + * points, then we need to install the appropriate RTEMS interrupt + * handler for this vector number. + */ +#if defined(__sh1__) || defined(__sh2__) + _CPU_ISR_install_raw_handler(vector, _Hardware_isr_Table[vector], &ignored ); #endif + + /* + * We put the actual user ISR address in '_ISR_Vector_table'. + * This will be used by __ISR_Handler so the user gets control. + */ + + _ISR_Vector_table[ vector ] = new_handler; } -#endif /* _CPU_ISR_install_vector */ /*PAGE * -- cgit v1.2.3