merged lanl changes

src/drv/drvAt5Vxi.c

@@ -55,7 +55,6 @@
  *	.18 joh 082792	converted to ansi C
  *	.19 joh	111392	removed shifts on analog IO
  *	.20 joh	071593	fixwd comment	
- *	.21 mgb	080493	Removed V5/V4 and EPICS_V2 conditionals
  *
  *	Notes:
  *	------
@@ -110,7 +109,9 @@
 #include <fast_lock.h>
 #include <drvSup.h>
 #include <dbDefs.h>
+#ifndef EPICS_V2
 #include <dbScan.h>
+#endif
 #include <drvEpvxi.h>
 
 static char SccsId[] = "$Id$\t$Date$";
@@ -424,7 +425,9 @@ struct at5vxi_config{
 	char			mdt;		/* modified data tag	*/
 	struct vxi_csr		*pcsr;		/* vxi device hdr ptr 	*/
 	struct at5vxi_dd	*pdd;		/* at5 device dep ptr	*/
+#ifndef EPICS_V2
        	IOSCANPVT 		ioscanpvt;
+#endif
 
 };
 
@@ -606,7 +609,9 @@ void 	at5vxi_init_card(
 	pc->pdd = (struct at5vxi_dd *) &pc->pcsr->dir.r.dd;
 
 	FASTLOCKINIT(&pc->lock);
+#ifndef EPICS_V2
         scanIoInit(&pc->ioscanpvt);
+#endif
 
 
 	/*
@@ -713,7 +718,7 @@ void 	at5vxi_init_card(
   		r0 = intConnect(
 			INUM_TO_IVEC(addr), 
 			at5vxi_int_service, 
-			(int) addr);
+			(void *) addr);
   		if(r0 == ERROR)
     			return;
 
@@ -772,7 +777,12 @@ void 	at5vxi_int_service(
 	 * wake up the I/O event scanner
 	 */
 	{
+#ifdef EPICS_V2
+		io_scanner_wakeup(IO_AI, VXI_AT5_AI, addr);
+		io_scanner_wakeup(IO_BI, VXI_AT5_BI, addr);
+#else
                 scanIoRequest(pconfig->ioscanpvt);
+#endif
 	}
 
 	/*
@@ -1428,6 +1438,7 @@ int	at5vxi_bo_driver(
 }
 
 
+#ifndef EPICS_V2
 /*
  *
  * at5vxi_getioscanpvt()
@@ -1444,4 +1455,5 @@ IOSCANPVT *scanpvt;
         if(pconfig) *scanpvt = pconfig->ioscanpvt;
         return(0);
 }
+#endif
 

src/drv/drvHpe1445a.c

@@ -143,7 +143,13 @@ hpe1445aTest(unsigned la)
 			return ERROR;
 		}
 		if(!(options&VX_STDIO)){
-			logMsg("%s: task needs SDIO option set\n",__FILE__);
+			logMsg(	"%s: task needs SDIO option set\n",
+				__FILE__,
+				NULL,
+				NULL,
+				NULL,
+				NULL,
+				NULL);
 			return ERROR;
 		}
 	}
@@ -409,7 +415,7 @@ int		lineno
 			sizeof(pbuf), 
 			&read_count,
 			0);
-		if(s!=VXI_BUFFER_FULL && s!=VXI_SUCCESS){
+		if(s!=S_epvxi_bufferFull && s!=VXI_SUCCESS){
 			logMsg(	"%s line=%d LA=0X%X: error fetch problem %d\n",
 				__FILE__,
 				lineno,
@@ -908,7 +914,6 @@ unsigned long		npoints
 {
 	unsigned long		read_count;
 	char			pbuf[64];
-        struct vxi_csr		*pcsr;
 	int			s;
 
 	s = hpe1445aWrite(la, "source:list:segment:free?");