From 186748dc8da5713cd971418656e93ce3e8514e2e Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 29 Feb 2000 19:33:37 +0000 Subject: [PATCH] more changes for win32 build --- src/db/Makefile | 1 + src/db/callback.c | 2 +- src/db/dbAccess.c | 2 +- src/db/dbAccess.h | 245 +++----------------------------------- src/db/dbAccessDefs.h | 252 ++++++++++++++++++++++++++++++++++++++++ src/db/dbBkpt.c | 5 +- src/db/dbConvert.c | 2 +- src/db/dbEvent.c | 2 +- src/db/dbFastLinkConv.c | 2 +- src/db/dbLock.c | 2 +- src/db/dbNotify.c | 2 +- src/db/dbScan.c | 2 +- src/db/dbTest.c | 2 +- src/db/db_access.c | 2 +- src/db/recGbl.c | 2 +- 15 files changed, 281 insertions(+), 244 deletions(-) create mode 100644 src/db/dbAccessDefs.h diff --git a/src/db/Makefile b/src/db/Makefile index a756147a5..ad0f52314 100644 --- a/src/db/Makefile +++ b/src/db/Makefile @@ -5,6 +5,7 @@ include $(TOP)/configure/CONFIG # INC += callback.h INC += dbAccess.h +INC += dbCa.h INC += dbAddr.h INC += dbBkpt.h INC += dbConvert.h diff --git a/src/db/callback.c b/src/db/callback.c index da0b9043a..a246adcc5 100644 --- a/src/db/callback.c +++ b/src/db/callback.c @@ -35,7 +35,7 @@ of this distribution. #include "dbCommon.h" #define epicsExportSharedSymbols #include "dbAddr.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "dbLock.h" #include "callback.h" diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c index fdb87f6c7..b64e9b501 100644 --- a/src/db/dbAccess.c +++ b/src/db/dbAccess.c @@ -75,7 +75,7 @@ of this distribution. #include "dbCa.h" #include "dbBkpt.h" #include "dbNotify.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "recGbl.h" extern long lset_stack_not_empty; diff --git a/src/db/dbAccess.h b/src/db/dbAccess.h index c05d0621f..3b2eed660 100644 --- a/src/db/dbAccess.h +++ b/src/db/dbAccess.h @@ -10,243 +10,24 @@ described on the COPYRIGHT_UniversityOfChicago file included as part of this distribution. **********************************************************************/ -/* $Id$ - * - * Original Author: Bob Dalesio - * Current Author: Marty Kraimer - * Date: 6-1-90 - * - * Modification Log: - * ----------------- - * .01 12-18-91 jba Changed caddr_t to void * - * .02 03-04-92 jba Replaced dbr_value_size with dbrValueSize in dbAccess - * .03 05-28-92 mrk cleanup - * .04 08-19-92 jba added prototypes dbCaAddInlink,dbCaAddOutlink - * .05 08-19-92 jba added prototypes dbCaPutLink,dbCaGetLink - * .06 02-02-94 mrk added definitions for dbPutNotify - * .07 03-18-94 mcn added breakpoint codes, fast link protos - */ #ifndef INCdbAccessh #define INCdbAccessh #include "shareLib.h" +#include "dbDefs.h" +#include "tsStamp.h" +#include "dbBase.h" +#include "dbFldTypes.h" +#include "link.h" +#include "caeventmask.h" +#include "dbAddr.h" +#include "dbLock.h" +#include "dbAccess.h" +#include "dbCa.h" +#include "dbCommon.h" +#include "db_field_log.h" +#include "dbAccessDefs.h" -epicsShareExtern struct dbBase *pdbbase; -epicsShareExtern volatile int interruptAccept; - -/* The database field and request types are defined in dbFldTypes.h*/ -/* Data Base Request Options */ -#define DBR_STATUS 0x00000001 -#define DBR_UNITS 0x00000002 -#define DBR_PRECISION 0x00000004 -#define DBR_TIME 0x00000008 -#define DBR_ENUM_STRS 0x00000010 -#define DBR_GR_LONG 0x00000020 -#define DBR_GR_DOUBLE 0x00000040 -#define DBR_CTRL_LONG 0x00000080 -#define DBR_CTRL_DOUBLE 0x00000100 -#define DBR_AL_LONG 0x00000200 -#define DBR_AL_DOUBLE 0x00000400 - -/********************************************************************** - * The next page contains macros for defining requests. - * As an example the following defines a buffer to accept an array - * of 10 float values + DBR_STATUS and DBR_TIME options - * - * struct { - * DBRstatus - * DBRtime - * float value[10] - * } buffer; - * - * IMPORTANT!! The DBRoptions must be given in the order that they - * appear in the Data Base Request Options #defines - * - * The associated dbGetField call is: - * - * long options,number_elements; - * ... - * options = DBR_STATUS|DBR_TIME; - * number_elements = 10; - * rtnval=dbGetField(paddr,DBR_FLOAT,&buffer,&options,&number_elements); - * - * When dbGetField returns: - * rtnval is error status (0 means success) - * options has a bit set for each option that was accepted - * number_elements is actual number of elements obtained - * - * The individual items can be refered to by the expressions:: - * - * buffer.status - * buffer.severity - * buffer.err_status - * buffer.epoch_seconds - * buffer.nano_seconds - * buffer.value[i] - * - * The following is also a valid declaration: - * - * typedef struct { - * DBRstatus - * DBRtime - * float value[10] - * } MYBUFFER; - * - * With this definition you can give definitions such as the following: - * - * MYBUFFER *pbuf1; - * MYBUFFER buf; - *************************************************************************/ - -/* Macros for defining each option */ -#define DBRstatus \ - unsigned short status; /* alarm status */\ - unsigned short severity; /* alarm severity*/\ - unsigned short acks; /* alarm ack severity*/\ - unsigned short ackt; /* Acknowledge transient alarms?*/ -#define DB_UNITS_SIZE 16 -#define DBRunits \ - char units[DB_UNITS_SIZE]; /* units */ -#define DBRprecision \ - long precision; /* number of decimal places*/\ - long field_width; /* field width */ -#define DBRtime \ - TS_STAMP time; /* time stamp*/ -#define DBRenumStrs \ - unsigned long no_str; /* number of strings*/\ - long padenumStrs; /*padding to force 8 byte align*/\ - char strs[DB_MAX_CHOICES][MAX_STRING_SIZE]; /* string values */ -#define DBRgrLong \ - long upper_disp_limit; /*upper limit of graph*/\ - long lower_disp_limit; /*lower limit of graph*/ -#define DBRgrDouble \ - double upper_disp_limit; /*upper limit of graph*/\ - double lower_disp_limit; /*lower limit of graph*/ -#define DBRctrlLong \ - long upper_ctrl_limit; /*upper limit of graph*/\ - long lower_ctrl_limit; /*lower limit of graph*/ -#define DBRctrlDouble \ - double upper_ctrl_limit; /*upper limit of graph*/\ - double lower_ctrl_limit; /*lower limit of graph*/ -#define DBRalLong \ - long upper_alarm_limit;\ - long upper_warning_limit;\ - long lower_warning_limit;\ - long lower_alarm_limit; -#define DBRalDouble \ - double upper_alarm_limit;\ - double upper_warning_limit;\ - double lower_warning_limit;\ - double lower_alarm_limit; - -/* structures for each option type */ -struct dbr_status {DBRstatus}; -struct dbr_units {DBRunits}; -struct dbr_precision {DBRprecision}; -struct dbr_time {DBRtime}; -struct dbr_enumStrs {DBRenumStrs}; -struct dbr_grLong {DBRgrLong}; -struct dbr_grDouble {DBRgrDouble}; -struct dbr_ctrlLong {DBRctrlLong}; -struct dbr_ctrlDouble {DBRctrlDouble}; -struct dbr_alLong {DBRalLong}; -struct dbr_alDouble {DBRalDouble}; -/* sizes for each option structure */ -#define dbr_status_size sizeof(struct dbr_status) -#define dbr_units_size sizeof(struct dbr_units) -#define dbr_precision_size sizeof(struct dbr_precision) -#define dbr_time_size sizeof(struct dbr_time) -#define dbr_enumStrs_size sizeof(struct dbr_enumStrs) -#define dbr_grLong_size sizeof(struct dbr_grLong) -#define dbr_grDouble_size sizeof(struct dbr_grDouble) -#define dbr_ctrlLong_size sizeof(struct dbr_ctrlLong) -#define dbr_ctrlDouble_size sizeof(struct dbr_ctrlDouble) -#define dbr_alLong_size sizeof(struct dbr_alLong) -#define dbr_alDouble_size sizeof(struct dbr_alDouble) - -#ifndef INCerrMdefh -#include "errMdef.h" -#endif -#define S_db_notFound (M_dbAccess| 1) /*Process Variable Not Found*/ -#define S_db_badDbrtype (M_dbAccess| 3) /*Illegal Database Request Type*/ -#define S_db_noMod (M_dbAccess| 5) /*Attempt to modify noMod field*/ -#define S_db_badLset (M_dbAccess| 7) /*Illegal Lock Set*/ -#define S_db_precision (M_dbAccess| 9) /*get precision failed */ -#define S_db_onlyOne (M_dbAccess|11) /*Only one element allowed*/ -#define S_db_badChoice (M_dbAccess|13) /*Illegal choice*/ -#define S_db_badField (M_dbAccess|15) /*Illegal field value*/ -#define S_db_lsetLogic (M_dbAccess|17) /*Logic error generating lock sets*/ -#define S_db_noRSET (M_dbAccess|31) /*missing record support entry table*/ -#define S_db_noSupport (M_dbAccess|33) /*RSET routine not defined*/ -#define S_db_BadSub (M_dbAccess|35) /*Subroutine not found*/ -/*!!!! Do not change next two lines without changing src/rsrv/server.h!!!!!!!!*/ -#define S_db_Pending (M_dbAccess|37) /*Request is pending*/ -#define S_db_Blocked (M_dbAccess|39) /*Request is Blocked*/ -#define S_db_putDisabled (M_dbAccess|41) /*putFields are disabled*/ -#define S_db_bkptSet (M_dbAccess|53) /*Breakpoint already set*/ -#define S_db_bkptNotSet (M_dbAccess|55) /*No breakpoint set in record*/ -#define S_db_notStopped (M_dbAccess|57) /*Record not stopped*/ -#define S_db_errArg (M_dbAccess|59) /*Error in argument*/ -#define S_db_bkptLogic (M_dbAccess|61) /*Logic error in breakpoint routine*/ -#define S_db_cntSpwn (M_dbAccess|63) /*Cannot spawn dbContTask*/ -#define S_db_cntCont (M_dbAccess|65) /*Cannot resume dbContTask*/ - -/* Global Database Access Routines*/ -#define dbGetLink(PLNK,DBRTYPE,PBUFFER,OPTIONS,NREQUEST) \ - (((((PLNK)->type == CONSTANT)&&(!(NREQUEST))) ||\ - (! (((PLNK)->type == DB_LINK) || ((PLNK)->type == CA_LINK)) ))\ - ? 0\ - : dbGetLinkValue((PLNK),(DBRTYPE), \ - (void *)(PBUFFER),(OPTIONS),(NREQUEST))) -#define dbPutLink(PLNK,DBRTYPE,PBUFFER,NREQUEST) \ - ((((PLNK)->type == CONSTANT) ||\ - (! (((PLNK)->type == DB_LINK) || ((PLNK)->type == CA_LINK)) ))\ - ? 0\ - : dbPutLinkValue((PLNK),(DBRTYPE),(void *)(PBUFFER),(NREQUEST))) -#define dbGetPdbAddrFromLink(PLNK) \ - (\ - ((PLNK)->type != DB_LINK) \ - ? 0\ - : (((DBADDR*)((PLNK)->value.pv_link.pvt))) \ - ) - -epicsShareFunc struct rset * epicsShareAPI dbGetRset(struct dbAddr *paddr); -epicsShareFunc long epicsShareAPI dbPutAttribute( - char *recordTypename,char *name,char*value); -epicsShareFunc int epicsShareAPI dbIsValueField(struct dbFldDes *pdbFldDes); -epicsShareFunc int epicsShareAPI dbGetFieldIndex(struct dbAddr *paddr); -epicsShareFunc long epicsShareAPI dbGetNelements( - struct link *plink,long *nelements); -epicsShareFunc int epicsShareAPI dbIsLinkConnected(struct link *plink); -epicsShareFunc int epicsShareAPI dbGetLinkDBFtype(struct link *plink); -epicsShareFunc long epicsShareAPI dbScanLink( - struct dbCommon *pfrom, struct dbCommon *pto); -epicsShareFunc long epicsShareAPI dbScanPassive( - struct dbCommon *pfrom,struct dbCommon *pto); -epicsShareFunc void epicsShareAPI dbScanFwdLink(struct link *plink); -epicsShareFunc long epicsShareAPI dbProcess(struct dbCommon *precord); -epicsShareFunc long epicsShareAPI dbNameToAddr( - const char *pname,struct dbAddr *); -epicsShareFunc long epicsShareAPI dbGetLinkValue( - struct link *,short dbrType,void *pbuffer,long *options,long *nRequest); -epicsShareFunc long epicsShareAPI dbGetField( - struct dbAddr *,short dbrType,void *pbuffer,long *options, - long *nRequest,void *pfl); -epicsShareFunc long epicsShareAPI dbGet( - struct dbAddr *,short dbrType,void *pbuffer,long *options, - long *nRequest,void *pfl); -epicsShareFunc long epicsShareAPI dbPutLinkValue( - struct link *,short dbrType,const void *pbuffer,long nRequest); -epicsShareFunc long epicsShareAPI dbPutField( - struct dbAddr *,short dbrType,const void *pbuffer,long nRequest); -epicsShareFunc long epicsShareAPI dbPut( - struct dbAddr *,short dbrType,const void *pbuffer,long nRequest); -typedef void(*SPC_ASCALLBACK)(struct dbCommon *); -/*dbSpcAsRegisterCallback called by access security */ -epicsShareFunc void epicsShareAPI dbSpcAsRegisterCallback(SPC_ASCALLBACK func); -epicsShareFunc long epicsShareAPI dbBufferSize( - short dbrType,long options,long nRequest); -epicsShareFunc long epicsShareAPI dbValueSize(short dbrType); #endif /*INCdbAccessh*/ diff --git a/src/db/dbAccessDefs.h b/src/db/dbAccessDefs.h new file mode 100644 index 000000000..ba65c84d0 --- /dev/null +++ b/src/db/dbAccessDefs.h @@ -0,0 +1,252 @@ +/* dbAccessDefs.h */ +/***************************************************************** + COPYRIGHT NOTIFICATION +***************************************************************** + +(C) COPYRIGHT 1993 UNIVERSITY OF CHICAGO + +This software was developed under a United States Government license +described on the COPYRIGHT_UniversityOfChicago file included as part +of this distribution. +**********************************************************************/ + +/* $Id$ + * + * Original Author: Bob Dalesio + * Current Author: Marty Kraimer + * Date: 6-1-90 + * + * Modification Log: + * ----------------- + * .01 12-18-91 jba Changed caddr_t to void * + * .02 03-04-92 jba Replaced dbr_value_size with dbrValueSize in dbAccess + * .03 05-28-92 mrk cleanup + * .04 08-19-92 jba added prototypes dbCaAddInlink,dbCaAddOutlink + * .05 08-19-92 jba added prototypes dbCaPutLink,dbCaGetLink + * .06 02-02-94 mrk added definitions for dbPutNotify + * .07 03-18-94 mcn added breakpoint codes, fast link protos + */ + +#ifndef INCdbAccessDefsh +#define INCdbAccessDefsh + +#include "shareLib.h" + +epicsShareExtern struct dbBase *pdbbase; +epicsShareExtern volatile int interruptAccept; + +/* The database field and request types are defined in dbFldTypes.h*/ +/* Data Base Request Options */ +#define DBR_STATUS 0x00000001 +#define DBR_UNITS 0x00000002 +#define DBR_PRECISION 0x00000004 +#define DBR_TIME 0x00000008 +#define DBR_ENUM_STRS 0x00000010 +#define DBR_GR_LONG 0x00000020 +#define DBR_GR_DOUBLE 0x00000040 +#define DBR_CTRL_LONG 0x00000080 +#define DBR_CTRL_DOUBLE 0x00000100 +#define DBR_AL_LONG 0x00000200 +#define DBR_AL_DOUBLE 0x00000400 + +/********************************************************************** + * The next page contains macros for defining requests. + * As an example the following defines a buffer to accept an array + * of 10 float values + DBR_STATUS and DBR_TIME options + * + * struct { + * DBRstatus + * DBRtime + * float value[10] + * } buffer; + * + * IMPORTANT!! The DBRoptions must be given in the order that they + * appear in the Data Base Request Options #defines + * + * The associated dbGetField call is: + * + * long options,number_elements; + * ... + * options = DBR_STATUS|DBR_TIME; + * number_elements = 10; + * rtnval=dbGetField(paddr,DBR_FLOAT,&buffer,&options,&number_elements); + * + * When dbGetField returns: + * rtnval is error status (0 means success) + * options has a bit set for each option that was accepted + * number_elements is actual number of elements obtained + * + * The individual items can be refered to by the expressions:: + * + * buffer.status + * buffer.severity + * buffer.err_status + * buffer.epoch_seconds + * buffer.nano_seconds + * buffer.value[i] + * + * The following is also a valid declaration: + * + * typedef struct { + * DBRstatus + * DBRtime + * float value[10] + * } MYBUFFER; + * + * With this definition you can give definitions such as the following: + * + * MYBUFFER *pbuf1; + * MYBUFFER buf; + *************************************************************************/ + +/* Macros for defining each option */ +#define DBRstatus \ + unsigned short status; /* alarm status */\ + unsigned short severity; /* alarm severity*/\ + unsigned short acks; /* alarm ack severity*/\ + unsigned short ackt; /* Acknowledge transient alarms?*/ +#define DB_UNITS_SIZE 16 +#define DBRunits \ + char units[DB_UNITS_SIZE]; /* units */ +#define DBRprecision \ + long precision; /* number of decimal places*/\ + long field_width; /* field width */ +#define DBRtime \ + TS_STAMP time; /* time stamp*/ +#define DBRenumStrs \ + unsigned long no_str; /* number of strings*/\ + long padenumStrs; /*padding to force 8 byte align*/\ + char strs[DB_MAX_CHOICES][MAX_STRING_SIZE]; /* string values */ +#define DBRgrLong \ + long upper_disp_limit; /*upper limit of graph*/\ + long lower_disp_limit; /*lower limit of graph*/ +#define DBRgrDouble \ + double upper_disp_limit; /*upper limit of graph*/\ + double lower_disp_limit; /*lower limit of graph*/ +#define DBRctrlLong \ + long upper_ctrl_limit; /*upper limit of graph*/\ + long lower_ctrl_limit; /*lower limit of graph*/ +#define DBRctrlDouble \ + double upper_ctrl_limit; /*upper limit of graph*/\ + double lower_ctrl_limit; /*lower limit of graph*/ +#define DBRalLong \ + long upper_alarm_limit;\ + long upper_warning_limit;\ + long lower_warning_limit;\ + long lower_alarm_limit; +#define DBRalDouble \ + double upper_alarm_limit;\ + double upper_warning_limit;\ + double lower_warning_limit;\ + double lower_alarm_limit; + +/* structures for each option type */ +struct dbr_status {DBRstatus}; +struct dbr_units {DBRunits}; +struct dbr_precision {DBRprecision}; +struct dbr_time {DBRtime}; +struct dbr_enumStrs {DBRenumStrs}; +struct dbr_grLong {DBRgrLong}; +struct dbr_grDouble {DBRgrDouble}; +struct dbr_ctrlLong {DBRctrlLong}; +struct dbr_ctrlDouble {DBRctrlDouble}; +struct dbr_alLong {DBRalLong}; +struct dbr_alDouble {DBRalDouble}; +/* sizes for each option structure */ +#define dbr_status_size sizeof(struct dbr_status) +#define dbr_units_size sizeof(struct dbr_units) +#define dbr_precision_size sizeof(struct dbr_precision) +#define dbr_time_size sizeof(struct dbr_time) +#define dbr_enumStrs_size sizeof(struct dbr_enumStrs) +#define dbr_grLong_size sizeof(struct dbr_grLong) +#define dbr_grDouble_size sizeof(struct dbr_grDouble) +#define dbr_ctrlLong_size sizeof(struct dbr_ctrlLong) +#define dbr_ctrlDouble_size sizeof(struct dbr_ctrlDouble) +#define dbr_alLong_size sizeof(struct dbr_alLong) +#define dbr_alDouble_size sizeof(struct dbr_alDouble) + +#ifndef INCerrMdefh +#include "errMdef.h" +#endif +#define S_db_notFound (M_dbAccess| 1) /*Process Variable Not Found*/ +#define S_db_badDbrtype (M_dbAccess| 3) /*Illegal Database Request Type*/ +#define S_db_noMod (M_dbAccess| 5) /*Attempt to modify noMod field*/ +#define S_db_badLset (M_dbAccess| 7) /*Illegal Lock Set*/ +#define S_db_precision (M_dbAccess| 9) /*get precision failed */ +#define S_db_onlyOne (M_dbAccess|11) /*Only one element allowed*/ +#define S_db_badChoice (M_dbAccess|13) /*Illegal choice*/ +#define S_db_badField (M_dbAccess|15) /*Illegal field value*/ +#define S_db_lsetLogic (M_dbAccess|17) /*Logic error generating lock sets*/ +#define S_db_noRSET (M_dbAccess|31) /*missing record support entry table*/ +#define S_db_noSupport (M_dbAccess|33) /*RSET routine not defined*/ +#define S_db_BadSub (M_dbAccess|35) /*Subroutine not found*/ +/*!!!! Do not change next two lines without changing src/rsrv/server.h!!!!!!!!*/ +#define S_db_Pending (M_dbAccess|37) /*Request is pending*/ +#define S_db_Blocked (M_dbAccess|39) /*Request is Blocked*/ +#define S_db_putDisabled (M_dbAccess|41) /*putFields are disabled*/ +#define S_db_bkptSet (M_dbAccess|53) /*Breakpoint already set*/ +#define S_db_bkptNotSet (M_dbAccess|55) /*No breakpoint set in record*/ +#define S_db_notStopped (M_dbAccess|57) /*Record not stopped*/ +#define S_db_errArg (M_dbAccess|59) /*Error in argument*/ +#define S_db_bkptLogic (M_dbAccess|61) /*Logic error in breakpoint routine*/ +#define S_db_cntSpwn (M_dbAccess|63) /*Cannot spawn dbContTask*/ +#define S_db_cntCont (M_dbAccess|65) /*Cannot resume dbContTask*/ + +/* Global Database Access Routines*/ +#define dbGetLink(PLNK,DBRTYPE,PBUFFER,OPTIONS,NREQUEST) \ + (((((PLNK)->type == CONSTANT)&&(!(NREQUEST))) ||\ + (! (((PLNK)->type == DB_LINK) || ((PLNK)->type == CA_LINK)) ))\ + ? 0\ + : dbGetLinkValue((PLNK),(DBRTYPE), \ + (void *)(PBUFFER),(OPTIONS),(NREQUEST))) +#define dbPutLink(PLNK,DBRTYPE,PBUFFER,NREQUEST) \ + ((((PLNK)->type == CONSTANT) ||\ + (! (((PLNK)->type == DB_LINK) || ((PLNK)->type == CA_LINK)) ))\ + ? 0\ + : dbPutLinkValue((PLNK),(DBRTYPE),(void *)(PBUFFER),(NREQUEST))) +#define dbGetPdbAddrFromLink(PLNK) \ + (\ + ((PLNK)->type != DB_LINK) \ + ? 0\ + : (((DBADDR*)((PLNK)->value.pv_link.pvt))) \ + ) + +epicsShareFunc struct rset * epicsShareAPI dbGetRset(struct dbAddr *paddr); +epicsShareFunc long epicsShareAPI dbPutAttribute( + char *recordTypename,char *name,char*value); +epicsShareFunc int epicsShareAPI dbIsValueField(struct dbFldDes *pdbFldDes); +epicsShareFunc int epicsShareAPI dbGetFieldIndex(struct dbAddr *paddr); +epicsShareFunc long epicsShareAPI dbGetNelements( + struct link *plink,long *nelements); +epicsShareFunc int epicsShareAPI dbIsLinkConnected(struct link *plink); +epicsShareFunc int epicsShareAPI dbGetLinkDBFtype(struct link *plink); +epicsShareFunc long epicsShareAPI dbScanLink( + struct dbCommon *pfrom, struct dbCommon *pto); +epicsShareFunc long epicsShareAPI dbScanPassive( + struct dbCommon *pfrom,struct dbCommon *pto); +epicsShareFunc void epicsShareAPI dbScanFwdLink(struct link *plink); +epicsShareFunc long epicsShareAPI dbProcess(struct dbCommon *precord); +epicsShareFunc long epicsShareAPI dbNameToAddr( + const char *pname,struct dbAddr *); +epicsShareFunc long epicsShareAPI dbGetLinkValue( + struct link *,short dbrType,void *pbuffer,long *options,long *nRequest); +epicsShareFunc long epicsShareAPI dbGetField( + struct dbAddr *,short dbrType,void *pbuffer,long *options, + long *nRequest,void *pfl); +epicsShareFunc long epicsShareAPI dbGet( + struct dbAddr *,short dbrType,void *pbuffer,long *options, + long *nRequest,void *pfl); +epicsShareFunc long epicsShareAPI dbPutLinkValue( + struct link *,short dbrType,const void *pbuffer,long nRequest); +epicsShareFunc long epicsShareAPI dbPutField( + struct dbAddr *,short dbrType,const void *pbuffer,long nRequest); +epicsShareFunc long epicsShareAPI dbPut( + struct dbAddr *,short dbrType,const void *pbuffer,long nRequest); +typedef void(*SPC_ASCALLBACK)(struct dbCommon *); +/*dbSpcAsRegisterCallback called by access security */ +epicsShareFunc void epicsShareAPI dbSpcAsRegisterCallback(SPC_ASCALLBACK func); +epicsShareFunc long epicsShareAPI dbBufferSize( + short dbrType,long options,long nRequest); +epicsShareFunc long epicsShareAPI dbValueSize(short dbrType); + +#endif /*INCdbAccessDefsh*/ diff --git a/src/db/dbBkpt.c b/src/db/dbBkpt.c index 6a43c3d57..35cd7cb4b 100644 --- a/src/db/dbBkpt.c +++ b/src/db/dbBkpt.c @@ -14,6 +14,9 @@ of this distribution. /* Modification Log: * ----------------- * $Log$ + * Revision 1.21 2000/02/28 20:34:04 mrk + * changes for building win32 dlls + * * Revision 1.20 2000/02/28 20:12:11 mrk * move dbAccess.h * @@ -112,7 +115,7 @@ of this distribution. #include "special.h" #define epicsExportSharedSymbols #include "dbAddr.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "dbScan.h" #include "dbLock.h" #include "recGbl.h" diff --git a/src/db/dbConvert.c b/src/db/dbConvert.c index 94db0b75e..fcb309bf2 100644 --- a/src/db/dbConvert.c +++ b/src/db/dbConvert.c @@ -29,7 +29,7 @@ of this distribution. #include "recSup.h" #define epicsExportSharedSymbols #include "dbAddr.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "recGbl.h" #include "dbConvert.h" diff --git a/src/db/dbEvent.c b/src/db/dbEvent.c index a63c4cf6a..a4e3f2d86 100644 --- a/src/db/dbEvent.c +++ b/src/db/dbEvent.c @@ -42,7 +42,7 @@ of this distribution. #define epicsExportSharedSymbols #include "dbAddr.h" #include "dbLock.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "dbEvent.h" #define EVENTSPERQUE 32 diff --git a/src/db/dbFastLinkConv.c b/src/db/dbFastLinkConv.c index 4428d1f96..899690358 100644 --- a/src/db/dbFastLinkConv.c +++ b/src/db/dbFastLinkConv.c @@ -49,7 +49,7 @@ #include "special.h" #define epicsExportSharedSymbols #include "dbAddr.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "recGbl.h" #include "dbConvertFast.h" diff --git a/src/db/dbLock.c b/src/db/dbLock.c index c362370eb..13bffa997 100644 --- a/src/db/dbLock.c +++ b/src/db/dbLock.c @@ -80,7 +80,7 @@ since this will delay all other threads. #include "errMdef.h" #define epicsExportSharedSymbols #include "dbAddr.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "dbLock.h" #define STATIC static diff --git a/src/db/dbNotify.c b/src/db/dbNotify.c index abfd20ec9..094f4f643 100644 --- a/src/db/dbNotify.c +++ b/src/db/dbNotify.c @@ -52,7 +52,7 @@ #include "dbScan.h" #include "dbLock.h" #include "callback.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "recGbl.h" #include "dbNotify.h" diff --git a/src/db/dbScan.c b/src/db/dbScan.c index ee9ba296b..9d1b496ae 100644 --- a/src/db/dbScan.c +++ b/src/db/dbScan.c @@ -68,7 +68,7 @@ #define epicsExportSharedSymbols #include "dbAddr.h" #include "callback.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "dbLock.h" #include "recGbl.h" #include "dbScan.h" diff --git a/src/db/dbTest.c b/src/db/dbTest.c index 08920feb0..44a7286bf 100644 --- a/src/db/dbTest.c +++ b/src/db/dbTest.c @@ -37,7 +37,7 @@ of this distribution. #define epicsExportSharedSymbols #include "dbAddr.h" #include "dbLock.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "recGbl.h" #include "dbEvent.h" #include "callback.h" diff --git a/src/db/db_access.c b/src/db/db_access.c index 7e28b0617..a8614c803 100644 --- a/src/db/db_access.c +++ b/src/db/db_access.c @@ -63,7 +63,7 @@ #define epicsExportSharedSymbols #include "dbAddr.h" #include "dbNotify.h" -#include "dbAccess.h" +#include "dbAccessDefs.h" #ifndef NULL #define NULL 0 diff --git a/src/db/recGbl.c b/src/db/recGbl.c index f91a7c540..42023cf3f 100644 --- a/src/db/recGbl.c +++ b/src/db/recGbl.c @@ -61,7 +61,7 @@ #include "dbCommon.h" #include "caeventmask.h" #define epicsExportSharedSymbols -#include "dbAccess.h" +#include "dbAccessDefs.h" #include "dbNotify.h" #include "dbCa.h" #include "dbEvent.h"