From 11290355c9454c575d56c7928a725fd95e88d6f8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 29 Sep 1995 17:19:16 +0000 Subject: all targets compile .. tony's patches in place --- c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h | 5 ++--- c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/getcfg.c | 6 ++---- c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c | 26 ++++++----------------- c/src/lib/libbsp/hppa1.1/simhppa/startup/setvec.c | 6 +++--- c/src/lib/libbsp/m68k/gen68302/startup/linkcmds | 1 + c/src/lib/libbsp/shmdr/dump.c | 1 - c/src/lib/libbsp/shmdr/fatal.c | 4 +++- c/src/lib/libbsp/shmdr/getlq.c | 2 ++ c/src/lib/libbsp/shmdr/shm.h | 6 +++++- c/src/lib/libbsp/shmdr/shm_driver.h | 6 +++++- c/src/lib/libbsp/unix/posix/include/bsp.h | 1 - c/src/lib/libbsp/unix/posix/startup/bspstart.c | 5 +++++ c/src/lib/libbsp/unix/posix/startup/setvec.c | 12 ----------- 13 files changed, 34 insertions(+), 47 deletions(-) (limited to 'c/src/lib/libbsp') 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 #include #include -#include /* * 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 #include -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 diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds index d6d53569f3..427adb0cd4 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds @@ -19,6 +19,7 @@ MEMORY } m302 = 0xf7f000; +_VBR = 0x000000; /* location of the VBR table (in RAM) */ SECTIONS { diff --git a/c/src/lib/libbsp/shmdr/dump.c b/c/src/lib/libbsp/shmdr/dump.c index e028ab4204..dc02961138 100644 --- a/c/src/lib/libbsp/shmdr/dump.c +++ b/c/src/lib/libbsp/shmdr/dump.c @@ -19,7 +19,6 @@ #include #include -#include #include "shm.h" diff --git a/c/src/lib/libbsp/shmdr/fatal.c b/c/src/lib/libbsp/shmdr/fatal.c index fc1e9f8624..b36ff8da41 100644 --- a/c/src/lib/libbsp/shmdr/fatal.c +++ b/c/src/lib/libbsp/shmdr/fatal.c @@ -22,7 +22,9 @@ #include "shm.h" void MPCI_Fatal( - rtems_unsigned32 error + Internal_errors_Source source, + boolean is_internal, + rtems_unsigned32 error ) { /* Eventually need to attempt to broadcast a K_FATAL message diff --git a/c/src/lib/libbsp/shmdr/getlq.c b/c/src/lib/libbsp/shmdr/getlq.c index 180c33ef00..ebc5bed8b6 100644 --- a/c/src/lib/libbsp/shmdr/getlq.c +++ b/c/src/lib/libbsp/shmdr/getlq.c @@ -33,6 +33,7 @@ Shm_Envelope_control *Shm_Locked_queue_Get( tmp_ecb = NULL; Shm_Lock( lq_cb ); + tmpfront = Shm_Convert(lq_cb->front); if ( tmpfront != Shm_Locked_queue_End_of_list ) { tmp_ecb = &Shm_Envelopes[ tmpfront ]; @@ -41,6 +42,7 @@ Shm_Envelope_control *Shm_Locked_queue_Get( lq_cb->rear = Shm_Locked_queue_End_of_list; tmp_ecb->next = Shm_Locked_queue_Not_on_list; } + Shm_Unlock( lq_cb ); return( tmp_ecb ); } diff --git a/c/src/lib/libbsp/shmdr/shm.h b/c/src/lib/libbsp/shmdr/shm.h index 5ccb0aab6b..f4671dde97 100644 --- a/c/src/lib/libbsp/shmdr/shm.h +++ b/c/src/lib/libbsp/shmdr/shm.h @@ -470,7 +470,11 @@ void Shm_Locked_queue_Initialize( /* portable routines */ void Init_env_pool(); void Shm_Print_statistics( void ); -void MPCI_Fatal( rtems_unsigned32 ); +void MPCI_Fatal( + Internal_errors_Source source, + boolean is_internal, + rtems_unsigned32 error + ); rtems_task Shm_Cause_interrupt( rtems_unsigned32 ); void Shm_Poll(); void Shm_setclockvec(); diff --git a/c/src/lib/libbsp/shmdr/shm_driver.h b/c/src/lib/libbsp/shmdr/shm_driver.h index 5ccb0aab6b..f4671dde97 100644 --- a/c/src/lib/libbsp/shmdr/shm_driver.h +++ b/c/src/lib/libbsp/shmdr/shm_driver.h @@ -470,7 +470,11 @@ void Shm_Locked_queue_Initialize( /* portable routines */ void Init_env_pool(); void Shm_Print_statistics( void ); -void MPCI_Fatal( rtems_unsigned32 ); +void MPCI_Fatal( + Internal_errors_Source source, + boolean is_internal, + rtems_unsigned32 error + ); rtems_task Shm_Cause_interrupt( rtems_unsigned32 ); void Shm_Poll(); void Shm_setclockvec(); diff --git a/c/src/lib/libbsp/unix/posix/include/bsp.h b/c/src/lib/libbsp/unix/posix/include/bsp.h index 0b3556c80f..4b9cf3f837 100644 --- a/c/src/lib/libbsp/unix/posix/include/bsp.h +++ b/c/src/lib/libbsp/unix/posix/include/bsp.h @@ -24,7 +24,6 @@ extern "C" { #include #include #include -#include /* * Define the time limits for RTEMS Test Suite test durations. diff --git a/c/src/lib/libbsp/unix/posix/startup/bspstart.c b/c/src/lib/libbsp/unix/posix/startup/bspstart.c index f948d5a038..8ce3e92ecb 100644 --- a/c/src/lib/libbsp/unix/posix/startup/bspstart.c +++ b/c/src/lib/libbsp/unix/posix/startup/bspstart.c @@ -195,6 +195,11 @@ bsp_postdriver_hook(void) if ((stdin_fd != 0) || (stdout_fd != 1) || (stderr_fd != 2)) rtems_fatal_error_occurred('STIO'); #endif + +#if defined(MALLOC_STATS) + atexit(malloc_dump); +#endif + } /* diff --git a/c/src/lib/libbsp/unix/posix/startup/setvec.c b/c/src/lib/libbsp/unix/posix/startup/setvec.c index 6be1e50555..9825faa19b 100644 --- a/c/src/lib/libbsp/unix/posix/startup/setvec.c +++ b/c/src/lib/libbsp/unix/posix/startup/setvec.c @@ -8,8 +8,6 @@ * type - 0 indicates raw hardware connect * 1 indicates RTEMS interrupt connect * - * NOTE 'type' is ignored on hppa; all interrupts are owned by RTEMS - * * RETURNS: * address of previous interrupt handler * @@ -26,16 +24,6 @@ #include -/* - * Install an interrupt handler in the right place - * given its vector number from cpu/hppa.h - * There are 2 places an interrupt can be installed - * _ISR_Vector_table - * bsp interrupt XXX: nyi - * - * We decide which based on the vector number - */ - rtems_isr_entry set_vector( /* returns old vector */ rtems_isr_entry handler, /* isr routine */ -- cgit v1.2.3