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).

17 files changed, 19 insertions, 19 deletions

diff --git a/c/src/libchip/shmdr/addlq.c b/c/src/libchip/shmdr/addlq.c
index 7434baa688..141b98796e 100644
--- a/c/src/libchip/shmdr/addlq.c
+++ b/c/src/libchip/shmdr/addlq.c
@@ -19,7 +19,7 @@
  */
 
 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
 
 void Shm_Locked_queue_Add(
   Shm_Locked_queue_Control *lq_cb,
diff --git a/c/src/libchip/shmdr/cnvpkt.c b/c/src/libchip/shmdr/cnvpkt.c
index 66dc92a172..616bbad8e7 100644
--- a/c/src/libchip/shmdr/cnvpkt.c
+++ b/c/src/libchip/shmdr/cnvpkt.c
@@ -24,7 +24,7 @@
  */
 
 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
 
 void Shm_Convert_packet(
   rtems_packet_prefix *packet
diff --git a/c/src/libchip/shmdr/dump.c b/c/src/libchip/shmdr/dump.c
index 7b6850083f..10e8e6dbd7 100644
--- a/c/src/libchip/shmdr/dump.c
+++ b/c/src/libchip/shmdr/dump.c
@@ -19,7 +19,7 @@
 #include <rtems.h>
 #include <stdio.h>
 
-#include "shm.h"
+#include "shm_driver.h"
 
 void
 Shm_Print_statistics(void)
diff --git a/c/src/libchip/shmdr/fatal.c b/c/src/libchip/shmdr/fatal.c
index 6a085ea934..340c65e59e 100644
--- a/c/src/libchip/shmdr/fatal.c
+++ b/c/src/libchip/shmdr/fatal.c
@@ -18,7 +18,7 @@
  */
 
 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
 
 void MPCI_Fatal(
   Internal_errors_Source  source,
diff --git a/c/src/libchip/shmdr/getlq.c b/c/src/libchip/shmdr/getlq.c
index 9ec31c9605..199721b9ab 100644
--- a/c/src/libchip/shmdr/getlq.c
+++ b/c/src/libchip/shmdr/getlq.c
@@ -21,7 +21,7 @@
  */
 
 #include <rtems.h>
-#include <shm.h>
+#include <shm_driver.h>
 
 Shm_Envelope_control *Shm_Locked_queue_Get(
   Shm_Locked_queue_Control *lq_cb
diff --git a/c/src/libchip/shmdr/getpkt.c b/c/src/libchip/shmdr/getpkt.c
index 149bbe75e5..9ed8e42a46 100644
--- a/c/src/libchip/shmdr/getpkt.c
+++ b/c/src/libchip/shmdr/getpkt.c
@@ -20,7 +20,7 @@
  */
 
 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
 
 rtems_mpci_entry Shm_Get_packet(
   rtems_packet_prefix **packet
diff --git a/c/src/libchip/shmdr/init.c b/c/src/libchip/shmdr/init.c
index 71350fa3d2..b4ca93a08a 100644
--- a/c/src/libchip/shmdr/init.c
+++ b/c/src/libchip/shmdr/init.c
@@ -20,7 +20,7 @@
 #define _SHM_INIT
 
 #include <rtems.h>
-#include <shm.h>
+#include <shm_driver.h>
 
 #include <string.h>    /* memset() */
 #include <stdlib.h>    /* malloc() */
diff --git a/c/src/libchip/shmdr/initlq.c b/c/src/libchip/shmdr/initlq.c
index e93ce6dd3f..e2e0dd1f8c 100644
--- a/c/src/libchip/shmdr/initlq.c
+++ b/c/src/libchip/shmdr/initlq.c
@@ -20,7 +20,7 @@
  */
 
 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
 
 void Shm_Locked_queue_Initialize(
   Shm_Locked_queue_Control *lq_cb,
diff --git a/c/src/libchip/shmdr/intr.c b/c/src/libchip/shmdr/intr.c
index 3b730459a8..3374919222 100644
--- a/c/src/libchip/shmdr/intr.c
+++ b/c/src/libchip/shmdr/intr.c
@@ -23,7 +23,7 @@
  */
 
 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
 
 void Shm_Cause_interrupt(
   rtems_unsigned32 node
diff --git a/c/src/libchip/shmdr/mpci.h b/c/src/libchip/shmdr/mpci.h
index 3afb4034b7..203c77dbcd 100644
--- a/c/src/libchip/shmdr/mpci.h
+++ b/c/src/libchip/shmdr/mpci.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include <shm.h>
+#include <shm_driver.h>
 
 #define MPCI_Initialization( _configuration ) \
   Shm_Initialization( _configuration )
@@ -38,7 +38,7 @@ extern "C" {
 #define MPCI_Send_packet( _destination, _the_packet ) \
   Shm_Send_packet( _destination, _the_packet )
 
-/* Unnecessary... mapped in shm.h
+/* Unnecessary... mapped in shm_driver.h
 #define MPCI_Fatal( _the_error ) \
   Shm_Fatal( _the_error )
 */
diff --git a/c/src/libchip/shmdr/mpisr.c b/c/src/libchip/shmdr/mpisr.c
index da07e0279f..fc761101cd 100644
--- a/c/src/libchip/shmdr/mpisr.c
+++ b/c/src/libchip/shmdr/mpisr.c
@@ -11,7 +11,7 @@
  */
 
 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
 
 rtems_isr Shm_isr(
   rtems_vector_number vector
diff --git a/c/src/libchip/shmdr/poll.c b/c/src/libchip/shmdr/poll.c
index ec428bb74c..9c3571ae22 100644
--- a/c/src/libchip/shmdr/poll.c
+++ b/c/src/libchip/shmdr/poll.c
@@ -22,7 +22,7 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/libio.h>
 
-#include "shm.h"
+#include "shm_driver.h"
 
 void Shm_Poll()
 {
diff --git a/c/src/libchip/shmdr/receive.c b/c/src/libchip/shmdr/receive.c
index 5b8cd2e9e8..8d1b2349f7 100644
--- a/c/src/libchip/shmdr/receive.c
+++ b/c/src/libchip/shmdr/receive.c
@@ -22,7 +22,7 @@
  */
 
 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
 
 rtems_mpci_entry Shm_Receive_packet(
   rtems_packet_prefix **packet
diff --git a/c/src/libchip/shmdr/retpkt.c b/c/src/libchip/shmdr/retpkt.c
index 027a9a7659..c013916603 100644
--- a/c/src/libchip/shmdr/retpkt.c
+++ b/c/src/libchip/shmdr/retpkt.c
@@ -20,7 +20,7 @@
  */
 
 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
 
 rtems_mpci_entry Shm_Return_packet(
   rtems_packet_prefix *packet
diff --git a/c/src/libchip/shmdr/send.c b/c/src/libchip/shmdr/send.c
index 4ffdd5d905..2e5f60988e 100644
--- a/c/src/libchip/shmdr/send.c
+++ b/c/src/libchip/shmdr/send.c
@@ -22,7 +22,7 @@
  */
 
 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
 
 struct pkt_cpy {
   rtems_unsigned32 packet[MAX_PACKET_SIZE/4];
diff --git a/c/src/libchip/shmdr/setckvec.c b/c/src/libchip/shmdr/setckvec.c
index 770b695903..9be1b48945 100644
--- a/c/src/libchip/shmdr/setckvec.c
+++ b/c/src/libchip/shmdr/setckvec.c
@@ -20,7 +20,7 @@
 #include <rtems.h>
 #include <rtems/libio.h>
 
-#include "shm.h"
+#include "shm_driver.h"
 
 rtems_isr Shm_setclockvec()
 {
diff --git a/c/src/libchip/shmdr/shm_driver.h b/c/src/libchip/shmdr/shm_driver.h
index 2f212fd759..7efc9dbfcb 100644
--- a/c/src/libchip/shmdr/shm_driver.h
+++ b/c/src/libchip/shmdr/shm_driver.h
@@ -1,4 +1,4 @@
-/*  shm.h
+/*  shm_driver.h
  *
  *  This include file contains all the constants, structures,
  *  and global variables for this RTEMS based shared memory
@@ -145,7 +145,7 @@ extern "C" {
 #define SHM_LOCK_VALUE    1
 #define SHM_UNLOCK_VALUE  0
 #else
-#error "shm.h - no SHM_LOCK_VALUE defined for this CPU architecture"
+#error "shm_driver.h - no SHM_LOCK_VALUE defined for this CPU architecture"
 #endif
 
 #define Shm_Convert( value ) \