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). --- c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in | 2 +- c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c | 2 +- c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c | 33 ++++++++++++++++++++++++ c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c | 2 +- c/src/lib/libbsp/unix/posix/shmsupp/intr.c | 33 ------------------------ c/src/lib/libbsp/unix/posix/shmsupp/lock.c | 2 +- c/src/lib/libbsp/unix/posix/shmsupp/mpisr.c | 2 +- c/src/lib/libbsp/unix/posix/wrapup/Makefile.in | 2 +- 8 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c delete mode 100644 c/src/lib/libbsp/unix/posix/shmsupp/intr.c (limited to 'c/src/lib/libbsp/unix') diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in b/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in index c8eb097608..7734daacd6 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/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/unix/posix/shmsupp/addrconv.c b/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c index 120ec7eccf..a3d4a8ff49 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c +++ b/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c @@ -19,7 +19,7 @@ */ #include -#include +#include void *Shm_Convert_address( void *addr diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c b/c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c new file mode 100644 index 0000000000..39e98c96b0 --- /dev/null +++ b/c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c @@ -0,0 +1,33 @@ +/* void Shm_interrupt_unix( 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 /* pid_t */ + +void Shm_Cause_interrupt_unix( + rtems_unsigned32 node +) +{ + Shm_Interrupt_information *intr; + intr = &Shm_Interrupt_table[node]; + + _CPU_SHM_Send_interrupt( (pid_t) intr->address, intr->value ); +} diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c b/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c index 03477883e0..bc0d1c279d 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c +++ b/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c @@ -25,7 +25,7 @@ */ #include -#include +#include #include /* pid_t */ shm_config_table BSP_shm_cfgtbl; diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/intr.c b/c/src/lib/libbsp/unix/posix/shmsupp/intr.c deleted file mode 100644 index 6baf56201d..0000000000 --- a/c/src/lib/libbsp/unix/posix/shmsupp/intr.c +++ /dev/null @@ -1,33 +0,0 @@ -/* void Shm_interrupt_unix( 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 /* pid_t */ - -void Shm_Cause_interrupt_unix( - rtems_unsigned32 node -) -{ - Shm_Interrupt_information *intr; - intr = &Shm_Interrupt_table[node]; - - _CPU_SHM_Send_interrupt( (pid_t) intr->address, intr->value ); -} diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/lock.c b/c/src/lib/libbsp/unix/posix/shmsupp/lock.c index 00e9c6f3d9..dc3a61df5f 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/lock.c +++ b/c/src/lib/libbsp/unix/posix/shmsupp/lock.c @@ -17,7 +17,7 @@ */ #include -#include +#include /* * Shm_Initialize_lock diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/mpisr.c b/c/src/lib/libbsp/unix/posix/shmsupp/mpisr.c index a6e892863c..3838cdb98f 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/mpisr.c +++ b/c/src/lib/libbsp/unix/posix/shmsupp/mpisr.c @@ -18,7 +18,7 @@ */ #include -#include +#include void Shm_setvec( void ) { diff --git a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in b/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in index 5f3f83cec2..f0260c8036 100644 --- a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in @@ -27,7 +27,7 @@ BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) CPU_PIECES = GENERIC_MP_REL_PIECES_yes_V = shmdr -GENERIC_MP_REL_PIECES = $(GENERIC_MP_REL_$(HAS_MP)_V) +GENERIC_MP_REL_PIECES = $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) GENERIC_PIECES = $(GENERIC_MP_REL_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x -- cgit v1.2.3