From de872007b10af7193123961644e0707c6cd0c866 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 20 Oct 1999 22:17:59 +0000
Subject: [PATCH] Tornado II does not allow intConnect with intel compiler

---
 src/vxWorks/db/devLibVxWorks.c | 38 +++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/vxWorks/db/devLibVxWorks.c b/src/vxWorks/db/devLibVxWorks.c
index c9591649b..be0cbe5f1 100644
--- a/src/vxWorks/db/devLibVxWorks.c
+++ b/src/vxWorks/db/devLibVxWorks.c
@@ -190,14 +190,16 @@ long devDisconnectInterruptVME (
  */
 long devEnableInterruptLevelVME (unsigned level)
 {
-	int	s;
-
-	s = sysIntEnable (level);
-	if (s!=OK) {
+#	if CPU_FAMILY != I80X86 
+	    int	s;
+	    s = sysIntEnable (level);
+	    if (s!=OK) {
+		    return S_dev_intEnFail;
+	    }
+	    return SUCCESS;
+#	else
 		return S_dev_intEnFail;
-	}
-
-	return SUCCESS;
+#	endif
 }
 
 /*
@@ -205,7 +207,7 @@ long devEnableInterruptLevelVME (unsigned level)
  */
 long devEnableInterruptLevelISA (unsigned level)
 {
-#	if CPU == I80386
+#	if CPU_FAMILY == I80X86
 		int s;
 		s = sysIntEnablePIC (level);
 		if (s!=OK) {
@@ -222,7 +224,7 @@ long devEnableInterruptLevelISA (unsigned level)
  */
 long devDisableInterruptLevelISA (unsigned level)
 {
-#	if CPU == I80386
+#	if CPU_FAMILY == I80X86
 		int s;
 		s = sysIntDisablePIC (level);
 		if (s!=OK) {
@@ -240,14 +242,16 @@ long devDisableInterruptLevelISA (unsigned level)
  */
 long devDisableInterruptLevelVME (unsigned level)
 {
-	int s;
-
-	s = sysIntDisable (level);
-	if (s!=OK) {
-		return S_dev_intDissFail;
-	}
-
-	return SUCCESS;
+#	if CPU_FAMILY != I80X86
+	    int s;
+	    s = sysIntDisable (level);
+	    if (s!=OK) {
+		    return S_dev_intDissFail;
+	    }
+	    return SUCCESS;
+#	else
+		return S_dev_intEnFail;
+#	endif
 }
 
 /*