diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-07 15:49:23 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-07 15:49:23 +0000 |
commit | 9345c7d1987c206955cc8a1ac9f199cdf61ebc3e (patch) | |
tree | 1bf6b42682c882a221238639f00297dd945f867f | |
parent | 2009-08-07 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-9345c7d1987c206955cc8a1ac9f199cdf61ebc3e.tar.bz2 |
2009-08-07 Joel Sherrill <joel.sherrill@oarcorp.com>
* console/console.c, startup/genpvec.c, startup/setvec.c: Disable call
to rtems_interrupt_catch until it is fixed. Need to disabled
set_vector.
4 files changed, 11 insertions, 27 deletions
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 2423eaba7e..7909bcee61 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,9 @@ +2009-08-07 Joel Sherrill <joel.sherrill@oarcorp.com> + + * console/console.c, startup/genpvec.c, startup/setvec.c: Disable call + to rtems_interrupt_catch until it is fixed. Need to disabled + set_vector. + 2009-07-16 Joel Sherrill <joel.sherrill@oarcorp.com> * configure.ac: Rename BSP_BOOTCARD_OPTIONS to diff --git a/c/src/lib/libbsp/powerpc/score603e/console/console.c b/c/src/lib/libbsp/powerpc/score603e/console/console.c index cdb2163e73..60baac3bb5 100644 --- a/c/src/lib/libbsp/powerpc/score603e/console/console.c +++ b/c/src/lib/libbsp/powerpc/score603e/console/console.c @@ -154,6 +154,7 @@ void console_initialize_interrupts( void ) */ for (i=0; i < NUM_Z85C30_CHIPS; i++) set_vector( console_isr, Chips_85C30[i].vector, 1 ); + #warning "Install interrupts using proper method for PIC vectors." atexit( console_exit ); diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c b/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c index 6648f3a307..f3598a8982 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c @@ -51,33 +51,6 @@ typedef struct /* XXX */ void init_irq_data_register(void); -#if 0 -void initialize_external_exception_vector (void) -{ - int i; - rtems_isr_entry previous_isr; - rtems_status_code status; - - Nodes_Used = 0; - - /* - * Mask out all interupts until they have a handler installed. - */ - - for (i=0; i <NUM_LIRQ; i++) - rtems_chain_initialize_empty( &ISR_Array[i] ); - - init_irq_data_register(); - - /* - * Install external_exception_ISR () as the handler for - * the General Purpose Interrupt. - */ - status = rtems_interrupt_catch( external_exception_ISR, - PPC_IRQ_EXTERNAL, (rtems_isr_entry *) &previous_isr ); -} -#endif - void Init_EE_mask_init(void) { } diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/setvec.c b/c/src/lib/libbsp/powerpc/score603e/startup/setvec.c index 768d900fbe..6bb3138208 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/setvec.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/setvec.c @@ -35,8 +35,12 @@ rtems_isr_entry set_vector( /* returns old vector */ set_EE_vector( handler, vector ); } else { + ; + #if 0 status = rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr ); + #endif + #warning "Remove this whole method." } return previous_isr; } |