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

Made all args consistant for driver calls

Browse Source
This commit is contained in:
Marty Kraimer
1993-07-28 10:32:34 +00:00
parent cf5dc09c5e
commit 5a94279c86
4 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dev/devBiMpv910.c
View File

@@ -51,8 +51,8 @@
/* Create the dset for devAiBiMpv910 */
long init_record();
long read_bi();
static long init_record();
static long read_bi();
struct {
long number;
@@ -92,13 +92,14 @@ static long init_record(pbi)
static long read_bi(pbi)
struct biRecord *pbi;
{
struct vmeio *pvmeio;
int status;
long value;
struct vmeio *pvmeio;
int status;
unsigned int value,mask;
pvmeio = (struct vmeio *)&(pbi->inp.value);
status = bb910_driver(pvmeio->card,pbi->mask,&value);
mask = pbi->mask;
status = bb910_driver(pvmeio->card,mask,&value);
if(status==0) {
pbi->rval = value;
return(0);

23
src/dev/devBoMpv902.c
View File

@@ -51,8 +51,8 @@
/* Create the dset for devAiBoMpv902 */
long init_record();
long write_bo();
static long init_record();
static long write_bo();
struct {
long number;
@@ -72,8 +72,9 @@ struct {
static long init_record(pbo)
struct boRecord *pbo;
{
int value,status=0;
int status=0;
struct vmeio *pvmeio;
unsigned int value,mask;
/* bo.out must be an VME_IO */
switch (pbo->out.type) {
@@ -82,8 +83,9 @@ static long init_record(pbo)
pbo->mask = 1;
pbo->mask <<= pvmeio->signal;
/* read the value via bo driver */
status = bb902_read(pvmeio->card,pbo->mask,&value);
if(status == 0) pbo->rval = value;
mask = pbo->mask;
status = bb902_read(pvmeio->card,mask,&value);
if(status == 0) pbo->rbv = pbo->rval = value;
else status = 2;
break;
default :
@@ -99,11 +101,18 @@ static long write_bo(pbo)
{
struct vmeio *pvmeio;
int status;
unsigned int value,mask;
pvmeio = (struct vmeio *)&(pbo->out.value);
status = bb902_driver(pvmeio->card,pbo->rval,pbo->mask);
if(status!=0) {
value = pbo->rval;
mask = pbo->mask;
status = bb902_driver(pvmeio->card,value,mask);
if(status==0) {
status = bb902_read(pvmeio->card,mask,&value);
if(status==0) pbo->rbv = value;
else recGblSetSevr(pbo,READ_ALARM,INVALID_ALARM);
} else {
recGblSetSevr(pbo,WRITE_ALARM,INVALID_ALARM);
}
return(status);

9
src/dev/devMbbiMpv910.c
View File

@@ -52,8 +52,8 @@
/* Create the dset for devAiMbbiMpv910 */
long init_record();
long read_mbbi();
static long init_record();
static long read_mbbi();
struct {
long number;
@@ -93,11 +93,12 @@ static long read_mbbi(pmbbi)
{
struct vmeio *pvmeio;
int status;
unsigned long value;
unsigned int value,mask;
pvmeio = (struct vmeio *)&(pmbbi->inp.value);
status = bb910_driver(pvmeio->card,pmbbi->mask,&value);
mask = pmbbi->mask;
status = bb910_driver(pvmeio->card,&value);
if(status==0) {
pmbbi->rval = value;
} else {

17
src/dev/devMbboMpv902.c
View File

@@ -52,8 +52,8 @@
/* Create the dset for devAiMbboMpv902 */
long init_record();
long write_mbbo();
static long init_record();
static long write_mbbo();
struct {
long number;
@@ -73,7 +73,7 @@ struct {
static long init_record(pmbbo)
struct mbboRecord *pmbbo;
{
unsigned long value;
unsigned int value,mask;
struct vmeio *pvmeio;
int status=0;
@@ -83,7 +83,8 @@ static long init_record(pmbbo)
pvmeio = &(pmbbo->out.value.vmeio);
pmbbo->shft = pvmeio->signal;
pmbbo->mask <<= pmbbo->shft;
status = bb902_read(pvmeio->card,pmbbo->mask,&value);
mask = pmbbo->mask;
status = bb902_read(pvmeio->card,mask,&value);
if(status==0) pmbbo->rbv = pmbbo->rval = value;
else status = 2;
break;
@@ -100,14 +101,16 @@ static long write_mbbo(pmbbo)
{
struct vmeio *pvmeio;
int status;
unsigned long value;
unsigned int value,mask;
pvmeio = &(pmbbo->out.value.vmeio);
status = bb902_driver(pvmeio->card,pmbbo->rval,pmbbo->mask);
value = pmbbo->rval;
mask = pmbbo->mask;
status = bb902_driver(pvmeio->card,value,mask);
if(status==0) {
status = bb902_read(pvmeio->card,pmbbo->mask,&value);
status = bb902_read(pvmeio->card,mask,&value);
if(status==0) pmbbo->rbv = value;
else recGblSetSevr(pmbbo,READ_ALARM,INVALID_ALARM);
} else {