From 9a30162d5a425e40b49dd869784c18bb8fbf1f81 Mon Sep 17 00:00:00 2001
From: Till Straumann <strauman@slac.stanford.edu>
Date: Mon, 19 Jun 2006 20:34:07 +0000
Subject: 	Added address-modifier codes for BLT/MBLT.

---
 c/src/lib/libbsp/shared/ChangeLog                 |  5 +++
 c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h | 40 ++++++++++++++++++-----
 2 files changed, 37 insertions(+), 8 deletions(-)

(limited to 'c/src/lib/libbsp/shared')

diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog
index 14587e1e18..ec8d8141d8 100644
--- a/c/src/lib/libbsp/shared/ChangeLog
+++ b/c/src/lib/libbsp/shared/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-19	Till Straumann <strauman@slac.stanford.edu>
+
+	* vmeUniverse/vme_amd_defs.h: Added address-modifier
+	codes for BLT/MBLT.
+
 2006-02-01	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* gnatinstallhandler.c: Rename since old name is now used
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h b/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h
index 34fde7625e..c822ae086f 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h
@@ -3,12 +3,21 @@
 
 /* vxworks compatible addressing modes */
 
+#ifndef VME_AM_STD_SUP_BLT
+#define	VME_AM_STD_SUP_BLT			0x3f
+#endif
 #ifndef VME_AM_STD_SUP_ASCENDING
 #define	VME_AM_STD_SUP_ASCENDING	0x3f
 #endif
 #ifndef VME_AM_STD_SUP_PGM
 #define	VME_AM_STD_SUP_PGM			0x3e
 #endif
+#ifndef VME_AM_STD_SUP_MBLT
+#define	VME_AM_STD_SUP_MBLT			0x3c
+#endif
+#ifndef VME_AM_STD_USR_BLT
+#define	VME_AM_STD_USR_BLT			0x3b
+#endif
 #ifndef VME_AM_STD_USR_ASCENDING
 #define	VME_AM_STD_USR_ASCENDING	0x3b
 #endif
@@ -21,24 +30,39 @@
 #ifndef VME_AM_STD_USR_DATA
 #define	VME_AM_STD_USR_DATA			0x39
 #endif
+#ifndef VME_AM_STD_USR_MBLT
+#define	VME_AM_STD_USR_MBLT			0x38
+#endif
+#ifndef VME_AM_EXT_SUP_BLT
+#define	VME_AM_EXT_SUP_BLT			0x0f
+#endif
 #ifndef VME_AM_EXT_SUP_ASCENDING
 #define	VME_AM_EXT_SUP_ASCENDING	0x0f
 #endif
 #ifndef VME_AM_EXT_SUP_PGM
 #define	VME_AM_EXT_SUP_PGM			0x0e
 #endif
+#ifndef VME_AM_EXT_SUP_DATA
+#define	VME_AM_EXT_SUP_DATA			0x0d
+#endif
+#ifndef VME_AM_EXT_SUP_MBLT
+#define	VME_AM_EXT_SUP_MBLT			0x0c
+#endif
+#ifndef VME_AM_EXT_USR_BLT
+#define	VME_AM_EXT_USR_BLT			0x0b
+#endif
 #ifndef VME_AM_EXT_USR_ASCENDING
 #define	VME_AM_EXT_USR_ASCENDING	0x0b
 #endif
 #ifndef VME_AM_EXT_USR_PGM
 #define	VME_AM_EXT_USR_PGM			0x0a
 #endif
-#ifndef VME_AM_EXT_SUP_DATA
-#define	VME_AM_EXT_SUP_DATA			0x0d
-#endif
 #ifndef VME_AM_EXT_USR_DATA
 #define	VME_AM_EXT_USR_DATA			0x09
 #endif
+#ifndef VME_AM_EXT_USR_MBLT
+#define	VME_AM_EXT_USR_MBLT			0x08
+#endif
 #ifndef VME_AM_CSR
 #define VME_AM_CSR					0x2f
 #endif
@@ -49,13 +73,13 @@
 #define	VME_AM_USR_SHORT_IO			0x29
 #endif
 #ifndef VME_AM_IS_SHORT
-#define VME_AM_IS_SHORT(a)			(((a) & 0xf0) == 0x20)
+#define VME_AM_IS_SHORT(a)			(((a) & 0x30) == 0x20)
 #endif
 #ifndef VME_AM_IS_STD
-#define VME_AM_IS_STD(a)			(((a) & 0xf0) == 0x30)
+#define VME_AM_IS_STD(a)			(((a) & 0x30) == 0x30)
 #endif
 #ifndef VME_AM_IS_EXT
-#define VME_AM_IS_EXT(a)			(((a) & 0xf0) == 0x00)
+#define VME_AM_IS_EXT(a)			(((a) & 0x30) == 0x00)
 #endif
 #ifndef VME_AM_IS_SUP
 #define VME_AM_IS_SUP(a)			((a)  & 4)
@@ -64,10 +88,10 @@
 /* Mask for standard address modifiers */
 
 #ifndef VME_AM_MASK
-#define VME_AM_MASK					0xff
+#define VME_AM_MASK					0x3f
 #endif
 
-/* Hint that the a window is mapping memory; the 
+/* Hint that a window is mapping memory; the 
  * driver may assume it to be safe to enable decoupled
  * cycles, caching and the like...
  */
-- 
cgit v1.2.3