From 55ec813908f7027322c30482c83d57cb9041cd35 Mon Sep 17 00:00:00 2001 From: gabadinho Date: Wed, 12 Feb 2020 15:32:13 +0100 Subject: [PATCH] initial typed-dset changes for ao record --- modules/database/src/std/rec/Makefile | 1 + modules/database/src/std/rec/aoRecord.c | 12 ------------ modules/database/src/std/rec/aoRecord.dbd.pod | 9 +++++++++ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/modules/database/src/std/rec/Makefile b/modules/database/src/std/rec/Makefile index e6277fb49..e289bc387 100644 --- a/modules/database/src/std/rec/Makefile +++ b/modules/database/src/std/rec/Makefile @@ -14,6 +14,7 @@ SRC_DIRS += $(STDDIR)/rec stdRecords += aaiRecord stdRecords += aaoRecord aiRecord_CFLAGS += -DUSE_TYPED_DSET +aoRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += aiRecord stdRecords += aoRecord stdRecords += aSubRecord diff --git a/modules/database/src/std/rec/aoRecord.c b/modules/database/src/std/rec/aoRecord.c index 6fa65859b..94ad11fd2 100644 --- a/modules/database/src/std/rec/aoRecord.c +++ b/modules/database/src/std/rec/aoRecord.c @@ -83,18 +83,6 @@ rset aoRSET={ get_control_double, get_alarm_double }; -struct aodset { /* analog input dset */ - long number; - DEVSUPFUN dev_report; - DEVSUPFUN init; - DEVSUPFUN init_record; /*returns: (0,2)=>(success,success no convert)*/ - DEVSUPFUN get_ioint_info; - DEVSUPFUN write_ao;/*(0)=>(success ) */ - DEVSUPFUN special_linconv; -}; -epicsExportAddress(rset,aoRSET); - - static void checkAlarms(aoRecord *); static long fetch_value(aoRecord *, double *); static void convert(aoRecord *, double); diff --git a/modules/database/src/std/rec/aoRecord.dbd.pod b/modules/database/src/std/rec/aoRecord.dbd.pod index c54cb2c4f..026805ee7 100644 --- a/modules/database/src/std/rec/aoRecord.dbd.pod +++ b/modules/database/src/std/rec/aoRecord.dbd.pod @@ -269,6 +269,15 @@ information on these fields. =cut include "dbCommon.dbd" + % + %/* Declare Device Support Entry Table */ + %struct aoRecord; + %typedef struct aodset { + % dset common; + % long (*write_ao)(struct aoRecord *prec); + %} aodset; + %#define HAS_aodset + % field(VAL,DBF_DOUBLE) { prompt("Desired Output") promptgroup("50 - Output")