From 48bfd9925727e46aada26c40c967a5ad57d98919 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 30 Nov 1999 19:58:02 +0000 Subject: Renamed shm.h to shm_driver.h to avoid conflicts with POSIX shm.h. Renamed file shmsupp/intr.c in some BSPs to shmsupp/cause_intr.c to avoid conflict with rtems/src/intr.c (Classic API Interrupt Manager). --- .../lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in | 2 +- .../lib/libbsp/hppa1.1/simhppa/shmsupp/addrconv.c | 2 +- .../libbsp/hppa1.1/simhppa/shmsupp/cause_intr.c | 50 ++++++++++++++++++++++ c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/getcfg.c | 2 +- c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c | 50 ---------------------- c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/lock.c | 2 +- c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/mpisr.c | 2 +- 7 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/cause_intr.c delete mode 100644 c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c (limited to 'c/src/lib/libbsp/hppa1.1/simhppa/shmsupp') diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in index acef5321df..941a07d48d 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in @@ -16,7 +16,7 @@ VPATH = @srcdir@ PGM = ${ARCH}/shmsupp.rel # C source names, if any, go here -- minus the .c -C_PIECES = addrconv getcfg intr lock mpisr +C_PIECES = addrconv getcfg cause_intr lock mpisr C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/addrconv.c b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/addrconv.c index e0d74544ad..49a70be604 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/addrconv.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/addrconv.c @@ -19,7 +19,7 @@ */ #include -#include +shm_driverinclude void *Shm_Convert_address( void *address diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/cause_intr.c b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/cause_intr.c new file mode 100644 index 0000000000..4320900d1b --- /dev/null +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/cause_intr.c @@ -0,0 +1,50 @@ +/* void Shm_Cause_interrupt_pxfl( node ) + * + * This routine is the shared memory driver routine which + * generates interrupts to other CPUs. + * + * Input parameters: + * node - destination of this packet (0 = broadcast) + * + * Output parameters: NONE + * + * COPYRIGHT (c) 1989-1999. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.OARcorp.com/rtems/license.html. + * + * $Id$ + */ + +#include + +#include +#include + +#include + +void Shm_Cause_interrupt_pxfl( + rtems_unsigned32 node +) +{ + Shm_Interrupt_information *intr; + rtems_unsigned32 *u32; + rtems_unsigned32 value; + + intr = &Shm_Interrupt_table[node]; + value = intr->value; + + switch ( intr->length ) { + case NO_INTERRUPT: + 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" ); + } +} 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 897d5af8e6..f1f4adfe4e 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/getcfg.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/getcfg.c @@ -35,7 +35,7 @@ #include -#include +#include #define INTERRUPT 0 /* can be interrupt or polling */ #define POLLING 1 diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c deleted file mode 100644 index 7ea7934e47..0000000000 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c +++ /dev/null @@ -1,50 +0,0 @@ -/* void Shm_Cause_interrupt_pxfl( node ) - * - * This routine is the shared memory driver routine which - * generates interrupts to other CPUs. - * - * Input parameters: - * node - destination of this packet (0 = broadcast) - * - * Output parameters: NONE - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include - -#include -#include - -#include - -void Shm_Cause_interrupt_pxfl( - rtems_unsigned32 node -) -{ - Shm_Interrupt_information *intr; - rtems_unsigned32 *u32; - rtems_unsigned32 value; - - intr = &Shm_Interrupt_table[node]; - value = intr->value; - - switch ( intr->length ) { - case NO_INTERRUPT: - 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" ); - } -} diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/lock.c b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/lock.c index e682a18397..a150c1d3be 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/lock.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/lock.c @@ -17,7 +17,7 @@ */ #include -#include +#include /* * Shm_Initialize_lock diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/mpisr.c b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/mpisr.c index 48da668b21..d962221f0d 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/mpisr.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/mpisr.c @@ -18,7 +18,7 @@ */ #include -#include +#include void Shm_setvec( void ) { -- cgit v1.2.3