epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

dbCa: make private all functions which assume CA_LINK is really dbCa

Browse Source
This commit is contained in:
Michael Davidsaver
2016-03-24 14:41:43 -04:00
parent 29afb88006
commit cb35889a20
13 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ioc/db/dbCa.h
+2 -1
View File
@@ -20,6 +20,8 @@ extern "C" {
typedef void (*dbCaCallback)(void *userPvt);
epicsShareFunc void dbCaCallbackProcess(void *usrPvt);
#ifdef EPICS_DBCA_PRIVATE_API
epicsShareFunc void dbCaLinkInit(void); /* internal initialization for iocBuild() */
epicsShareFunc void dbCaLinkInitIsolated(void); /* internal initialization for iocBuildIsolated() */
epicsShareFunc void dbCaRun(void);
@@ -47,7 +49,6 @@ epicsShareFunc long dbCaPutLink(struct link *plink,short dbrType,
extern struct ca_client_context * dbCaClientContext;
#ifdef EPICS_DBCA_PRIVATE_API
epicsShareFunc void dbCaSync(void);
epicsShareFunc void dbCaReportLink(const struct link *plink, dbLinkReportInfo *pinfo);
epicsShareExtern void (*dbAddLinkHook)(struct link *link, short dbfType);
src/ioc/db/dbLink.c
+1
View File
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <string.h>
#define EPICS_DBCA_PRIVATE_API
#include "alarm.h"
#include "cantProceed.h"
#include "cvtFast.h"
src/ioc/db/test/dbCaLinkTest.c
+1
View File
@@ -13,6 +13,7 @@
#include <string.h>
#include <math.h>
#define EPICS_DBCA_PRIVATE_API
#include "epicsString.h"
#include "dbUnitTest.h"
#include "epicsThread.h"
src/ioc/misc/iocInit.c
+1
View File
@@ -23,6 +23,7 @@
#include <errno.h>
#include <limits.h>
#define EPICS_DBCA_PRIVATE_API
#include "dbDefs.h"
#include "ellLib.h"
#include "envDefs.h"
src/std/dev/devAoSoftCallback.c
+2 -1
View File
@@ -17,6 +17,7 @@
#include <stdio.h>
#include <string.h>
#define EPICS_DBCA_PRIVATE_API
#include "alarm.h"
#include "dbDefs.h"
#include "dbAccess.h"
@@ -55,7 +56,7 @@ static long write_ao(aoRecord *prec)
long status;
if(prec->pact) return(0);
if(plink->type!=CA_LINK) {
if(plink->type!=CA_LINK || strcmp(plink->value.pv_link.backend,"ca")!=0) {
status = dbPutLink(plink,DBR_DOUBLE,&prec->oval,1);
return(status);
}
src/std/dev/devBoSoftCallback.c
+2 -1
View File
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <string.h>
#define EPICS_DBCA_PRIVATE_API
#include "alarm.h"
#include "dbDefs.h"
#include "dbLock.h"
@@ -55,7 +56,7 @@ static long write_bo(boRecord *prec)
long status;
if(prec->pact) return(0);
if(plink->type!=CA_LINK) {
if(plink->type!=CA_LINK || strcmp(plink->value.pv_link.backend,"ca")!=0) {
status = dbPutLink(plink,DBR_USHORT,&prec->val,1);
return(status);
}
src/std/dev/devCalcoutSoftCallback.c
+2 -1
View File
@@ -17,6 +17,7 @@
#include <stdio.h>
#include <string.h>
#define EPICS_DBCA_PRIVATE_API
#include "alarm.h"
#include "dbDefs.h"
#include "dbAccess.h"
@@ -49,7 +50,7 @@ static long write_calcout(calcoutRecord *prec)
long status;
if (prec->pact) return 0;
if (plink->type != CA_LINK) {
if (plink->type != CA_LINK || strcmp(plink->value.pv_link.backend,"ca")!=0) {
status = dbPutLink(plink, DBR_DOUBLE, &prec->oval, 1);
return status;
}
src/std/dev/devLoSoftCallback.c
+2 -1
View File
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <string.h>
#define EPICS_DBCA_PRIVATE_API
#include "alarm.h"
#include "dbDefs.h"
#include "dbAccess.h"
@@ -52,7 +53,7 @@ static long write_longout(longoutRecord *prec)
long status;
if(prec->pact) return(0);
if(plink->type!=CA_LINK) {
if(plink->type!=CA_LINK || strcmp(plink->value.pv_link.backend,"ca")!=0) {
status = dbPutLink(plink,DBR_LONG,&prec->val,1);
return(status);
}
src/std/dev/devLsoSoftCallback.c
+4 -1
View File
@@ -10,6 +10,9 @@
* Date: 30 Nov 2012
*/
#include <string.h>
#define EPICS_DBCA_PRIVATE_API
#include "alarm.h"
#include "dbAccess.h"
#include "recGbl.h"
@@ -31,7 +34,7 @@ static long write_string(lsoRecord *prec)
len = 1;
}
if (plink->type != CA_LINK)
if (plink->type != CA_LINK || strcmp(plink->value.pv_link.backend,"ca")!=0)
return dbPutLink(plink, dtyp, prec->val, len);
status = dbCaPutLinkCallback(plink, dtyp, prec->val, len,
src/std/dev/devMbboDirectSoftCallback.c
+3 -1
View File
@@ -13,7 +13,9 @@
*/
#include <stdio.h>
#include <string.h>
#define EPICS_DBCA_PRIVATE_API
#include "alarm.h"
#include "dbAccess.h"
#include "recGbl.h"
@@ -29,7 +31,7 @@ static long write_mbbo(mbboDirectRecord *prec)
if (prec->pact)
return 0;
if (plink->type != CA_LINK) {
if (plink->type != CA_LINK || strcmp(plink->value.pv_link.backend,"ca")!=0) {
status = dbPutLink(plink, DBR_USHORT, &prec->val, 1);
return status;
}
src/std/dev/devMbboSoftCallback.c
+2 -1
View File
@@ -17,6 +17,7 @@
#include <stdio.h>
#include <string.h>
#define EPICS_DBCA_PRIVATE_API
#include "alarm.h"
#include "dbDefs.h"
#include "dbAccess.h"
@@ -51,7 +52,7 @@ static long write_mbbo(mbboRecord *prec)
long status;
if(prec->pact) return(0);
if(plink->type!=CA_LINK) {
if(plink->type!=CA_LINK || strcmp(plink->value.pv_link.backend,"ca")!=0) {
status = dbPutLink(plink,DBR_USHORT,&prec->val,1);
return(status);
}
src/std/dev/devPrintfSoftCallback.c
+4 -1
View File
@@ -10,6 +10,9 @@
* Date: 28 Sept 2012
*/
#include <string.h>
#define EPICS_DBCA_PRIVATE_API
#include "alarm.h"
#include "dbAccess.h"
#include "recGbl.h"
@@ -31,7 +34,7 @@ static long write_string(printfRecord *prec)
len = 1;
}
if (plink->type != CA_LINK)
if (plink->type != CA_LINK || strcmp(plink->value.pv_link.backend,"ca")!=0)
return dbPutLink(plink, dtyp, prec->val, len);
status = dbCaPutLinkCallback(plink, dtyp, prec->val, len,
src/std/dev/devSoSoftCallback.c
+2 -1
View File
@@ -17,6 +17,7 @@
#include <stdio.h>
#include <string.h>
#define EPICS_DBCA_PRIVATE_API
#include "alarm.h"
#include "dbDefs.h"
#include "dbAccess.h"
@@ -52,7 +53,7 @@ static long write_stringout(stringoutRecord *prec)
if (prec->pact) return 0;
if (plink->type != CA_LINK) {
if (plink->type != CA_LINK || strcmp(plink->value.pv_link.backend,"ca")!=0) {
return dbPutLink(plink, DBR_STRING, &prec->val, 1);
}