From 36ca2234bc1bdb146e3f29f922e2fc8d8b3649c8 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 2 Sep 1999 21:57:33 +0000
Subject: [PATCH] Several drivers weren't using INUM_TO_IVEC() macro, required
 for PowerPC.

---
 src/drv/old/drvBitBus.c  | 4 ++--
 src/drv/old/drvCompuSm.c | 3 ++-
 src/drv/old/drvOms.c     | 3 ++-
 src/drv/old/drvXy566.c   | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/drv/old/drvBitBus.c b/src/drv/old/drvBitBus.c
index c9e461336..7dbedc7c7 100644
--- a/src/drv/old/drvBitBus.c
+++ b/src/drv/old/drvBitBus.c
@@ -383,8 +383,8 @@ int __BBConfig(unsigned long Link,
     pBBLink[Link]->LinkType = LinkType;
   
     /* attach the interrupt handler routines */
-    intConnect((BB_IVEC_BASE + 1 + (Link*4)) * 4, xvmeIrqRcmd, Link);
-    intConnect((BB_IVEC_BASE + 3 + (Link*4)) * 4, xvmeIrqRdav, Link);
+    intConnect(INUM_TO_IVEC(BB_IVEC_BASE + 1 + (Link*4)), xvmeIrqRcmd, Link);
+    intConnect(INUM_TO_IVEC(BB_IVEC_BASE + 3 + (Link*4)), xvmeIrqRdav, Link);
   
     /* Start a task to manage the TX link */
     sprintf(nameTemp, "%s%d-xy", BBTXLINK_NAME, Link);
diff --git a/src/drv/old/drvCompuSm.c b/src/drv/old/drvCompuSm.c
index 863e0e853..58a2cd939 100644
--- a/src/drv/old/drvCompuSm.c
+++ b/src/drv/old/drvCompuSm.c
@@ -61,6 +61,7 @@
 #include <vme.h>
 #include <semLib.h>		/* library for semaphore support */
 #include <intLib.h>		/* library for semaphore support */
+#include <iv.h>
 #include <vxLib.h>		/* library for semaphore support */
 #include <rebootLib.h>		/* library for semaphore support */
 #include <wdLib.h>
@@ -599,7 +600,7 @@ compu_driver_init(){
         if (vxMemProbe(&pmtr->cm_cb,WRITE,1,&cok) != ERROR){
 	    none_found = FALSE;
             pcompu_motors[i] = pmtr;		/* ptr to interface */
-            intConnect((MD_INT_BASE+i)*4,compu_intr,i);	/* interrupt enable */
+            intConnect(INUM_TO_IVEC(MD_INT_BASE+i),compu_intr,i);	/* interrupt enable */
             sysIntEnable(COMPU_INT_LEVEL); 
 
             /* init interrupt receive buffers */
diff --git a/src/drv/old/drvOms.c b/src/drv/old/drvOms.c
index ea9a08439..ec5a6db6e 100644
--- a/src/drv/old/drvOms.c
+++ b/src/drv/old/drvOms.c
@@ -76,6 +76,7 @@
 #include	<stdlib.h>
 #include	<stdio.h>
 #include	<intLib.h>
+#include	<iv.h>
 #include	<vxLib.h>
 #include	<rebootLib.h>
 #include	<taskLib.h>
@@ -418,7 +419,7 @@ int oms_driver_init(){
 
 			/* interrupt vector */
 			pmotor->vector = 0x80+i;
-			intConnect(((0x80+i)*4),oms_intr,i);
+			intConnect(INUM_TO_IVEC(0x80+i),oms_intr,i);
                         sysIntEnable(OMS_INT_LEV);
 
 			/* enable interrupt on input buffer full */
diff --git a/src/drv/old/drvXy566.c b/src/drv/old/drvXy566.c
index d9a72fba4..4628842de 100644
--- a/src/drv/old/drvXy566.c
+++ b/src/drv/old/drvXy566.c
@@ -86,6 +86,7 @@
 #include	<stdio.h>
 #include	<rebootLib.h>
 #include	<intLib.h>
+#include	<iv.h>
 #include	<vme.h>
 #include	<dbDefs.h>
 #include	<dbScan.h>
@@ -553,7 +554,7 @@ register short		***pppmem_present;
 	/* taken from the XYCOM-566 Manual. Figure 4-6  Page 4-19 */
 	pai566->int_vect = AI566_VNUM + i;
   
-	intConnect((AI566_VNUM + i) * 4, ai566_intr, i);
+	intConnect(INUM_TO_IVEC(AI566_VNUM + i), ai566_intr, i);
         sysIntEnable(XY566_INT_LEVEL); 
 
 	/* reset the Xycom 566 board */