diff options
Diffstat (limited to 'c/src/lib/libbsp/hppa1.1')
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/getcfg.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c | 26 | ||||
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/startup/setvec.c | 6 |
4 files changed, 13 insertions, 30 deletions
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h index 8bf036b22e..1f68dea214 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h +++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h @@ -13,8 +13,8 @@ * $Id$ */ -#ifndef __SIMHPPA_h -#define __SIMHPPA_h +#ifndef __PXFL_BSP_h +#define __PXFL_BSP_h #ifdef __cplusplus extern "C" { @@ -23,7 +23,6 @@ extern "C" { #include <rtems.h> #include <clockdrv.h> #include <rtems/ttydrv.h> -#include <libcsupport.h> /* * Define the time limits for RTEMS Test Suite test durations. diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/getcfg.c b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/getcfg.c index 43052e223d..f2cd34d219 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/getcfg.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/getcfg.c @@ -52,9 +52,7 @@ shm_config_table BSP_shm_cfgtbl; -void Shm_Cause_interrupt_simhppa( - rtems_unsigned32 node -); +void Shm_Cause_interrupt_pxfl( rtems_unsigned32 node ); void Shm_Get_configuration( rtems_unsigned32 localnode, @@ -65,7 +63,7 @@ void Shm_Get_configuration( BSP_shm_cfgtbl.length = 16 * KILOBYTE; BSP_shm_cfgtbl.format = SHM_BIG; - BSP_shm_cfgtbl.cause_intr = Shm_Cause_interrupt_simhppa; + BSP_shm_cfgtbl.cause_intr = Shm_Cause_interrupt_pxfl; #ifdef NEUTRAL_BIG BSP_shm_cfgtbl.convert = NULL_CONVERT; diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c index 50166b2b8e..fcd14428e1 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c @@ -1,4 +1,4 @@ -/* void Shm_Cause_interrupt_simhppa( node ) +/* void Shm_Cause_interrupt_pxfl( node ) * * This routine is the shared memory driver routine which * generates interrupts to other CPUs. @@ -24,13 +24,11 @@ #include <rtems.h> #include <shm.h> -void Shm_Cause_interrupt_simhppa( +void Shm_Cause_interrupt_pxfl( rtems_unsigned32 node ) { Shm_Interrupt_information *intr; - rtems_unsigned8 *u8; - rtems_unsigned16 *u16; rtems_unsigned32 *u32; rtems_unsigned32 value; @@ -40,25 +38,13 @@ void Shm_Cause_interrupt_simhppa( switch ( intr->length ) { case NO_INTERRUPT: break; - case BYTE: - u8 = (rtems_unsigned8 *)intr->address; - fprintf( - stderr, - "Shm_Cause_interrupt_simhppa: Writes of unsigned8 not supported!!!\n" - ); - rtems_shutdown_executive( 0 ); - break; - case WORD: - u16 = (rtems_unsigned16 *)intr->address; - fprintf( - stderr, - "Shm_Cause_interrupt_simhppa: Writes of unsigned8 not supported!!!\n" - ); - rtems_shutdown_executive( 0 ); - break; case LONG: u32 = (rtems_unsigned32 *)intr->address; HPPA_ASM_STWAS( value, 0, u32 ); break; + default: + fprintf( stderr, "Shm_Cause_interrupt_pxfl: Unsupported length!!!\n" ); + rtems_shutdown_executive( 0 ); + break; } } diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/setvec.c b/c/src/lib/libbsp/hppa1.1/simhppa/startup/setvec.c index e711b64fb2..9d2aa5de73 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/setvec.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/setvec.c @@ -55,9 +55,9 @@ set_vector( /* returns old vector */ else if ((vector >= HPPA_INTERRUPT_BSP_BASE) && (vector < (HPPA_INTERRUPT_BSP_BASE + HPPA_BSP_INTERRUPTS))) { - simhppa_interrupt_install(handler, - vector - HPPA_INTERRUPT_BSP_BASE, - (rtems_isr_entry *) &previous_isr); + pxfl_interrupt_install(handler, + vector - HPPA_INTERRUPT_BSP_BASE, + (rtems_isr_entry *) &previous_isr); } #endif |