From 6e364ace47b7715cb7db05e56e1fa92b9ad8311d Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 29 Apr 2009 18:24:25 +0000
Subject: [PATCH] Changed arg to dbCaCallbackProcess() to make it match
 dbCaCallback. Removed matching unnecessary casts in softDev support routines.

---
 src/db/dbCa.c                               | 3 ++-
 src/db/dbCa.h                               | 2 +-
 src/dev/softDev/devAoSoftCallback.c         | 2 +-
 src/dev/softDev/devBoSoftCallback.c         | 2 +-
 src/dev/softDev/devCalcoutSoftCallback.c    | 2 +-
 src/dev/softDev/devLoSoftCallback.c         | 2 +-
 src/dev/softDev/devMbboDirectSoftCallback.c | 2 +-
 src/dev/softDev/devMbboSoftCallback.c       | 2 +-
 src/dev/softDev/devSoSoftCallback.c         | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/db/dbCa.c b/src/db/dbCa.c
index ab6d6de88..6ceb30fe4 100644
--- a/src/db/dbCa.c
+++ b/src/db/dbCa.c
@@ -163,8 +163,9 @@ static void addAction(caLink *pca, short link_action)
         epicsEventSignal(workListEvent);
 }
 
-void dbCaCallbackProcess(struct link *plink)
+void dbCaCallbackProcess(void *usrPvt)
 {
+    struct link *plink = (struct link *)usrPvt;
     dbCommon *pdbCommon = plink->value.pv_link.precord;
 
     dbScanLock(pdbCommon);
diff --git a/src/db/dbCa.h b/src/db/dbCa.h
index 8468fb0dc..ee0fee1ca 100644
--- a/src/db/dbCa.h
+++ b/src/db/dbCa.h
@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 typedef void (*dbCaCallback)(void *userPvt);
-epicsShareFunc void dbCaCallbackProcess(struct link *plink);
+epicsShareFunc void dbCaCallbackProcess(void *usrPvt);
 
 epicsShareFunc void dbCaLinkInit(void);
 epicsShareFunc void dbCaRun(void);
diff --git a/src/dev/softDev/devAoSoftCallback.c b/src/dev/softDev/devAoSoftCallback.c
index b939a1027..35c3f6fe2 100644
--- a/src/dev/softDev/devAoSoftCallback.c
+++ b/src/dev/softDev/devAoSoftCallback.c
@@ -60,7 +60,7 @@ static long write_ao(aoRecord *prec)
         return(status);
     }
     status = dbCaPutLinkCallback(plink,DBR_DOUBLE,&prec->oval,1,
-        (dbCaCallback)dbCaCallbackProcess,plink);
+        dbCaCallbackProcess,plink);
     if(status) {
         recGblSetSevr(prec,LINK_ALARM,INVALID_ALARM);
         return(status);
diff --git a/src/dev/softDev/devBoSoftCallback.c b/src/dev/softDev/devBoSoftCallback.c
index 4fb553f33..4cdb51a29 100644
--- a/src/dev/softDev/devBoSoftCallback.c
+++ b/src/dev/softDev/devBoSoftCallback.c
@@ -60,7 +60,7 @@ static long write_bo(boRecord *prec)
         return(status);
     }
     status = dbCaPutLinkCallback(plink,DBR_USHORT,&prec->val,1,
-        (dbCaCallback)dbCaCallbackProcess,plink);
+        dbCaCallbackProcess,plink);
     if(status) {
         recGblSetSevr(prec,LINK_ALARM,INVALID_ALARM);
         return(status);
diff --git a/src/dev/softDev/devCalcoutSoftCallback.c b/src/dev/softDev/devCalcoutSoftCallback.c
index 894577af7..0552df826 100644
--- a/src/dev/softDev/devCalcoutSoftCallback.c
+++ b/src/dev/softDev/devCalcoutSoftCallback.c
@@ -54,7 +54,7 @@ static long write_calcout(calcoutRecord *prec)
         return status;
     }
     status = dbCaPutLinkCallback(plink, DBR_DOUBLE, &prec->oval, 1,
-        (dbCaCallback)dbCaCallbackProcess, plink);
+        dbCaCallbackProcess, plink);
     if (status) {
         recGblSetSevr(prec, LINK_ALARM, INVALID_ALARM);
         return status;
diff --git a/src/dev/softDev/devLoSoftCallback.c b/src/dev/softDev/devLoSoftCallback.c
index b2d351f3a..2bc4a7e46 100644
--- a/src/dev/softDev/devLoSoftCallback.c
+++ b/src/dev/softDev/devLoSoftCallback.c
@@ -57,7 +57,7 @@ static long write_longout(longoutRecord	*prec)
         return(status);
     }
     status = dbCaPutLinkCallback(plink,DBR_LONG,&prec->val,1,
-        (dbCaCallback)dbCaCallbackProcess,plink);
+        dbCaCallbackProcess,plink);
     if(status) {
         recGblSetSevr(prec,LINK_ALARM,INVALID_ALARM);
         return(status);
diff --git a/src/dev/softDev/devMbboDirectSoftCallback.c b/src/dev/softDev/devMbboDirectSoftCallback.c
index 17a0e7b9f..c5639d4f5 100644
--- a/src/dev/softDev/devMbboDirectSoftCallback.c
+++ b/src/dev/softDev/devMbboDirectSoftCallback.c
@@ -56,7 +56,7 @@ static long write_mbbo(mbboDirectRecord	*prec)
         return(status);
     }
     status = dbCaPutLinkCallback(plink,DBR_USHORT,&prec->val,1,
-        (dbCaCallback)dbCaCallbackProcess,plink);
+        dbCaCallbackProcess,plink);
     if(status) {
         recGblSetSevr(prec,LINK_ALARM,INVALID_ALARM);
         return(status);
diff --git a/src/dev/softDev/devMbboSoftCallback.c b/src/dev/softDev/devMbboSoftCallback.c
index 5f39af0a8..705308163 100644
--- a/src/dev/softDev/devMbboSoftCallback.c
+++ b/src/dev/softDev/devMbboSoftCallback.c
@@ -56,7 +56,7 @@ static long write_mbbo(mbboRecord *prec)
         return(status);
     }
     status = dbCaPutLinkCallback(plink,DBR_USHORT,&prec->val,1,
-        (dbCaCallback)dbCaCallbackProcess,plink);
+        dbCaCallbackProcess,plink);
     if(status) {
         recGblSetSevr(prec,LINK_ALARM,INVALID_ALARM);
         return(status);
diff --git a/src/dev/softDev/devSoSoftCallback.c b/src/dev/softDev/devSoSoftCallback.c
index 0d7bbf65f..723314047 100644
--- a/src/dev/softDev/devSoSoftCallback.c
+++ b/src/dev/softDev/devSoSoftCallback.c
@@ -57,7 +57,7 @@ static long write_stringout(stringoutRecord *prec)
     }
 
     status = dbCaPutLinkCallback(plink, DBR_STRING, &prec->val, 1,
-        (dbCaCallback)dbCaCallbackProcess, plink);
+        dbCaCallbackProcess, plink);
     if (status) {
         recGblSetSevr(prec, LINK_ALARM, INVALID_ALARM);
         return status;