- Record updates:

. aoRecord
  . biRecord
  . boRecord
  . mbbiRecord
  . mbbiDirectRecord
  . mbboRecord
  . mbboDirectRecord
  . longinRecord
  . longoutRecord
  . stringoutRecord
  . stringinRecord
  . waveformRecord
  . calcoutRecord
  . subArrayRecord

- Device support updates:
  . devAoSoft, devAoSoftCallback, devAoSoftRaw (aoRecord)
  . devBiSoft, devBiSoftCallback, devBiSoftRaw, devBiDbState (biRecord)
  . devBoSoft, devBoSoftCallback, devBoSoftRaw, devBoDbState, devGeneralTime (boRecord)
  . devMbbiSoft, devMbbiSoftCallback, devMbbiSoftRaw (mbbiRecord)
  . devMbboSoft, devMbboSoftCallback, devMbboSoftRaw (mbboRecord)
  . devMbbiDirectSoft, devMbbiDirectSoftCallback, devMbbiDirectSoftRaw (mbbiDirectRecord)
  . devMbboDirectSoft, devMbboDirectSoftCallback, devMbboDirectSoftRaw (mbboDirectRecord)
  . devGeneralTime, devLiSoft, devLiSoftCallback (longinRecord)
  . devLoSoft, devLoSoftCallback (longoutRecord)
  . devSoSoft, devSoSoftCallback, devStdio (stringoutRecord)
  . devSiSoft, devSiSoftCallback, devEnviron, devGeneralTime, devTimestamp (stringinRecord)
  . devWfSoft (waveformRecord)
  . devCalcoutSoft, devCalcoutSoftCallback (recordCalcout)
  . devSASoft (subArrayRecord)

modules/database/src/std/dev/Makefile

@@ -19,14 +19,21 @@ devAiSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devAiSoft.c
 devAiSoftRaw_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devAiSoftRaw.c
+devAoSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devAoSoft.c
+devAoSoftRaw_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devAoSoftRaw.c
+devBiSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devBiSoft.c
 dbRecStd_SRCS += devBiSoftRaw.c
+devBiDbState_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devBiDbState.c
+devBoSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devBoSoft.c
+devBoSoftRaw_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devBoSoftRaw.c
 dbRecStd_SRCS += devBoDbState.c
+devCalcoutSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devCalcoutSoft.c
 dbRecStd_SRCS += devEventSoft.c
 dbRecStd_SRCS += devHistogramSoft.c
@@ -34,49 +41,75 @@ devI64inSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devI64inSoft.c
 devI64outSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devI64outSoft.c
+devLiSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devLiSoft.c
+devLoSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devLoSoft.c
 devLsiSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devLsiSoft.c
 devLsoSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devLsoSoft.c
+devMbbiDirectSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbbiDirectSoft.c
+devMbbiDirectSoftRaw_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbbiDirectSoftRaw.c
+devMbbiSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbbiSoft.c
+devMbbiSoftRaw_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbbiSoftRaw.c
+devMbboDirectSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbboDirectSoft.c
+devMbboDirectSoftRaw_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbboDirectSoftRaw.c
+devMbboSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbboSoft.c
+devMbboSoftRaw_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbboSoftRaw.c
 devPrintfSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devPrintfSoft.c
+devSASoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devSASoft.c
+devSiSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devSiSoft.c
+devSoSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devSoSoft.c
+devWfSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devWfSoft.c
 
 devAiSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devAiSoftCallback.c
+devBiSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devBiSoftCallback.c
 devI64inSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devI64inSoftCallback.c
+devLiSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devLiSoftCallback.c
+devMbbiDirectSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbbiDirectSoftCallback.c
+devMbbiCallbackSoft_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbbiSoftCallback.c
+devSiSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devSiSoftCallback.c
 
+devAoSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devAoSoftCallback.c
+devBoSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devBoSoftCallback.c
+devCalcoutSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devCalcoutSoftCallback.c
 devI64outSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devI64outSoftCallback.c
+devLoSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devLoSoftCallback.c
 devLsoSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devLsoSoftCallback.c
+devMbboSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbboSoftCallback.c
+devMbboDirectSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devMbboDirectSoftCallback.c
 devPrintfSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devPrintfSoftCallback.c
+devSoSoftCallback_CFLAGS += -DUSE_TYPED_DSET
 dbRecStd_SRCS += devSoSoftCallback.c
 
 devGeneralTime_CFLAGS += -DUSE_TYPED_DSET

modules/database/src/std/dev/devAoSoft.c

@@ -31,31 +31,17 @@
 #include "aoRecord.h"
 #include "epicsExport.h"
 
-/* added for Channel Access Links */
-static long init_record(aoRecord *prec);
-
 /* Create the dset for devAoSoft */
