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/i960/cvme961/shmsupp/addrconv.c | 2 +- c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c | 2 +- c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c | 2 +- c/src/lib/libbsp/i960/cvme961/shmsupp/mpisr.c | 2 +- c/src/lib/libbsp/i960/rxgen960/shmsupp/addrconv.c | 2 +- c/src/lib/libbsp/i960/rxgen960/shmsupp/getcfg.c | 2 +- c/src/lib/libbsp/i960/rxgen960/shmsupp/lock.c | 2 +- c/src/lib/libbsp/i960/rxgen960/shmsupp/mpisr.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'c/src/lib/libbsp/i960') diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/addrconv.c b/c/src/lib/libbsp/i960/cvme961/shmsupp/addrconv.c index 953136ede9..5b7f4ec91b 100644 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/addrconv.c +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/addrconv.c @@ -22,7 +22,7 @@ #include #include -#include "shm.h" +#include "shm_driver.h" void *Shm_Convert_address( void *address diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c b/c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c index cb1e7df96c..7aa3b9698f 100644 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c @@ -42,7 +42,7 @@ */ #include -#include "shm.h" +#include "shm_driver.h" #define USE_ONBOARD_RAM 0 /* use onboard (1) or VME RAM */ /* for SHM communications */ diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c b/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c index 95d31254a3..a0fc5af95d 100644 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c @@ -18,7 +18,7 @@ #include #include -#include +#include /* * Shm_Initialize_lock diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/mpisr.c b/c/src/lib/libbsp/i960/cvme961/shmsupp/mpisr.c index cf51bd69d4..0fc8037b1b 100644 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/mpisr.c +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/mpisr.c @@ -19,7 +19,7 @@ #include #include -#include "shm.h" +#include "shm_driver.h" rtems_isr Shm_isr_cvme961( rtems_vector_number vector diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/addrconv.c b/c/src/lib/libbsp/i960/rxgen960/shmsupp/addrconv.c index 86d465c499..6b68ddc60e 100644 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/addrconv.c +++ b/c/src/lib/libbsp/i960/rxgen960/shmsupp/addrconv.c @@ -23,7 +23,7 @@ #include #include -#include "shm.h" +#include "shm_driver.h" void *Shm_Convert_address( void *address diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/getcfg.c b/c/src/lib/libbsp/i960/rxgen960/shmsupp/getcfg.c index aac8d9c52b..3a009aee02 100644 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/getcfg.c +++ b/c/src/lib/libbsp/i960/rxgen960/shmsupp/getcfg.c @@ -43,7 +43,7 @@ */ #include -#include "shm.h" +#include "shm_driver.h" #define USE_ONBOARD_RAM 0 /* use onboard (1) or VME RAM */ /* for SHM communications */ diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/lock.c b/c/src/lib/libbsp/i960/rxgen960/shmsupp/lock.c index f74188a1b3..0a546effe7 100644 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/lock.c +++ b/c/src/lib/libbsp/i960/rxgen960/shmsupp/lock.c @@ -19,7 +19,7 @@ #include #include -#include +#include /* * Shm_Initialize_lock diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/mpisr.c b/c/src/lib/libbsp/i960/rxgen960/shmsupp/mpisr.c index 983d57e54a..308fb57231 100644 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/mpisr.c +++ b/c/src/lib/libbsp/i960/rxgen960/shmsupp/mpisr.c @@ -19,7 +19,7 @@ #include #include -#include "shm.h" +#include "shm_driver.h" rtems_isr Shm_isr_rxgen960( rtems_vector_number vector -- cgit v1.2.3