From c3cfcd6f7ac33fb59fe4dc40db6476ccab071da1 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Fri, 2 Oct 1998 15:26:43 +0000 Subject: [PATCH] correct LANSCE-5 make name, use ansi function prototype --- src/drv/ansi/drvAt5Vxi.c | 10 +++++----- src/drv/ansi/drvEpvxi.c | 2 +- src/drv/ansi/drvEpvxi.h | 2 +- src/drv/ansi/epvxi.h | 4 ++-- src/vxWorks/drv/ansi/drvAt5Vxi.c | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/drv/ansi/drvAt5Vxi.c b/src/drv/ansi/drvAt5Vxi.c index 246d255cb..415773916 100644 --- a/src/drv/ansi/drvAt5Vxi.c +++ b/src/drv/ansi/drvAt5Vxi.c @@ -379,7 +379,7 @@ LOCAL unsigned long at5vxiDriverID; #define AT5VXI_PCONFIG(CARD, PTR) \ epvxiFetchPConfig(CARD, at5vxiDriverID, PTR) -#define AT5VXI_CORRECT_MAKE(PCSR) (VXIMAKE(PCSR)==VXI_MAKE_AT5) +#define AT5VXI_CORRECT_MAKE(PCSR) (VXIMAKE(PCSR)==VXI_MAKE_LANSCE5) struct at5vxi_model{ char *name; /* AT5 VXI module name */ @@ -462,7 +462,7 @@ at5VxiStatus at5vxi_init(void) epvxiDeviceSearchPattern dsp; dsp.flags = VXI_DSP_make; - dsp.make = VXI_MAKE_AT5; + dsp.make = VXI_MAKE_LANSCE5; r0 = epvxiLookupLA(&dsp, at5vxi_init_card, (void *)NULL); if(r0){ return r0; @@ -486,7 +486,7 @@ LOCAL int at5vxi_shutdown(void) at5VxiStatus s; dsp.flags = VXI_DSP_make; - dsp.make = VXI_MAKE_AT5; + dsp.make = VXI_MAKE_LANSCE5; s = epvxiLookupLA(&dsp, at5vxi_shutdown_card, (void *)NULL); if(s){ errMessage(s,"AT5VXI module shutdown failed"); @@ -698,7 +698,7 @@ void at5vxi_init_card( errMessage(r0,NULL); } - r0 = epvxiRegisterMakeName(VXI_MAKE_AT5, "LANL AT5"); + r0 = epvxiRegisterMakeName(VXI_MAKE_LANSCE5, "LANL LANSCE-5"); if(r0){ errMessage(r0,NULL); } @@ -1080,7 +1080,7 @@ void at5vxi_stat( if(r0 != OK) return; - if(VXIMAKE(pcsr) != VXI_MAKE_AT5) + if(VXIMAKE(pcsr) != VXI_MAKE_LANSCE5) return; if(AT5VXI_VALID_MODEL(VXIMODEL(pcsr))){ diff --git a/src/drv/ansi/drvEpvxi.c b/src/drv/ansi/drvEpvxi.c index 00e4d622b..2a8812f0b 100644 --- a/src/drv/ansi/drvEpvxi.c +++ b/src/drv/ansi/drvEpvxi.c @@ -3457,7 +3457,7 @@ int vxiDriverID */ EPVXISTAT epvxiLookupLA( epvxiDeviceSearchPattern *pdsp, -void (*pfunc)(), +void (*pfunc)(unsigned, void *), void *parg ) { diff --git a/src/drv/ansi/drvEpvxi.h b/src/drv/ansi/drvEpvxi.h index e2ea368cb..ff1eaf5e5 100644 --- a/src/drv/ansi/drvEpvxi.h +++ b/src/drv/ansi/drvEpvxi.h @@ -127,7 +127,7 @@ EPVXISTAT epvxiClose( EPVXISTAT epvxiLookupLA( epvxiDeviceSearchPattern *pdsp, - void (*pfunc)(), + void (*pfunc)(unsigned, void *), void *parg ); diff --git a/src/drv/ansi/epvxi.h b/src/drv/ansi/epvxi.h index 43a999430..cda7dddb1 100644 --- a/src/drv/ansi/epvxi.h +++ b/src/drv/ansi/epvxi.h @@ -330,7 +330,7 @@ char *vxi_device_class_names[] #define VXI_MAKE_HP 0xfff /* Hewlett Packard */ #define VXI_MAKE_RD 0xffb /* Racal Dana */ #define VXI_MAKE_NI 0xff6 /* National Instruments */ -#define VXI_MAKE_AT5 0xfa0 /* Los Alamos Natl Lab AT */ +#define VXI_MAKE_LANSCE5 0xfa0 /* Los Alamos Natl Lab LANSCE-5 */ #define VXI_MAKE_KSC 0xf29 /* Kinetic Systems */ struct vxi_vendor_info{ uint16_t make; @@ -349,7 +349,7 @@ struct vxi_vendor_info vxi_vi[] {VXI_MAKE_HP, "Hewlett-Packard"}, {VXI_MAKE_RD, "Racal-Dana"}, {VXI_MAKE_NI, "National Instruments"}, - {VXI_MAKE_AT5, "LANL AT5"}, + {VXI_MAKE_LANSCE5, "LANL LANSCE-5"}, {VXI_MAKE_KSC, "Kinetic Systems"}, } #endif diff --git a/src/vxWorks/drv/ansi/drvAt5Vxi.c b/src/vxWorks/drv/ansi/drvAt5Vxi.c index 246d255cb..415773916 100644 --- a/src/vxWorks/drv/ansi/drvAt5Vxi.c +++ b/src/vxWorks/drv/ansi/drvAt5Vxi.c @@ -379,7 +379,7 @@ LOCAL unsigned long at5vxiDriverID; #define AT5VXI_PCONFIG(CARD, PTR) \ epvxiFetchPConfig(CARD, at5vxiDriverID, PTR) -#define AT5VXI_CORRECT_MAKE(PCSR) (VXIMAKE(PCSR)==VXI_MAKE_AT5) +#define AT5VXI_CORRECT_MAKE(PCSR) (VXIMAKE(PCSR)==VXI_MAKE_LANSCE5) struct at5vxi_model{ char *name; /* AT5 VXI module name */ @@ -462,7 +462,7 @@ at5VxiStatus at5vxi_init(void) epvxiDeviceSearchPattern dsp; dsp.flags = VXI_DSP_make; - dsp.make = VXI_MAKE_AT5; + dsp.make = VXI_MAKE_LANSCE5; r0 = epvxiLookupLA(&dsp, at5vxi_init_card, (void *)NULL); if(r0){ return r0; @@ -486,7 +486,7 @@ LOCAL int at5vxi_shutdown(void) at5VxiStatus s; dsp.flags = VXI_DSP_make; - dsp.make = VXI_MAKE_AT5; + dsp.make = VXI_MAKE_LANSCE5; s = epvxiLookupLA(&dsp, at5vxi_shutdown_card, (void *)NULL); if(s){ errMessage(s,"AT5VXI module shutdown failed"); @@ -698,7 +698,7 @@ void at5vxi_init_card( errMessage(r0,NULL); } - r0 = epvxiRegisterMakeName(VXI_MAKE_AT5, "LANL AT5"); + r0 = epvxiRegisterMakeName(VXI_MAKE_LANSCE5, "LANL LANSCE-5"); if(r0){ errMessage(r0,NULL); } @@ -1080,7 +1080,7 @@ void at5vxi_stat( if(r0 != OK) return; - if(VXIMAKE(pcsr) != VXI_MAKE_AT5) + if(VXIMAKE(pcsr) != VXI_MAKE_LANSCE5) return; if(AT5VXI_VALID_MODEL(VXIMODEL(pcsr))){