diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-30 19:58:02 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-30 19:58:02 +0000 |
| commit | 48bfd9925727e46aada26c40c967a5ad57d98919 (patch) | |
| tree | 1194fe547c22d35075005c721d6d9ae015fbe24d /c/src/lib/libbsp/hppa1.1/simhppa/shmsupp | |
| parent | Removed duplicate definition of rtems_filesystem_umask. (diff) | |
| download | rtems-48bfd9925727e46aada26c40c967a5ad57d98919.tar.bz2 | |
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).
Diffstat (limited to 'c/src/lib/libbsp/hppa1.1/simhppa/shmsupp')
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/addrconv.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/cause_intr.c (renamed from c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c) | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/getcfg.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/lock.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/mpisr.c | 2 |
6 files changed, 6 insertions, 6 deletions
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 <bsp.h> -#include <shm.h> +shm_driverinclude <shm_driver.h> void *Shm_Convert_address( void *address diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/cause_intr.c index 7ea7934e47..4320900d1b 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/intr.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/cause_intr.c @@ -23,7 +23,7 @@ #include <rtems.h> #include <rtems/error.h> -#include <shm.h> +#include <shm_driver.h> void Shm_Cause_interrupt_pxfl( rtems_unsigned32 node 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 <bsp.h> -#include <shm.h> +#include <shm_driver.h> #define INTERRUPT 0 /* can be interrupt or polling */ #define POLLING 1 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 <bsp.h> -#include <shm.h> +#include <shm_driver.h> /* * 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 <bsp.h> -#include <shm.h> +#include <shm_driver.h> void Shm_setvec( void ) { |