more changes for creating dlls

This commit is contained in:
Marty Kraimer
2000-02-25 22:28:44 +00:00
parent 92f89579f6
commit 7a24fa2299
16 changed files with 76 additions and 40 deletions

View File

@@ -39,7 +39,7 @@ of this distribution.
#define epicsExportSharedSymbols
int asCaDebug = 0;
epicsShareExtern ASBASE volatile *pasbase;
epicsShareDef ASBASE volatile *pasbase;
LOCAL int firstTime = TRUE;
LOCAL threadId threadid=0;
LOCAL int caInitializing=FALSE;

View File

@@ -38,8 +38,6 @@ of this distribution.
#include "dbCommon.h"
#include "recSup.h"
extern struct dbBase *pdbbase;
static char *pacf=NULL;
static char *psubstitutions=NULL;
static threadId asInitTheadId=0;

View File

@@ -40,7 +40,6 @@ static semMutexId asLock;
#define UNLOCK semMutexGive(asLock)
#define epicsExportSharedSymbols
#include "shareLib.h"
#include "asLib.h"
static int asLockInit=TRUE;

View File

@@ -42,7 +42,6 @@
#include "epicsPrint.h"
#define epicsExportSharedSymbols
#include <shareLib.h>
#include "cvtTable.h"
epicsShareExtern struct dbBase *pdbbase;
@@ -66,7 +65,7 @@ static brkTable *findBrkTable(short linr)
return(dbFindBrkTable(pdbbase,pdbMenu->papChoiceValue[linr]));
}
epicsShareFunc long epicsShareAPI cvtRawToEngBpt(double *pval,short linr,short init, void **ppbrk,
long epicsShareAPI cvtRawToEngBpt(double *pval,short linr,short init, void **ppbrk,
short *plbrk)
{
double val=*pval;
@@ -116,7 +115,7 @@ epicsShareFunc long epicsShareAPI cvtRawToEngBpt(double *pval,short linr,short i
return(status);
}
epicsShareFunc long epicsShareAPI cvtEngToRawBpt(double *pval,short linr,short init,
long epicsShareAPI cvtEngToRawBpt(double *pval,short linr,short init,
void **ppbrk,short *plbrk)
{
double val=*pval;

View File

@@ -35,11 +35,13 @@
#ifndef INCcvtTableh
#define INCcvtTableh 1
/* Global Routines*/
epicsShareFunc long epicsShareAPI cvtEngToRawBpt(double *pval,short linr,short init,
void **ppbrk,short *plbrk);
#include "shareLib.h"
epicsShareFunc long epicsShareAPI cvtRawToEngBpt(double *pval,short linr,short init,
void **ppbrk, short *plbrk);
/* Global Routines*/
epicsShareFunc long epicsShareAPI cvtEngToRawBpt(
double *pval,short linr,short init,void **ppbrk,short *plbrk);
epicsShareFunc long epicsShareAPI cvtRawToEngBpt(
double *pval,short linr,short init,void **ppbrk, short *plbrk);
#endif

View File

@@ -23,7 +23,13 @@ of this distribution.
#include "osiInterrupt.h"
#include "osiTimer.h"
#include "osiRing.h"
#include "tsStamp.h"
#include "errlog.h"
#include "dbStaticLib.h"
#include "dbBase.h"
#include "link.h"
#include "dbAddr.h"
#include "dbFldTypes.h"
#include "dbAccess.h"
#include "recSup.h"
#include "taskwd.h"

View File

@@ -54,18 +54,19 @@ of this distribution.
#include "alarm.h"
#include "ellLib.h"
#include "dbStaticLib.h"
#include "dbBase.h"
#include "link.h"
#include "dbAddr.h"
#include "dbFldTypes.h"
#include "recSup.h"
#include "caeventmask.h"
#include "dbScan.h"
#include "db_field_log.h"
#include "dbCommon.h"
#include "dbScan.h"
#include "dbLock.h"
#include "callback.h"
#include "dbAddr.h"
#include "dbBase.h"
#include "dbFldTypes.h"
#include "dbEvent.h"
#include "db_field_log.h"
#include "errMdef.h"
#include "recGbl.h"
#include "special.h"

View File

@@ -14,6 +14,9 @@ of this distribution.
/* Modification Log:
* -----------------
* $Log$
* Revision 1.16 2000/02/25 22:01:24 mrk
* changes for creating DLLs
*
* Revision 1.15 2000/02/08 20:14:59 norume
* Remove task argument to threadSuspend().
*
@@ -87,9 +90,12 @@ of this distribution.
#include "errlog.h"
#include "alarm.h"
#include "dbBase.h"
#include "dbFldTypes.h"
#include "link.h"
#include "dbAddr.h"
#include "dbAccess.h"
#include "dbScan.h"
#include "dbCommon.h"
#include "dbScan.h"
#include "dbLock.h"
#include "dbFldTypes.h"
#include "db_field_log.h"

View File

@@ -20,11 +20,14 @@ of this distribution.
#include "dbDefs.h"
#include "errlog.h"
#include "cvtFast.h"
#include "tsStamp.h"
#include "dbBase.h"
#include "link.h"
#include "dbAddr.h"
#include "dbFldTypes.h"
#include "dbAccess.h"
#include "dbConvert.h"
#include "dbStaticLib.h"
#include "dbFldTypes.h"
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"

View File

@@ -46,7 +46,7 @@ typedef void OVRFFUNC (void *overflow_arg, unsigned count);
typedef void EXTRALABORFUNC (void *extralabor_arg);
epicsShareFunc dbEventCtx epicsShareAPI db_init_events (void);
epicsShareFunc int epicsShareAPI db_start_events (
dbEventCtx ctx, char *taskname, int (*init_func)(threadId),
dbEventCtx ctx, char *taskname, int (*init_func)(void *),
void *init_func_arg, int priority_offset);
epicsShareFunc void epicsShareAPI db_close_events (dbEventCtx ctx);
epicsShareFunc void epicsShareAPI db_event_flow_ctrl_mode_on (dbEventCtx ctx);

View File

@@ -36,8 +36,12 @@
#include "dbDefs.h"
#include "errlog.h"
#include "cvtFast.h"
#include "tsStamp.h"
#include "alarm.h"
#include "dbBase.h"
#include "link.h"
#include "dbAddr.h"
#include "dbFldTypes.h"
#include "dbAccess.h"
#include "dbConvert.h"
#include "dbStaticLib.h"

View File

@@ -71,12 +71,15 @@ since this will delay all other threads.
#include "osiThread.h"
#include "cantProceed.h"
#include "ellLib.h"
#include "dbAccess.h"
#include "dbBase.h"
#include "dbStaticLib.h"
#include "dbFldTypes.h"
#include "link.h"
#include "dbAddr.h"
#include "dbAccess.h"
#include "dbConvert.h"
#include "dbCommon.h"
#include "epicsPrint.h"
#include "dbFldTypes.h"
#include "errMdef.h"
#define epicsExportSharedSymbols
#include "dbLock.h"

View File

@@ -46,8 +46,8 @@
#include "dbStaticLib.h"
#include "dbFldTypes.h"
#include "link.h"
#include "dbScan.h"
#include "dbCommon.h"
#include "dbScan.h"
#include "dbLock.h"
#include "callback.h"
#include "dbAddr.h"

View File

@@ -22,18 +22,23 @@ of this distribution.
#include "errlog.h"
#include "ellLib.h"
#include "osiSem.h"
#include "dbAccess.h"
#include "tsStamp.h"
#include "ellLib.h"
#include "dbBase.h"
#include "dbCommon.h"
#include "dbLock.h"
#include "dbStaticLib.h"
#include "link.h"
#include "dbAddr.h"
#include "dbFldTypes.h"
#include "recSup.h"
#include "devSup.h"
#include "drvSup.h"
#include "dbCommon.h"
#include "dbLock.h"
#include "dbAccess.h"
#include "recGbl.h"
#include "special.h"
#include "dbStaticLib.h"
#include "db_field_log.h"
#include "dbEvent.h"
#include "ellLib.h"
#include "callback.h"
#define epicsExportSharedSymbols
#include "dbTest.h"

View File

@@ -45,20 +45,24 @@
*** the presumed order in dbAccess.c's dbGetField() routine
***/
#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include "dbDefs.h"
#include "errlog.h"
#include "dbStaticLib.h"
#include "dbAccess.h"
#include "dbCommon.h"
#include "errMdef.h"
#include "recSup.h"
#include "dbDefs.h"
#include "errlog.h"
#include "ellLib.h"
#include "tsStamp.h"
#include "dbStaticLib.h"
#include "dbBase.h"
#include "dbAddr.h"
#include "dbAccess.h"
#include "dbCommon.h"
#include "errMdef.h"
#include "recSup.h"
#include "alarm.h"
#include "alarm.h"
extern struct dbBase *pdbbase;

View File

@@ -55,16 +55,22 @@ of this distribution.
#include "osiThread.h"
#include "osiSem.h"
#include "epicsPrint.h"
#include "tsStamp.h"
#include "ellLib.h"
#include "dbDefs.h"
#include "dbBase.h"
#include "caeventmask.h"
#include "dbAddr.h"
#include "dbFldTypes.h"
#include "link.h"
#include "dbLock.h"
#include "dbAccess.h"
#include "dbCa.h"
#include "dbScan.h"
#include "taskwd.h"
#include "callback.h"
#include "dbCommon.h"
#include "dbLock.h"
#include "dbFldTypes.h"
#include "devSup.h"
#include "drvSup.h"
#include "registryRecordType.h"