diff options
-rw-r--r-- | cpukit/score/cpu/sh/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/score/cpu/sh/cpu.c | 41 |
2 files changed, 21 insertions, 25 deletions
diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog index 9bcb374902..3ddea8e439 100644 --- a/cpukit/score/cpu/sh/ChangeLog +++ b/cpukit/score/cpu/sh/ChangeLog @@ -1,3 +1,8 @@ +2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com> + + * cpu.c: Fine tune conditional so _CPU_ISR_install_vector is in CPU Kit + now. + 2008-09-25 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am: Move duplicated context switch code to score/cpu. This 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 * |