Cleanup/coding style changes.

Added support for epicsTimeEventDeviceTime.
This commit is contained in:
Andrew Johnson
2008-08-06 22:11:51 +00:00
parent 8f1a5bdac6
commit 9f9f5b48c5
13 changed files with 662 additions and 643 deletions
+53 -42
View File
@@ -1,19 +1,18 @@
/*************************************************************************\
* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
* Copyright (c) 2008 UChicago Argonne LLC, as Operator of Argonne
* National Laboratory.
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devMbbiSoftRaw.c */
/* base/src/dev $Id$ */
/*
* Original Author: Bob Dalesio
* Current Author: Marty Kraimer
* Date: 6-1-90
/* $Id$
*
* Original Authors: Bob Dalesio and Marty Kraimer
* Date: 6-1-90
*/
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -22,48 +21,60 @@
#include "dbDefs.h"
#include "dbAccess.h"
#include "recGbl.h"
#include "recSup.h"
#include "devSup.h"
#include "mbbiRecord.h"
#include "epicsExport.h"
/* Create the dset for devMbbiSoftRaw */
static long init_record();
static long read_mbbi();
struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN read_mbbi;
}devMbbiSoftRaw={
5,
NULL,
NULL,
init_record,
NULL,
read_mbbi
};
epicsExportAddress(dset,devMbbiSoftRaw);
static long init_record(mbbiRecord *pmbbi)
{
static long init_record(mbbiRecord *prec);
static long read_mbbi(mbbiRecord *prec);
if (pmbbi->inp.type == CONSTANT) {
recGblInitConstantLink(&pmbbi->inp,DBF_ULONG,&pmbbi->rval);
struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN read_mbbi;
} devMbbiSoftRaw = {
5,
NULL,
NULL,
init_record,
NULL,
read_mbbi
};
epicsExportAddress(dset, devMbbiSoftRaw);
static long init_record(mbbiRecord *prec)
{
/* INP must be CONSTANT, PV_LINK, DB_LINK or CA_LINK*/
switch (prec->inp.type) {
case CONSTANT:
recGblInitConstantLink(&prec->inp, DBF_ULONG, &prec->rval);
break;
case PV_LINK:
case DB_LINK:
case CA_LINK:
break;
default:
recGblRecordError(S_db_badField, (void *)prec,
"devMbbiSoftRaw (init_record) Illegal INP field");
return S_db_badField;
}
/*to preserve old functionality*/
if(pmbbi->nobt == 0) pmbbi->mask = 0xffffffff;
pmbbi->mask <<= pmbbi->shft;
return(0);
if (prec->nobt == 0) prec->mask = 0xffffffff;
prec->mask <<= prec->shft;
return 0;
}
static long read_mbbi(mbbiRecord *pmbbi)
static long read_mbbi(mbbiRecord *prec)
{
long status;
status = dbGetLink(&pmbbi->inp,DBR_LONG,&pmbbi->rval,0,0);
if(status==0) pmbbi->rval &= pmbbi->mask;
return(0);
if (!dbGetLink(&prec->inp, DBR_LONG, &prec->rval, 0, 0)) {
prec->rval &= prec->mask;
if (prec->tsel.type == CONSTANT &&
prec->tse == epicsTimeEventDeviceTime)
dbGetTimeStamp(&prec->inp, &prec->time);
}
return 0;
}