epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

correct LANSCE-5 make name, use ansi function prototype

Browse Source
This commit is contained in:
Jeff Hill
1998-10-02 15:26:43 +00:00
parent cd8da10fa8
commit c3cfcd6f7a
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/drv/ansi/drvAt5Vxi.c
View File

@@ -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))){

2
src/drv/ansi/drvEpvxi.c
View File

@@ -3457,7 +3457,7 @@ int vxiDriverID
*/
EPVXISTAT epvxiLookupLA(
epvxiDeviceSearchPattern *pdsp,
void (*pfunc)(),
void (*pfunc)(unsigned, void *),
void *parg
)
{

2
src/drv/ansi/drvEpvxi.h
View File

@@ -127,7 +127,7 @@ EPVXISTAT epvxiClose(
EPVXISTAT epvxiLookupLA(
epvxiDeviceSearchPattern
*pdsp,
void (*pfunc)(),
void (*pfunc)(unsigned, void *),
void *parg
);

4
src/drv/ansi/epvxi.h
View File

@@ -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

10
src/vxWorks/drv/ansi/drvAt5Vxi.c
View File

@@ -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))){