From de8174fef5758fae219b2622e786f589640bfdb2 Mon Sep 17 00:00:00 2001
From: Till Straumann <strauman@slac.stanford.edu>
Date: Wed, 13 Dec 2006 20:50:20 +0000
Subject: 2006-12-13	Till Straumann <strauman@slac.stanford.edu>

	* shared/vme/vmeconfig.c, shared/vme/vme_universe.c:
	use symbolic flag instead of numerical value
	(vmeUniverseInstallIrqMgrAlt()). Define __INSIDE_RTEMS_BSP__
	before including <bsp/vmeUniverse.h>
---
 c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h    | 7 +++++--
 c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h b/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h
index 4633f806e1..4da214b138 100644
--- a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h
+++ b/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h
@@ -81,7 +81,7 @@ const struct _int_map  *bspmap;									\
 		}														\
 		pins[4] = -1;											\
 		if ( 0 == vmeUniverseInstallIrqMgrAlt(					\
-				1, /* shared IRQs */							\
+				VMEUNIVERSE_IRQ_MGR_FLAG_SHARED, /* shared IRQs */\
 				pins[0], names[0],								\
 				pins[1], names[1],								\
 				pins[2], names[2],								\
@@ -94,7 +94,10 @@ const struct _int_map  *bspmap;									\
 	}															\
     }															\
 	if ( i >= 0 )												\
-  	  vmeUniverseInstallIrqMgrAlt(1,0,-1,-1);					\
+  	  vmeUniverseInstallIrqMgrAlt(								\
+	  			VMEUNIVERSE_IRQ_MGR_FLAG_SHARED,				\
+				0,-1,											\
+				-1);											\
   }																\
 } while (0)
 
diff --git a/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c b/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c
index 6a91f99d66..34ea7ebf52 100644
--- a/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c
+++ b/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c
@@ -5,6 +5,7 @@
 #include <bsp/VME.h>
 #include <bsp/VMEConfig.h>
 #include <bsp/irq.h>
+#define __INSIDE_RTEMS_BSP__
 #include <bsp/vmeUniverse.h>
 
 /* Wrap BSP VME calls around driver calls - we do this so EPICS doesn't have to
@@ -110,7 +111,7 @@ int BSP_VMEIrqMgrInstall()
 #ifndef BSP_VME_UNIVERSE_INSTALL_IRQ_MGR
   /* No map; use first line only and obtain PIC wire from PCI config */
   vmeUniverseInstallIrqMgrAlt(
-	1,		/* use shared IRQs */
+	VMEUNIVERSE_IRQ_MGR_FLAG_SHARED, /* use shared IRQs */
 	0, -1,	/* Universe pin0 -> PIC line from config space */
 	-1      /* terminate list  */
   );
-- 
cgit v1.2.3