epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Changes for driver cleanup

Browse Source
This commit is contained in:
Marty Kraimer
1992-04-17 12:54:45 +00:00
parent ec50c1d77d
commit f290207cdf
12 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dev/devAiDvx2502.c
View File

@@ -101,9 +101,9 @@ static long init_record(pai)
/* call driver so that it configures card */
pvmeio = (struct vmeio *)&(pai->inp.value);
if(status=ai_driver(pvmeio->card,pvmeio->signal,DVX2502,&value)) {
if(status=dvx_driver(pvmeio->card,pvmeio->signal,&value)) {
strcpy(message,pai->name);
strcat(message,": devAiDvx2502 (init_record) ai_driver error");
strcat(message,": devAiDvx2502 (init_record) dvx_driver error");
errMessage(status,message);
return(status);
}
@@ -134,7 +134,7 @@ static long read_ai(pai)
pvmeio = (struct vmeio *)&(pai->inp.value);
if(status=ai_driver(pvmeio->card,pvmeio->signal,DVX2502,&value))
if(status=dvx_driver(pvmeio->card,pvmeio->signal,&value))
return(status);
*((unsigned short*)(&pai->rval))=value;
if(status==0 || status==-2) pai->rval = value;

11
src/dev/devAiXy566Di.c
View File

@@ -97,9 +97,9 @@ static long init_record(pai)
/* call driver so that it configures card */
pvmeio = (struct vmeio *)&(pai->inp.value);
if(status=ai_driver(pvmeio->card,pvmeio->signal,XY566DI,&value)) {
if(status=ai_xy566_driver(pvmeio->card,pvmeio->signal,XY566DI,&value)) {
strcpy(message,pai->name);
strcat(message,": devAiXy566Di (init_record) ai_driver error");
strcat(message,": devAiXy566Di (init_record) ai_xy566_driver error");
errMessage(status,message);
return(status);
}
@@ -115,7 +115,7 @@ static long read_ai(pai)
pvmeio = (struct vmeio *)&(pai->inp.value);
status=ai_driver(pvmeio->card,pvmeio->signal,XY566DI,&value);
status=ai_xy566_driver(pvmeio->card,pvmeio->signal,XY566DI,&value);
if(status==-1) {
status = 2; /* don't convert*/
recGblSetSevr(pai,READ_ALARM,VALID_ALARM);
@@ -125,11 +125,6 @@ static long read_ai(pai)
recGblSetSevr(pai,HW_LIMIT_ALARM,VALID_ALARM);
}
if(status!=0) return(status);
/*read into hardware as -0x7ff to +0x7ff */
/* normalize to 0 - 0xfff */
value = value + 0x800;
/* remove the sign bit */
value &= 0xfff;
pai->rval = value;
return(status);
}

6
src/dev/devAiXy566Se.c
View File

@@ -96,9 +96,9 @@ static long init_record(pai)
/* call driver so that it configures card */
pvmeio = (struct vmeio *)&(pai->inp.value);
if(status=ai_driver(pvmeio->card,pvmeio->signal,XY566SE,&value)) {
if(status=ai_xy566_driver(pvmeio->card,pvmeio->signal,XY566SE,&value)) {
strcpy(message,pai->name);
strcat(message,": devAiXy566Se (init_record) ai_driver error");
strcat(message,": devAiXy566Se (init_record) ai_xy566_driver error");
errMessage(status,message);
return(status);
}
@@ -114,7 +114,7 @@ static long read_ai(pai)
pvmeio = (struct vmeio *)&(pai->inp.value);
status=ai_driver(pvmeio->card,pvmeio->signal,XY566SE,&value);
status=ai_xy566_driver(pvmeio->card,pvmeio->signal,XY566SE,&value);
if(status==-1) {
status = 2; /*don't convert*/
recGblSetSevr(pai,READ_ALARM,VALID_ALARM);

4
src/dev/devAoVmiVme4100.c
View File

@@ -112,7 +112,7 @@ static long write_ao(pao)
pvmeio = (struct vmeio *)&(pao->out.value);
value = pao->rval;
status = ao_driver(pvmeio->card,pvmeio->signal,VMI4100,&value,&rbvalue);
status = vmi4100_driver(pvmeio->card,pvmeio->signal,&value,&rbvalue);
if(status==0 || status==-2) pao->rbv = rbvalue;
if(status==-1) {
recGblSetSevr(pao,WRITE_ALARM,VALID_ALARM);
@@ -142,7 +142,7 @@ struct aoRecord *pao;
struct vmeio *pvmeio = &pao->out.value.vmeio;
/* get the value from the ao driver */
ao_read(pvmeio->card,pvmeio->signal,VMI4100,&value);
vmi4100_read(pvmeio->card,pvmeio->signal,&value);
pao->rbv = pao->rval = value;
return;
}

2
src/dev/devBiMpv910.c
View File

@@ -100,7 +100,7 @@ static long read_bi(pbi)
pvmeio = (struct vmeio *)&(pbi->inp.value);
status = bi_driver(pvmeio->card,pbi->mask,BB910,&value);
status = bb910_driver(pvmeio->card,pbi->mask,&value);
if(status==0) {
pbi->rval = value;
return(0);

2
src/dev/devBiXVme210.c
View File

@@ -100,7 +100,7 @@ static long read_bi(pbi)
pvmeio = (struct vmeio *)&(pbi->inp.value);
status = bi_driver(pvmeio->card,pbi->mask,XY210,&value);
status = xy210_driver(pvmeio->card,pbi->mask,&value);
if(status==0) {
pbi->rval = value;
return(0);

4
src/dev/devBoMpv902.c
View File

@@ -83,7 +83,7 @@ static long init_record(pbo)
pbo->mask = 1;
pbo->mask <<= pvmeio->signal;
/* read the value via bo driver */
status = bo_read(pvmeio->card,pbo->mask,&value,BB902);
status = bb902_read(pvmeio->card,pbo->mask,&value);
if(status == 0) {
pbo->rval = value;
} else if(status == -1) {
@@ -115,7 +115,7 @@ static long write_bo(pbo)
pvmeio = (struct vmeio *)&(pbo->out.value);
status = bo_driver(pvmeio->card,pbo->rval,pbo->mask,BB902);
status = bb902_driver(pvmeio->card,pbo->rval,pbo->mask);
if(status!=0) {
recGblSetSevr(pbo,WRITE_ALARM,VALID_ALARM);
}

4
src/dev/devBoXVme220.c
View File

@@ -83,7 +83,7 @@ static long init_record(pbo)
pvmeio = (struct vmeio *)&(pbo->out.value);
pbo->mask = 1;
pbo->mask <<= pvmeio->signal;
status = bo_read(pvmeio->card,pbo->mask,&value,XY220);
status = xy220_read(pvmeio->card,pbo->mask,&value);
if(status == 0) {
pbo->rval = value;
} else if(status == -1) {
@@ -115,7 +115,7 @@ static long write_bo(pbo)
pvmeio = (struct vmeio *)&(pbo->out.value);
status = bo_driver(pvmeio->card,pbo->rval,pbo->mask,XY220);
status = xy220_driver(pvmeio->card,pbo->rval,pbo->mask);
if(status!=0) {
recGblSetSevr(pbo,WRITE_ALARM,VALID_ALARM);
}

6
src/dev/devEventTestIoEvent.c
View File

@@ -67,12 +67,14 @@ struct {
read_event,
NULL};
IOSCANPVT ioscanpvt;
static IOSCANPVT ioscanpvt;
WDOG_ID wd_id=NULL;
static long init()
static long init(after)
int after;
{
if(after) return(0);
scanIoInit(&ioscanpvt);
return(0);
}

2
src/dev/devMbbiMpv910.c
View File

@@ -99,7 +99,7 @@ static long read_mbbi(pmbbi)
pvmeio = (struct vmeio *)&(pmbbi->inp.value);
status = bi_driver(pvmeio->card,pmbbi->mask,BB910,&value);
status = bb910_driver(pvmeio->card,pmbbi->mask,&value);
if(status==0) {
pmbbi->rval = value;
} else {

2
src/dev/devMbbiXVme210.c
View File

@@ -99,7 +99,7 @@ static long read_mbbi(pmbbi)
pvmeio = (struct vmeio *)&(pmbbi->inp.value);
status = bi_driver(pvmeio->card,pmbbi->mask,XY210,&value);
status = xy210_driver(pvmeio->card,pmbbi->mask,&value);
if(status==0) {
pmbbi->rval = value;
} else {

6
src/dev/devMbboMpv902.c
View File

@@ -84,7 +84,7 @@ static long init_record(pmbbo)
pvmeio = &(pmbbo->out.value.vmeio);
pmbbo->shft = pvmeio->signal;
pmbbo->mask <<= pmbbo->shft;
status = bo_read(pvmeio->card,pmbbo->mask,&value,BB902);
status = bb902_read(pvmeio->card,pmbbo->mask,&value);
if(status==0) pmbbo->rbv = pmbbo->rval = value;
break;
default :
@@ -106,9 +106,9 @@ static long write_mbbo(pmbbo)
pvmeio = &(pmbbo->out.value.vmeio);
status = bo_driver(pvmeio->card,pmbbo->rval,pmbbo->mask,BB902);
status = bb902_driver(pvmeio->card,pmbbo->rval,pmbbo->mask);
if(status==0) {
status = bo_read(pvmeio->card,pmbbo->mask,&value,BB902);
status = bb902_read(pvmeio->card,pmbbo->mask,&value);
if(status==0) pmbbo->rbv = value;
else recGblSetSevr(pmbbo,READ_ALARM,VALID_ALARM);
} else {