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/m68k/mvme147s | |
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/m68k/mvme147s')
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/shmsupp/addrconv.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/shmsupp/getcfg.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/shmsupp/lock.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/shmsupp/mpisr.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/addrconv.c b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/addrconv.c index d4756c3b0d..e26111c8c3 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/addrconv.c +++ b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/addrconv.c @@ -25,7 +25,7 @@ #include <rtems.h> #include <bsp.h> -#include <shm.h> +#include <shm_driver.h> void *Shm_Convert_address( void *address diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/getcfg.c b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/getcfg.c index 66105fc153..bfe0cc5d52 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/getcfg.c +++ b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/getcfg.c @@ -29,7 +29,7 @@ #include <bsp.h> #include <rtems.h> -#include "shm.h" +#include "shm_driver.h" #define INTERRUPT 1 /* MVME147 target supports both */ #define POLLING 0 /* polling and interrupt modes */ diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/lock.c b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/lock.c index 6917d3fc22..63729ca771 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/lock.c +++ b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/lock.c @@ -18,7 +18,7 @@ #include <rtems.h> #include <bsp.h> -#include <shm.h> +#include <shm_driver.h> /* * Shm_Initialize_lock diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/mpisr.c b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/mpisr.c index 8bad4c53d8..e473bb22fb 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/mpisr.c +++ b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/mpisr.c @@ -19,7 +19,7 @@ #include <rtems.h> #include <bsp.h> -#include <shm.h> +#include <shm_driver.h> rtems_isr Shm_isr_mvme147() { |