From 7e293e60a6e9b92adea494403ca6159a2e910ec9 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Tue, 15 May 2018 16:54:46 +0200
Subject: [PATCH] std/dev,std/rec: treat val/sval/rval as ULONG for
 mbbiDirect/mbboDirect

---
 src/std/dev/devMbbiDirectSoft.c         | 4 ++--
 src/std/dev/devMbbiDirectSoftCallback.c | 4 ++--
 src/std/dev/devMbbiDirectSoftRaw.c      | 2 +-
 src/std/dev/devMbboDirectSoft.c         | 2 +-
 src/std/dev/devMbboDirectSoftCallback.c | 4 ++--
 src/std/rec/mbboDirectRecord.c          | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/std/dev/devMbbiDirectSoft.c b/src/std/dev/devMbbiDirectSoft.c
index 4317ad807..861952f8d 100644
--- a/src/std/dev/devMbbiDirectSoft.c
+++ b/src/std/dev/devMbbiDirectSoft.c
@@ -47,7 +47,7 @@ epicsExportAddress(dset, devMbbiDirectSoft);
 
 static long init_record(mbbiDirectRecord *prec)
 {
-    if (recGblInitConstantLink(&prec->inp, DBR_LONG, &prec->val))
+    if (recGblInitConstantLink(&prec->inp, DBR_ULONG, &prec->val))
         prec->udf = FALSE;
 
     return 0;
@@ -56,7 +56,7 @@ static long init_record(mbbiDirectRecord *prec)
 static long readLocked(struct link *pinp, void *dummy)
 {
     mbbiDirectRecord *prec = (mbbiDirectRecord *) pinp->precord;
-    long status = dbGetLink(pinp, DBR_LONG, &prec->val, 0, 0);
+    long status = dbGetLink(pinp, DBR_ULONG, &prec->val, 0, 0);
 
     if (status) return status;
 
diff --git a/src/std/dev/devMbbiDirectSoftCallback.c b/src/std/dev/devMbbiDirectSoftCallback.c
index c4c83f6c2..d785f7386 100644
--- a/src/std/dev/devMbbiDirectSoftCallback.c
+++ b/src/std/dev/devMbbiDirectSoftCallback.c
@@ -58,7 +58,7 @@ static void getCallback(processNotify *ppn, notifyGetType type)
     }
 
     assert(type == getFieldType);
-    pdevPvt->status = dbChannelGetField(ppn->chan, DBR_LONG,
+    pdevPvt->status = dbChannelGetField(ppn->chan, DBR_ULONG,
         &pdevPvt->buffer, &pdevPvt->options, &no_elements, 0);
 }
 
@@ -153,7 +153,7 @@ static long init(int pass)
 
 static long init_record(mbbiDirectRecord *prec)
 {
-    if (recGblInitConstantLink(&prec->inp, DBR_LONG, &prec->val))
+    if (recGblInitConstantLink(&prec->inp, DBR_ULONG, &prec->val))
         prec->udf = FALSE;
 
     return 0;
diff --git a/src/std/dev/devMbbiDirectSoftRaw.c b/src/std/dev/devMbbiDirectSoftRaw.c
index f6172cdec..98b4673fc 100644
--- a/src/std/dev/devMbbiDirectSoftRaw.c
+++ b/src/std/dev/devMbbiDirectSoftRaw.c
@@ -59,7 +59,7 @@ static long init_record(mbbiDirectRecord *prec)
 
 static long read_mbbi(mbbiDirectRecord *prec)
 {
-    if (!dbGetLink(&prec->inp, DBR_LONG, &prec->rval, 0, 0)) {
+    if (!dbGetLink(&prec->inp, DBR_ULONG, &prec->rval, 0, 0)) {
         prec->rval &= prec->mask;
         if (dbLinkIsConstant(&prec->tsel) &&
             prec->tse == epicsTimeEventDeviceTime)
diff --git a/src/std/dev/devMbboDirectSoft.c b/src/std/dev/devMbboDirectSoft.c
index ebf63a9f8..75359f283 100644
--- a/src/std/dev/devMbboDirectSoft.c
+++ b/src/std/dev/devMbboDirectSoft.c
@@ -21,7 +21,7 @@
 
 static long write_mbbo(mbboDirectRecord	*prec)
 {
-    dbPutLink(&prec->out, DBR_LONG, &prec->val, 1);
+    dbPutLink(&prec->out, DBR_ULONG, &prec->val, 1);
     return 0;
 }
 
diff --git a/src/std/dev/devMbboDirectSoftCallback.c b/src/std/dev/devMbboDirectSoftCallback.c
index 98aa7bb01..6d86507ae 100644
--- a/src/std/dev/devMbboDirectSoftCallback.c
+++ b/src/std/dev/devMbboDirectSoftCallback.c
@@ -29,11 +29,11 @@ static long write_mbbo(mbboDirectRecord *prec)
     if (prec->pact)
         return 0;
 
-    status = dbPutLinkAsync(plink, DBR_LONG, &prec->val, 1);
+    status = dbPutLinkAsync(plink, DBR_ULONG, &prec->val, 1);
     if (!status)
         prec->pact = TRUE;
     else if (status == S_db_noLSET)
-        status = dbPutLink(plink, DBR_LONG, &prec->val, 1);
+        status = dbPutLink(plink, DBR_ULONG, &prec->val, 1);
 
     return status;
 }
diff --git a/src/std/rec/mbboDirectRecord.c b/src/std/rec/mbboDirectRecord.c
index ff0747072..eaae38326 100644
--- a/src/std/rec/mbboDirectRecord.c
+++ b/src/std/rec/mbboDirectRecord.c
@@ -351,7 +351,7 @@ static long writeValue(mbboDirectRecord *prec)
 
     case menuYesNoYES:
         recGblSetSevr(prec, SIMM_ALARM, prec->sims);
-        return dbPutLink(&prec->siol, DBR_USHORT, &prec->val, 1);
+        return dbPutLink(&prec->siol, DBR_ULONG, &prec->val, 1);
 
     default:
         recGblSetSevr(prec, SOFT_ALARM, INVALID_ALARM);