+static long init_record(dbCommon *pcommon);
 static long write_ao(aoRecord *prec);
-struct {
-	long		number;
-	DEVSUPFUN	report;
-	DEVSUPFUN	init;
-	DEVSUPFUN	init_record;
-	DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	write_ao;
-	DEVSUPFUN	special_linconv;
-}devAoSoft={
-	6,
-	NULL,
-	NULL,
-	init_record,
-	NULL,
-	write_ao,
-	NULL};
-epicsExportAddress(dset,devAoSoft);
-
 
-static long init_record(aoRecord *prec)
+aodset devAoSoft = {
+    {6, NULL, NULL, init_record, NULL},
+    write_ao, NULL
+};
+epicsExportAddress(dset, devAoSoft);
+
+static long init_record(dbCommon *pcommon)
 {
 
     long status=0;

modules/database/src/std/dev/devAoSoftCallback.c

@@ -31,23 +31,12 @@
 
 /* Create the dset for devAoSoftCallback */
 static long write_ao(aoRecord *prec);
-struct {
-	long		number;
-	DEVSUPFUN	report;
-	DEVSUPFUN	init;
-	DEVSUPFUN	init_record;
-	DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	write_ao;
-	DEVSUPFUN	special_linconv;
-}devAoSoftCallback={
-	6,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	write_ao,
-	NULL};
-epicsExportAddress(dset,devAoSoftCallback);
+
+aodset devAoSoftCallback = {
+    {6, NULL, NULL, NULL, NULL},
+    write_ao, NULL
+};
+epicsExportAddress(dset, devAoSoftCallback);
 
 static long write_ao(aoRecord *prec)
 {

modules/database/src/std/dev/devAoSoftRaw.c

@@ -33,25 +33,13 @@
 
 /* Create the dset for devAoSoftRaw */
 static long write_ao(aoRecord *prec);
-struct {
-	long		number;
-	DEVSUPFUN	report;
-	DEVSUPFUN	init;
-	DEVSUPFUN	init_record;
-	DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	write_ao;
-	DEVSUPFUN	special_linconv;
-}devAoSoftRaw={
-	6,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	write_ao,
-	NULL
+
+aodset devAoSoftRaw = {
+    {6, NULL, NULL, NULL, NULL},
+    write_ao, NULL
 };
-epicsExportAddress(dset,devAoSoftRaw);
-
+epicsExportAddress(dset, devAoSoftRaw);
+
 static long write_ao(aoRecord *prec)
 {
     long status;

modules/database/src/std/dev/devBiDbState.c

@@ -69,20 +69,9 @@ static long read_bi(biRecord *prec)
     return 2;
 }
 
-static struct {
-        long		number;
-        DEVSUPFUN	report;
-        DEVSUPFUN	init;
-        DEVSUPFUN	init_record;
-        DEVSUPFUN	get_ioint_info;
-        DEVSUPFUN	read_bi;
-} devBiDbState = {
-        5,
-        NULL,
-        init,
-        NULL,
-        NULL,
-        read_bi
+/* Create the dset for devBiDbState */
+bidset devBiDbState = {
+    {5, NULL, init, NULL, NULL},
+    read_bi
 };
-
 epicsExportAddress(dset, devBiDbState);

modules/database/src/std/dev/devBiSoft.c

@@ -25,28 +25,19 @@
 #include "epicsExport.h"
 
 /* Create the dset for devBiSoft */
-static long init_record(biRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long read_bi(biRecord *prec);
 
-struct {
-    long      number;
-    DEVSUPFUN report;
-    DEVSUPFUN init;
-    DEVSUPFUN init_record;
-    DEVSUPFUN get_ioint_info;
-    DEVSUPFUN read_bi;
-} devBiSoft = {
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+bidset devBiSoft = {
+    {5, NULL, NULL, init_record, NULL},
     read_bi
 };
 epicsExportAddress(dset, devBiSoft);
 
-static long init_record(biRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+	biRecord *prec = (biRecord *)pcommon;
+
     if (recGblInitConstantLink(&prec->inp, DBF_ENUM, &prec->val))
         prec->udf = FALSE;
     return 0;

modules/database/src/std/dev/devBiSoftCallback.c

@@ -151,8 +151,10 @@ static long init(int pass)
     return 0;
 }
 
-static long init_record(biRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+	biRecord *prec = (biRecord *)pcommon;
+
     if (recGblInitConstantLink(&prec->inp, DBR_ENUM, &prec->val))
         prec->udf = FALSE;
 
@@ -204,10 +206,7 @@ static long read_bi(biRecord *prec)
 }
 
 /* Create the dset for devBiSoftCallback */
-struct {
-    dset common;
-    DEVSUPFUN read_bi;
-} devBiSoftCallback = {
+bidset devBiSoftCallback = {
     {5, NULL, init, init_record, NULL},
     read_bi
 };

modules/database/src/std/dev/devBiSoftRaw.c

@@ -25,28 +25,19 @@
 #include "epicsExport.h"
 
 /* Create the dset for devBiSoftRaw */
-static long init_record(biRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long read_bi(biRecord *prec);
 
-struct {
-    long      number;
-    DEVSUPFUN report;
-    DEVSUPFUN init;
-    DEVSUPFUN init_record;
-    DEVSUPFUN get_ioint_info;
-    DEVSUPFUN read_bi;
-} devBiSoftRaw = {
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+bidset devBiSoftRaw = {
+    {5, NULL, NULL, init_record, NULL},
     read_bi
 };
 epicsExportAddress(dset, devBiSoftRaw);
 
-static long init_record(biRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+	biRecord *prec = (biRecord *)pcommon;
+
     recGblInitConstantLink(&prec->inp, DBF_ULONG, &prec->rval);
 
     return 0;

modules/database/src/std/dev/devBoDbState.c

@@ -67,20 +67,9 @@ static long write_bo(boRecord *prec)
     return 0;
 }
 
-static struct {
-        long		number;
-        DEVSUPFUN	report;
-        DEVSUPFUN	init;
-        DEVSUPFUN	init_record;
-        DEVSUPFUN	get_ioint_info;
-        DEVSUPFUN	write_bo;
-} devBoDbState = {
-        5,
-        NULL,
-        init,
-        NULL,
-        NULL,
-        write_bo
+/* Create the dset for devBoDbState */
+bodset devBoDbState = {
+    {5, NULL, init, NULL, NULL},
+    write_bo
 };
-
 epicsExportAddress(dset, devBoDbState);

modules/database/src/std/dev/devBoSoft.c

@@ -29,31 +29,19 @@
 #include "boRecord.h"
 #include "epicsExport.h"
 
-static long init_record(boRecord *prec);
-
 /* Create the dset for devBoSoft */
+static long init_record(dbCommon *pcommon);
 static long write_bo(boRecord *prec);
 
-struct {
-	long		number;
-	DEVSUPFUN	report;
-	DEVSUPFUN	init;
-	DEVSUPFUN	init_record;
-	DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	write_bo;
-}devBoSoft={
-	5,
-	NULL,
-	NULL,
-	init_record,
-	NULL,
-	write_bo
+bodset devBoSoft = {
+    {5, NULL, NULL, init_record, NULL},
+    write_bo
 };
-epicsExportAddress(dset,devBoSoft);
-
-static long init_record(boRecord *prec)
+epicsExportAddress(dset, devBoSoft);
+
+static long init_record(dbCommon *pcommon)
 {
- 
+   boRecord *prec = (boRecord *)pcommon;
    long status=0;
  
     /* dont convert */

modules/database/src/std/dev/devBoSoftCallback.c

@@ -31,22 +31,11 @@
 /* Create the dset for devBoCallbackSoft */
 static long write_bo(boRecord *prec);
 
-struct {
-	long		number;
-	DEVSUPFUN	report;
-	DEVSUPFUN	init;
-	DEVSUPFUN	init_record;
-	DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	write_bo;
-}devBoSoftCallback={
-	5,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	write_bo
+bodset devBoSoftCallback = {
+    {5, NULL, NULL, NULL, NULL},
+    write_bo
 };
-epicsExportAddress(dset,devBoSoftCallback);
+epicsExportAddress(dset, devBoSoftCallback);
 
 static long write_bo(boRecord *prec)
 {
@@ -64,4 +53,3 @@ static long write_bo(boRecord *prec)
 
     return status;
 }
-

modules/database/src/std/dev/devBoSoftRaw.c

@@ -28,30 +28,17 @@
 #include "boRecord.h"
 #include "epicsExport.h"
 
-/* added for Channel Access Links */
-static long init_record(boRecord *prec);
-
 /* Create the dset for devBoSoftRaw */
+static long init_record(dbCommon *pcommon);
 static long write_bo(boRecord *prec);
 
-struct {
-	long		number;
-	DEVSUPFUN	report;
-	DEVSUPFUN	init;
-	DEVSUPFUN	init_record;
-	DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	write_bo;
-}devBoSoftRaw={
-	5,
-	NULL,
-	NULL,
-	init_record,
-	NULL,
-	write_bo
+bodset devBoSoftRaw = {
+    {5, NULL, NULL, init_record, NULL},
+    write_bo
 };
-epicsExportAddress(dset,devBoSoftRaw);
-
-static long init_record(boRecord *prec)
+epicsExportAddress(dset, devBoSoftRaw);
+
+static long init_record(dbCommon *pcommon)
 {
     long status;
     

modules/database/src/std/dev/devCalcoutSoft.c

@@ -31,15 +31,9 @@
 
 static long write_calcout(calcoutRecord *prec);
 
-struct {
-    long	number;
-    DEVSUPFUN	report;
-    DEVSUPFUN	init;
-    DEVSUPFUN	init_record;
-    DEVSUPFUN	get_ioint_info;
-    DEVSUPFUN	write;
-} devCalcoutSoft = {
-    5, NULL, NULL, NULL, NULL, write_calcout
+calcoutdset devCalcoutSoft = {
+    {5, NULL, NULL, NULL, NULL},
+    write_calcout
 };
 epicsExportAddress(dset, devCalcoutSoft);
 

modules/database/src/std/dev/devCalcoutSoftCallback.c

@@ -31,15 +31,9 @@
 
 static long write_calcout(calcoutRecord *prec);
 
-struct {
-    long	number;
-    DEVSUPFUN	report;
-    DEVSUPFUN	init;
-    DEVSUPFUN	init_record;
-    DEVSUPFUN	get_ioint_info;
-    DEVSUPFUN	write;
-} devCalcoutSoftCallback = {
-    5, NULL, NULL, NULL, NULL, write_calcout
+calcoutdset devCalcoutSoftCallback = {
+    {5, NULL, NULL, NULL, NULL},
+    write_calcout
 };
 epicsExportAddress(dset, devCalcoutSoftCallback);
 

modules/database/src/std/dev/devEnviron.c

@@ -119,10 +119,8 @@ static long read_stringin(stringinRecord *prec)
     return 0;
 }
 
-static struct {
-    dset common;
-    DEVSUPFUN read;
-} devSiEnviron = {
-    {5, NULL, init_stringin, NULL, NULL}, read_stringin
+stringindset devSiEnviron = {
+    {5, NULL, init_stringin, NULL, NULL},
+    read_stringin
 };
 epicsExportAddress(dset, devSiEnviron);

modules/database/src/std/dev/devGeneralTime.c

@@ -150,15 +150,14 @@ static long write_bo(boRecord *prec)
     return 0;
 }
 
-struct {
-    dset common;
-    DEVSUPFUN read_write;
-} devBoGeneralTime = {
-    {5, NULL, NULL, init_bo, NULL}, write_bo
+bodset devBoGeneralTime = {
+    {5, NULL, NULL, init_bo, NULL},
+    write_bo
 };
 epicsExportAddress(dset, devBoGeneralTime);
 
 
+
 /******* longin record *************/
 static int errorCount(void)
 {
@@ -209,11 +208,9 @@ static long read_li(longinRecord *prec)
     return 0;
 }
 
-struct {
-    dset common;
-    DEVSUPFUN read_write;
-} devLiGeneralTime = {
-    {5, NULL, NULL, init_li, NULL}, read_li
+longindset devLiGeneralTime = {
+    {5, NULL, NULL, init_li, NULL},
+    read_li
 };
 epicsExportAddress(dset, devLiGeneralTime);
 
@@ -289,10 +286,8 @@ static long read_si(stringinRecord *prec)
     return 0;
 }
 
-struct {
-    dset common;
-    DEVSUPFUN read_write;
-} devSiGeneralTime = {
-    {5, NULL, NULL, init_si, NULL}, read_si
+stringindset devSiGeneralTime = {
+    {5, NULL, NULL, init_si, NULL},
+    read_si
 };
 epicsExportAddress(dset, devSiGeneralTime);

modules/database/src/std/dev/devLiSoft.c

@@ -25,28 +25,19 @@
 #include "epicsExport.h"
 
 /* Create the dset for devLiSoft */
-static long init_record(longinRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long read_longin(longinRecord *prec);
 
-struct {
-    long      number;
-    DEVSUPFUN report;
-    DEVSUPFUN init;
-    DEVSUPFUN init_record;
-    DEVSUPFUN get_ioint_info;
-    DEVSUPFUN read_longin;
-} devLiSoft = {
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+longindset devLiSoft = {
+    {5, NULL, NULL, init_record, NULL},
     read_longin
 };
 epicsExportAddress(dset, devLiSoft);
 
-static long init_record(longinRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+    longinRecord *prec = (longinRecord *)pcommon;
+
     if (recGblInitConstantLink(&prec->inp, DBF_LONG, &prec->val))
         prec->udf = FALSE;
 

modules/database/src/std/dev/devLiSoftCallback.c

@@ -151,8 +151,10 @@ static long init(int pass)
     return 0;
 }
 
-static long init_record(longinRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+    longinRecord *prec = (longinRecord *)pcommon;
+
     if (recGblInitConstantLink(&prec->inp, DBR_LONG, &prec->val))
         prec->udf = FALSE;
 
@@ -204,10 +206,7 @@ static long read_li(longinRecord *prec)
 }
 
 /* Create the dset for devLiSoftCallback */
-struct {
-    dset common;
-    DEVSUPFUN read_li;
-} devLiSoftCallback = {
+longindset devLiSoftCallback = {
     {5, NULL, init, init_record, NULL},
     read_li
 };

modules/database/src/std/dev/devLoSoft.c

@@ -26,26 +26,16 @@
 #include "epicsExport.h"
 
 /* Create the dset for devLoSoft */
-static long init_record(longoutRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long write_longout(longoutRecord *prec);
-struct {
-	long		number;
-	DEVSUPFUN	report;
-	DEVSUPFUN	init;
-	DEVSUPFUN	init_record;
-	DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	write_longout;
-}devLoSoft={
-	5,
-	NULL,
-	NULL,
-	init_record,
-	NULL,
-	write_longout
+
+longoutdset devLoSoft = {
+    {5, NULL, NULL, init_record, NULL},
+    write_longout
 };
-epicsExportAddress(dset,devLoSoft);
-
-static long init_record(longoutRecord *prec)
+epicsExportAddress(dset, devLoSoft);
+
+static long init_record(dbCommon *pcommon)
 {
     return 0;
 } /* end init_record() */

modules/database/src/std/dev/devLoSoftCallback.c

@@ -29,22 +29,12 @@
 
 /* Create the dset for devLoSoftCallback */
 static long write_longout(longoutRecord *prec);
-struct {
-	long		number;
-	DEVSUPFUN	report;
-	DEVSUPFUN	init;
-	DEVSUPFUN	init_record;
-	DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	write_longout;
-}devLoSoftCallback={
-	5,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	write_longout
+
+longoutdset devLoSoftCallback = {
+    {5, NULL, NULL, NULL, NULL},
+    write_longout
 };
-epicsExportAddress(dset,devLoSoftCallback);
+epicsExportAddress(dset, devLoSoftCallback);
 
 static long write_longout(longoutRecord	*prec)
 {
@@ -62,4 +52,3 @@ static long write_longout(longoutRecord	*prec)
 
     return status;
 }
-

modules/database/src/std/dev/devMbbiDirectSoft.c

@@ -25,28 +25,19 @@
 #include "epicsExport.h"
 
 /* Create the dset for devMbbiDirectSoft */
-static long init_record(mbbiDirectRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long read_mbbi(mbbiDirectRecord *prec);
 
-struct {
-    long      number;
-    DEVSUPFUN report;
-    DEVSUPFUN init;
-    DEVSUPFUN init_record;
-    DEVSUPFUN get_ioint_info;
-    DEVSUPFUN read_mbbi;
-} devMbbiDirectSoft = {
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+mbbidirectdset devMbbiDirectSoft = {
+    {5, NULL, NULL, init_record, NULL},
     read_mbbi
 };
 epicsExportAddress(dset, devMbbiDirectSoft);
 
-static long init_record(mbbiDirectRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+	mbbiDirectRecord *prec = (mbbiDirectRecord *)pcommon;
+
     if (recGblInitConstantLink(&prec->inp, DBR_ULONG, &prec->val))
         prec->udf = FALSE;
 

modules/database/src/std/dev/devMbbiDirectSoftCallback.c

@@ -151,8 +151,10 @@ static long init(int pass)
     return 0;
 }
 
-static long init_record(mbbiDirectRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+	mbbiDirectRecord *prec = (mbbiDirectRecord *)pcommon;
+
     if (recGblInitConstantLink(&prec->inp, DBR_ULONG, &prec->val))
         prec->udf = FALSE;
 
@@ -204,10 +206,7 @@ static long read_mbbiDirect(mbbiDirectRecord *prec)
 }
 
 /* Create the dset for devMbbiDirectSoftCallback */
-struct {
-    dset common;
-    DEVSUPFUN read_mbbiDirect;
-} devMbbiDirectSoftCallback = {
+mbbidirectdset devMbbiDirectSoftCallback = {
     {5, NULL, init, init_record, NULL},
     read_mbbiDirect
 };

modules/database/src/std/dev/devMbbiDirectSoftRaw.c

@@ -25,28 +25,19 @@
 #include "epicsExport.h"
 
 /* Create the dset for devMbbiDirectSoftRaw */
-static long init_record(mbbiDirectRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long read_mbbi(mbbiDirectRecord *prec);
 
-struct {
-    long      number;
-    DEVSUPFUN report;
-    DEVSUPFUN init;
-    DEVSUPFUN init_record;
-    DEVSUPFUN get_ioint_info;
-    DEVSUPFUN read_mbbi;
-} devMbbiDirectSoftRaw = {
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+mbbidirectdset devMbbiDirectSoftRaw = {
+    {5, NULL, NULL, init_record, NULL},
     read_mbbi
 };
 epicsExportAddress(dset, devMbbiDirectSoftRaw);
 
-static long init_record(mbbiDirectRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+	mbbiDirectRecord *prec = (mbbiDirectRecord *)pcommon;
+
     recGblInitConstantLink(&prec->inp, DBF_ULONG, &prec->rval);
 
     /* Preserve old functionality */

modules/database/src/std/dev/devMbbiSoft.c

@@ -25,28 +25,19 @@
 #include "epicsExport.h"
 
 /* Create the dset for devMbbiSoft */
-static long init_record(mbbiRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long read_mbbi(mbbiRecord *prec);
 
-struct {
-    long      number;
-    DEVSUPFUN report;
-    DEVSUPFUN init;
-    DEVSUPFUN init_record;
-    DEVSUPFUN get_ioint_info;
-    DEVSUPFUN read_mbbi;
-} devMbbiSoft = {
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+mbbidset devMbbiSoft = {
+    {5, NULL, NULL, init_record, NULL},
     read_mbbi
 };
 epicsExportAddress(dset, devMbbiSoft);
 
-static long init_record(mbbiRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+	mbbiRecord *prec = (mbbiRecord *)pcommon;
+
     if (recGblInitConstantLink(&prec->inp, DBF_ENUM, &prec->val))
         prec->udf = FALSE;
 

modules/database/src/std/dev/devMbbiSoftCallback.c

@@ -151,8 +151,10 @@ static long init(int pass)
     return 0;
 }
 
-static long init_record(mbbiRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+	mbbiRecord *prec = (mbbiRecord *)pcommon;
+
     if (recGblInitConstantLink(&prec->inp, DBR_ENUM, &prec->val))
         prec->udf = FALSE;
 
@@ -204,11 +206,8 @@ static long read_mbbi(mbbiRecord *prec)
 }
 
 /* Create the dset for devMbbiSoftCallback */
-struct {
-    dset common;
-    DEVSUPFUN read_mbbi;
-} devMbbiSoftCallback = {
+mbbidset devMbbiSoftCallback = {
     {5, NULL, init, init_record, NULL},
     read_mbbi
 };
-epicsExportAddress(dset,devMbbiSoftCallback);
+epicsExportAddress(dset, devMbbiSoftCallback);

modules/database/src/std/dev/devMbbiSoftRaw.c

@@ -25,28 +25,19 @@
 #include "epicsExport.h"
 
 /* Create the dset for devMbbiSoftRaw */
-static long init_record(mbbiRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long read_mbbi(mbbiRecord *prec);
 
-struct {
-    long      number;
-    DEVSUPFUN report;
-    DEVSUPFUN init;
-    DEVSUPFUN init_record;
-    DEVSUPFUN get_ioint_info;
-    DEVSUPFUN read_mbbi;
-} devMbbiSoftRaw = {
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+mbbidset devMbbiSoftRaw = {
+    {5, NULL, NULL, init_record, NULL},
     read_mbbi
 };
 epicsExportAddress(dset, devMbbiSoftRaw);
 
-static long init_record(mbbiRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+	mbbiRecord *prec = (mbbiRecord *)pcommon;
+
     recGblInitConstantLink(&prec->inp, DBF_ULONG, &prec->rval);
 
     /* Preserve old functionality*/

modules/database/src/std/dev/devMbboDirectSoft.c

@@ -26,10 +26,7 @@ static long write_mbbo(mbboDirectRecord	*prec)
 }
 
 /* Create the dset for devMbboDirectSoft */
-struct {
-    dset common;
-    DEVSUPFUN write;
-} devMbboDirectSoft = {
+mbbodirectdset devMbboDirectSoft = {
     {5, NULL, NULL, NULL, NULL},
     write_mbbo
 };

modules/database/src/std/dev/devMbboDirectSoftCallback.c

@@ -38,11 +38,8 @@ static long write_mbbo(mbboDirectRecord *prec)
     return status;
 }
 
-/* Create the dset for devMbboSoft */
-struct {
-    dset common;
-    DEVSUPFUN write;
-} devMbboDirectSoftCallback = {
+/* Create the dset for devMbboDirectSoftCallback */
+mbbodirectdset devMbboDirectSoftCallback = {
     {5, NULL, NULL, NULL, NULL},
     write_mbbo
 };

modules/database/src/std/dev/devMbboDirectSoftRaw.c

@@ -20,8 +20,10 @@
 #include "mbboDirectRecord.h"
 #include "epicsExport.h"
 
-static long init_record(mbboDirectRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+	mbboDirectRecord *prec = (mbboDirectRecord *)pcommon;
+
     if (prec->nobt == 0)
         prec->mask = 0xffffffff;
 
@@ -40,10 +42,7 @@ static long write_mbbo(mbboDirectRecord	*prec)
 }
 
 /* Create the dset for devMbboDirectSoftRaw */
-struct {
-    dset common;
-    DEVSUPFUN write;
-} devMbboDirectSoftRaw = {
+mbbodirectdset devMbboDirectSoftRaw = {
     {5, NULL, NULL, init_record, NULL},
     write_mbbo
 };

modules/database/src/std/dev/devMbboSoft.c

@@ -27,26 +27,16 @@
 #include "epicsExport.h"
 
 /* Create the dset for devMbboSoft */
-static long init_record(mbboRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long write_mbbo(mbboRecord *prec);
-struct {
-	long		number;
-	DEVSUPFUN	report;
-	DEVSUPFUN	init;
-	DEVSUPFUN	init_record;
-	DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	write_mbbo;
-}devMbboSoft={
-	5,
-	NULL,
-	NULL,
-	init_record,
-	NULL,
-	write_mbbo
+
+mbbodset devMbboSoft = {
+    {5, NULL, NULL, init_record, NULL},
+    write_mbbo
 };
-epicsExportAddress(dset,devMbboSoft);
-
-static long init_record(mbboRecord *prec)
+epicsExportAddress(dset, devMbboSoft);
+
+static long init_record(dbCommon *pcommon)
 {
     /*dont convert*/
     return 2;

modules/database/src/std/dev/devMbboSoftCallback.c

@@ -28,22 +28,12 @@
 
 /* Create the dset for devMbboSoftCallback */
 static long write_mbbo(mbboRecord *prec);
-struct {
-	long		number;
-	DEVSUPFUN	report;
-	DEVSUPFUN	init;
-	DEVSUPFUN	init_record;
-	DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	write_mbbo;
-}devMbboSoftCallback={
-	5,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	write_mbbo
+
+mbbodset devMbboSoftCallback = {
+    {5, NULL, NULL, NULL, NULL},
+    write_mbbo
 };
-epicsExportAddress(dset,devMbboSoftCallback);
+epicsExportAddress(dset, devMbboSoftCallback);
 
 static long write_mbbo(mbboRecord *prec)
 {

modules/database/src/std/dev/devMbboSoftRaw.c

@@ -20,8 +20,10 @@
 #include "mbboRecord.h"
 #include "epicsExport.h"
 
-static long init_record(mbboRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+    mbboRecord *prec = (mbboRecord *)pcommon;
+
     if (prec->nobt == 0)
         prec->mask = 0xffffffff;
 
@@ -40,10 +42,7 @@ static long write_mbbo(mbboRecord *prec)
 }
 
 /* Create the dset for devMbboSoftRaw */
-struct {
-    dset common;
-    DEVSUPFUN write;
-} devMbboSoftRaw = {
+mbbodset devMbboSoftRaw = {
     {5, NULL, NULL, init_record, NULL},
     write_mbbo
 };

modules/database/src/std/dev/devSASoft.c

@@ -26,22 +26,11 @@
 #include "epicsExport.h"
 
 /* Create the dset for devSASoft */
-static long init_record(subArrayRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long read_sa(subArrayRecord *prec);
 
-struct {
-    long      number;
-    DEVSUPFUN report;
-    DEVSUPFUN init;
-    DEVSUPFUN init_record;
-    DEVSUPFUN get_ioint_info;
-    DEVSUPFUN read_sa;
-} devSASoft = {
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+sadset devSASoft = {
+    {5, NULL, NULL, init_record, NULL},
     read_sa
 };
 epicsExportAddress(dset, devSASoft);
@@ -65,8 +54,9 @@ static void subset(subArrayRecord *prec, long nRequest)
     prec->udf = FALSE;
 }
 
-static long init_record(subArrayRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+    subArrayRecord *prec = (subArrayRecord *)pcommon;
     long nRequest = prec->indx + prec->nelm;
     long status;
 

modules/database/src/std/dev/devSiSoft.c

@@ -27,28 +27,19 @@
 #include "epicsExport.h"
 
 /* Create the dset for devSiSoft */
-static long init_record(stringinRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long read_stringin(stringinRecord *prec);
 
-struct {
-    long      number;
-    DEVSUPFUN report;
-    DEVSUPFUN init;
-    DEVSUPFUN init_record;
-    DEVSUPFUN get_ioint_info;
-    DEVSUPFUN read_stringin;
-} devSiSoft = {
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+stringindset devSiSoft = {
+    {5, NULL, NULL, init_record, NULL},
     read_stringin
 };
 epicsExportAddress(dset, devSiSoft);
 
-static long init_record(stringinRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+    stringinRecord *prec = (stringinRecord *)pcommon;
+
     if (recGblInitConstantLink(&prec->inp, DBF_STRING, prec->val))
         prec->udf = FALSE;
 

modules/database/src/std/dev/devSiSoftCallback.c

@@ -153,8 +153,10 @@ static long init(int pass)
     return 0;
 }
 
-static long init_record(stringinRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+    stringinRecord *prec = (stringinRecord *)pcommon;
+
     if (recGblInitConstantLink(&prec->inp, DBR_STRING, &prec->val))
         prec->udf = FALSE;
 
@@ -207,11 +209,8 @@ static long read_si(stringinRecord *prec)
 }
 
 /* Create the dset for devSiSoftCallback */
-struct {
-    dset common;
-    DEVSUPFUN read_li;
-} devSiSoftCallback = {
+stringindset devSiSoftCallback = {
     {5, NULL, init, init_record, NULL},
     read_si
 };
-epicsExportAddress(dset,devSiSoftCallback);
+epicsExportAddress(dset, devSiSoftCallback);

modules/database/src/std/dev/devSoSoft.c

@@ -27,19 +27,9 @@
 
 /* Create the dset for devSoSoft */
 static long write_stringout(stringoutRecord *prec);
-struct {
-    long        number;
-    DEVSUPFUN   report;
-    DEVSUPFUN   init;
-    DEVSUPFUN   init_record;
-    DEVSUPFUN   get_ioint_info;
-    DEVSUPFUN   write_stringout;
-} devSoSoft = {
-    5,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
+
+stringoutdset devSoSoft = {
+    {5, NULL, NULL, NULL, NULL},
     write_stringout
 };
 epicsExportAddress(dset, devSoSoft);

modules/database/src/std/dev/devSoSoftCallback.c

@@ -27,19 +27,9 @@
 
 /* Create the dset for devSoSoftCallback */
 static long write_stringout(stringoutRecord *prec);
-struct {
-    long        number;
-    DEVSUPFUN   report;
-    DEVSUPFUN   init;
-    DEVSUPFUN   init_record;
-    DEVSUPFUN   get_ioint_info;
-    DEVSUPFUN   write_stringout;
-} devSoSoftCallback = {
-    5,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
+
+stringoutdset devSoSoftCallback = {
+    {5, NULL, NULL, NULL, NULL},
     write_stringout
 };
 epicsExportAddress(dset, devSoSoftCallback);
@@ -60,4 +50,3 @@ static long write_stringout(stringoutRecord *prec)
 
     return status;
 }
-

modules/database/src/std/dev/devStdio.c

@@ -202,10 +202,8 @@ static long write_stringout(stringoutRecord *prec)
     return 0;
 }
 
-static struct {
-    dset common;
-    DEVSUPFUN write;
-} devSoStdio = {
-    {5, NULL, init_stringout, NULL, NULL}, write_stringout
+stringoutdset devSoStdio = {
+    {5, NULL, init_stringout, NULL, NULL},
+    write_stringout
 };
 epicsExportAddress(dset, devSoStdio);

modules/database/src/std/dev/devTimestamp.c

@@ -65,10 +65,7 @@ static long read_stringin (stringinRecord *prec)
     return 0;
 }
 
-struct {
-    dset common;
-    DEVSUPFUN read_stringin;
-} devTimestampSI = {
+stringindset devTimestampSI = {
     {5, NULL, initAllow, NULL, NULL},
     read_stringin
 };

modules/database/src/std/dev/devWfSoft.c

@@ -26,28 +26,18 @@
 #include "epicsExport.h"
 
 /* Create the dset for devWfSoft */
-static long init_record(waveformRecord *prec);
+static long init_record(dbCommon *pcommon);
 static long read_wf(waveformRecord *prec);
 
-struct {
-    long      number;
-    DEVSUPFUN report;
-    DEVSUPFUN init;
-    DEVSUPFUN init_record;
-    DEVSUPFUN get_ioint_info;
-    DEVSUPFUN read_wf;
-} devWfSoft = {
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+wfdset devWfSoft = {
+    {5, NULL, NULL, init_record, NULL},
     read_wf
 };
 epicsExportAddress(dset, devWfSoft);
 
-static long init_record(waveformRecord *prec)
+static long init_record(dbCommon *pcommon)
 {
+    waveformRecord *prec = (waveformRecord *)pcommon;
     long nelm = prec->nelm;
     long status = dbLoadLinkArray(&prec->inp, prec->ftvl, prec->bptr, &nelm);