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).
2026-09-22 12:29:17 +08:00 · 1999-11-30 19:58:02 +00:00
parent 1563d8cc7d
commit 48bfd99257
77 changed files with 80 additions and 621 deletions
@@ -20,7 +20,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 #ifndef lint
 static char _sccsid[] = "@(#)addrconv.c 04/08/96     1.1\n";
@@ -33,7 +33,7 @@ XXX: FIX THE COMMENTS BELOW WHEN THE CPU IS KNOWN

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 #ifndef lint
 static char _sccsid[] = "@(#)getcfg.c 04/08/96     1.1\n";
@@ -18,7 +18,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 #ifndef lint
 static char _sccsid[] = "@(#)lock.c 04/08/96     1.1\n";
@@ -12,7 +12,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 #ifndef lint
 static char _sccsid[] = "@(#)mpisr.c 04/08/96     1.1\n";
@@ -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)

@@ -19,7 +19,7 @@
 */

 #include <bsp.h>
-#include <shm.h>
+shm_driverinclude <shm_driver.h>

 void *Shm_Convert_address(
  void *address
@@ -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
@@ -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
@@ -17,7 +17,7 @@
 */

 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 /*
 *  Shm_Initialize_lock
@@ -18,7 +18,7 @@
 */

 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 void Shm_setvec( void )
 {
@@ -22,7 +22,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include "shm.h"
+#include "shm_driver.h"

 void *Shm_Convert_address(
  void *address
@@ -42,7 +42,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 #define USE_ONBOARD_RAM 0             /* use onboard (1) or VME RAM   */
                                      /*   for SHM communications     */
@@ -18,7 +18,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 /*
 *  Shm_Initialize_lock
@@ -19,7 +19,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include "shm.h"
+#include "shm_driver.h"

 rtems_isr Shm_isr_cvme961(
  rtems_vector_number vector
@@ -23,7 +23,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include "shm.h"
+#include "shm_driver.h"

 void *Shm_Convert_address(
  void *address
@@ -43,7 +43,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 #define USE_ONBOARD_RAM 0             /* use onboard (1) or VME RAM   */
                                      /*   for SHM communications     */
@@ -19,7 +19,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 /*
 *  Shm_Initialize_lock
@@ -19,7 +19,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include "shm.h"
+#include "shm_driver.h"

 rtems_isr Shm_isr_rxgen960(
  rtems_vector_number vector
@@ -21,7 +21,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 void *Shm_Convert_address(
  void *address
@@ -33,7 +33,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 #define INTERRUPT 1                   /* MVME136 target supports both */
 #define POLLING   0                   /* polling and interrupt modes  */
@@ -18,7 +18,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 /*
 *  Shm_Initialize_lock
@@ -15,7 +15,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 rtems_isr Shm_isr_mvme136()
 {
@@ -25,7 +25,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 void *Shm_Convert_address(
  void *address
@@ -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  */
@@ -18,7 +18,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 /*
 *  Shm_Initialize_lock
@@ -19,7 +19,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 rtems_isr Shm_isr_mvme147()
 {
@@ -20,7 +20,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 void *Shm_Convert_address(
  void *address
@@ -33,7 +33,7 @@ XXX: FIX THE COMMENTS BELOW WHEN THE CPU IS KNOWN

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 /*
 *  configured if currently polling of interrupt driven
@@ -18,7 +18,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 /*
 *  Shm_Initialize_lock
@@ -12,7 +12,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 rtems_isr Shm_isr_nobsp( void )
 {
@@ -20,7 +20,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 void *Shm_Convert_address(
  void *address
@@ -23,7 +23,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 #define INTERRUPT 0                   /* PSIM target supports only */
 #define POLLING   1                   /* polling mode. */
@@ -19,7 +19,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>

 typedef volatile unsigned int volint;

@@ -15,7 +15,7 @@

 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>


 /*  void _Shm_setvec( )
@@ -21,7 +21,7 @@ C_PIECES = addlq cnvpkt getlq dump fatal getpkt init initlq intr mpisr poll \
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)

-H_PIECES = shm mpci
+H_PIECES = shm_driver mpci
 H_FILES = $(H_PIECES:%=$(srcdir)/%.h)

 SRCS = $(C_FILES) $(H_FILES)
@@ -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,
@@ -24,7 +24,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 void Shm_Convert_packet(
  rtems_packet_prefix *packet
@@ -19,7 +19,7 @@
 #include <rtems.h>
 #include <stdio.h>

-#include "shm.h"
+#include "shm_driver.h"

 void
 Shm_Print_statistics(void)
@@ -18,7 +18,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 void MPCI_Fatal(
  Internal_errors_Source  source,
@@ -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
@@ -20,7 +20,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 rtems_mpci_entry Shm_Get_packet(
  rtems_packet_prefix **packet
@@ -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() */
@@ -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,
@@ -23,7 +23,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 void Shm_Cause_interrupt(
  rtems_unsigned32 node
@@ -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 )
 */
@@ -11,7 +11,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 rtems_isr Shm_isr(
  rtems_vector_number vector
@@ -22,7 +22,7 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/libio.h>

-#include "shm.h"
+#include "shm_driver.h"

 void Shm_Poll()
 {
@@ -22,7 +22,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 rtems_mpci_entry Shm_Receive_packet(
  rtems_packet_prefix **packet
@@ -20,7 +20,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 rtems_mpci_entry Shm_Return_packet(
  rtems_packet_prefix *packet
@@ -22,7 +22,7 @@
 */

 #include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"

 struct pkt_cpy {
  rtems_unsigned32 packet[MAX_PACKET_SIZE/4];
--- a/Show More
+++ b/Show More