epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

changes for 3.14

Browse Source
This commit is contained in:
Marty Kraimer
1999-09-13 18:28:08 +00:00
parent 9ac1e36d7a
commit e37bd9fac8
50 changed files with 973 additions and 6790 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dbStatic/Makefile
+41 -2
View File
@@ -1,7 +1,46 @@
TOP=../..
include $(TOP)/config/CONFIG_BASE
include $(TOP)/configure/CONFIG
include $(TOP)/config/RULES_ARCHS
# includes to install from this sub-project
#
INC += alarm.h alarmString.h dbBase.h dbFldTypes.h
INC += dbStaticLib.h link.h special.h guigroup.h
# Sources to compile & put into lib:
#
LIBSRCS := dbStaticLib.c dbYacc.c dbPvdLib.c dbStaticNoRun.c
# Library to build:
#
LIBRARY := Db
# Products to build:
#
PROD := dbReadTest dbExpand dbToMenuH dbToRecordtypeH
# libs needed by PROD:
#
PROD_LIBS := Db Com Osi
#====================================================
dbStaticLib_SRCS = \
dbYacc.c\
dbPvdLib.c\
dbStaticRun.c\
dbStaticLib.c
IOC_LIBRARY_vxWorks = dbStaticLib
#====================================================
include $(TOP)/configure/RULES_BUILD
# Extra rule since dbLexRoutines.c is included in dbYacc.c
dbYacc$(OBJ): dbLex.c ../dbLexRoutines.c
clean::
@$(RM) dbLex.c dbYacc.c
# EOF Makefile.Host for base/src/dbStatic
src/dbStatic/Makefile.Host
-37
View File
@@ -1,37 +0,0 @@
# Makefile.Host for base/src/dbStatic
#
#
TOP = ../../..
include $(TOP)/config/CONFIG_BASE
# includes to install from this sub-project
#
INC += alarm.h alarmString.h dbBase.h dbFldTypes.h
INC += dbStaticLib.h link.h special.h guigroup.h
# Sources to compile & put into lib:
#
LIBSRCS := dbStaticLib.c dbYacc.c dbPvdLib.c dbStaticNoRun.c
# Library to build:
#
LIBRARY := Db
# Products to build:
#
PROD := dbReadTest dbExpand dbToMenuH dbToRecordtypeH
# libs needed by PROD:
#
PROD_LIBS := Db Com
include $(TOP)/config/RULES.Host
# Extra rule since dbLexRoutines.c is included in dbYacc.c
dbYacc$(OBJ): dbLex.c ../dbLexRoutines.c
clean::
@$(RM) dbLex.c dbYacc.c
# EOF Makefile.Host for base/src/dbStatic
src/dbStatic/Makefile.Vx
-29
View File
@@ -1,29 +0,0 @@
TOP = ../../..
include $(TOP)/config/CONFIG_BASE
SRCS.c = \
dbYacc.c \
../dbPvdLib.c\
../dbStaticRun.c\
../dbStaticLib.c
OBJSdbLib = \
dbYacc.o\
dbPvdLib.o\
dbStaticRun.o\
dbStaticLib.o
PROD = dbStaticLib
include $(TOP)/config/RULES.Vx
# Extra rule since dbLexRoutines.c is included in dbYacc.c
dbYacc.o: dbLex.c ../dbLexRoutines.c
clean::
@$(RM) dbLex.c dbYacc.c
dbStaticLib: $(OBJSdbLib)
$(RM) $@
$(LINK.c) $@ $(OBJSdbLib) $(LDLIBS)
src/dbStatic/alarm.h
+5 -2
View File
@@ -34,6 +34,9 @@
* .02 08-11-92 jba added new status DISABLE_ALARM, SIMM_ALARM
* .03 05-11-94 jba added new status READ_ACCESS_ALARM, WRITE_ACCESS_ALARM
* $Log$
* Revision 1.3 1998/03/12 20:43:35 jhill
* fixed string defs
*
* Revision 1.2 1996/06/19 19:59:31 jhill
* added missing defines/enums, corrected defines
*
@@ -43,8 +46,8 @@
#ifndef INCalarmh
#define INCalarmh 1
#include <shareLib.h>
#include <epicsTypes.h>
#include "shareLib.h"
#include "epicsTypes.h"
/* defines for the choice fields */
/* ALARM SEVERITIES - NOTE: must match defs in choiceGbl.ascii GBL_ALARM_SEV */
src/dbStatic/dbBase.h
+3 -3
View File
@@ -34,9 +34,9 @@
#ifndef INCdbBaseh
#define INCdbBaseh 1
#include <dbFldTypes.h>
#include <ellLib.h>
#include <dbDefs.h>
#include "dbFldTypes.h"
#include "ellLib.h"
#include "dbDefs.h"
typedef struct dbMenu {
ELLNODE node;
src/dbStatic/dbLexRoutines.c
-4
View File
@@ -19,9 +19,6 @@ of this distribution.
/*The routines in this module are serially reusable NOT reentrant*/
#ifdef vxWorks
#include <vxWorks.h>
#endif
#include <stdlib.h>
#include <stddef.h>
#include <stdio.h>
@@ -668,7 +665,6 @@ static void dbRecordtypeBody(void)
pgphentry->userPvt = pdbRecordType;
}
ellAdd(&pdbbase->recordTypeList,&pdbRecordType->node);
dbGetRecordtypeSizeOffset(pdbRecordType);
}
static void dbDevice(char *recordtype,char *linktype,
src/dbStatic/dbPvdLib.c
+1 -4
View File
@@ -9,10 +9,7 @@ This software was developed under a United States Government license
described on the COPYRIGHT_UniversityOfChicago file included as part
of this distribution.
**********************************************************************/
#ifdef vxWorks
#include <vxWorks.h>
#include <taskLib.h>
#endif
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
src/dbStatic/dbStaticLib.c
+6 -23
View File
@@ -19,10 +19,6 @@ of this distribution.
* .03 02-23-94 mrk dbPutString to DEV_CHOICE. Ok if no INP or OUT
*/
#ifdef vxWorks
#include <vxWorks.h>
#include <taskLib.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include <limits.h>
@@ -30,6 +26,7 @@ of this distribution.
#include <math.h>
#include <ctype.h>
#include "cantProceed.h"
#define DBFLDTYPES_GBLSOURCE
#define GUIGROUPS_GBLSOURCE
#define SPECIAL_GBLSOURCE
@@ -527,29 +524,15 @@ void * epicsShareAPI dbCalloc(size_t nobj,size_t size)
{
void *p;
p=calloc(nobj,size);
if(p) return(p);
printf("dbCalloc: Can't allocate memory\n");
#ifdef vxWorks
taskSuspend(0);
#else
abort();
#endif
return(NULL);
p=callocMustSucceed(nobj,size,"dbCalloc");
return(p);
}
void * epicsShareAPI dbMalloc(size_t size)
{
void *p;
p=malloc(size);
if(p) return(p);
printf("dbMalloc: Can't allocate memory\n");
#ifdef vxWorks
taskSuspend(0);
#else
abort();
#endif
return(NULL);
p=mallocMustSucceed(size,"dbMalloc");
return(p);
}
#define INC_SIZE 256
@@ -2096,7 +2079,7 @@ long epicsShareAPI dbPutString(DBENTRY *pdbentry,char *pstring)
status = putPvLink(pdbentry,ppOpt|msOpt,pstr);
goto done;
}
break;
/*break; is unnecessary*/
case VME_IO: {
char *end;
src/dbStatic/dbStaticNoRun.c
-5
View File
@@ -314,11 +314,6 @@ long dbPutStringNum(DBENTRY *pdbentry,char *pstring)
return(0);
}
void dbGetRecordtypeSizeOffset(dbRecordType *pdbRecordType)
{ /*For no run cant and dont need to set size and offset*/
return;
}
int epicsShareAPI dbGetMenuIndex(DBENTRY *pdbentry)
{
dbFldDes *pflddes = pdbentry->pflddes;
src/dbStatic/dbStaticPvt.h
-2
View File
@@ -48,8 +48,6 @@ char *dbRecordName(DBENTRY *pdbentry);
char *dbGetStringNum(DBENTRY *pdbentry);
long dbPutStringNum(DBENTRY *pdbentry,char *pstring);
void dbGetRecordtypeSizeOffset(dbRecordType *pdbRecordType);
/* The following is for path */
typedef struct dbPathNode {
ELLNODE node;
src/dbStatic/dbStaticRun.c
+3 -27
View File
@@ -15,20 +15,17 @@ of this distribution.
* .01 06-12-95 mrk Initial
*/
#ifdef vxWorks
#include <vxWorks.h>
#include <taskLib.h>
#endif
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <limits.h>
#include <string.h>
#include <math.h>
#include <symLib.h>
#include <sysSymTbl.h> /* for sysSymTbl*/
#include "dbDefs.h"
#include "errMdef.h"
#include "dbBase.h"
#include "registryRecordType.h"
#include "epicsPrint.h"
#include "ellLib.h"
#include "dbDefs.h"
@@ -648,24 +645,3 @@ long dbPutMenuIndex(DBENTRY *pdbentry,int index)
}
return (S_dbLib_badField);
}
void dbGetRecordtypeSizeOffset(dbRecordType *pdbRecordType)
{
char name[60];
SYM_TYPE type;
STATUS vxstatus;
long status;
int (*sizeOffset)(dbRecordType *pdbRecordType);
strcpy(name,"_");
strcat(name,pdbRecordType->name);
strcat(name,"RecordSizeOffset");
vxstatus = symFindByNameEPICS(sysSymTbl, name,
(void *)&sizeOffset, &type);
if (vxstatus != OK) {
status = S_dbLib_noSizeOffset;
errPrintf(status,__FILE__,__LINE__,"%s",name);
return;
}
sizeOffset(pdbRecordType);
}
src/dbStatic/dbToRecordtypeH.c
+1 -3
View File
@@ -112,10 +112,8 @@ int main(int argc,char **argv)
fprintf(stderr,"Terminal error For input file %s\n",argv[1]);
exit(-1);
}
fprintf(outFile,"#include <vxWorks.h>\n");
fprintf(outFile,"#include <semLib.h>\n");
fprintf(outFile,"#include \"ellLib.h\"\n");
fprintf(outFile,"#include \"fast_lock.h\"\n");
fprintf(outFile,"#include \"osiSem.h\"\n");
fprintf(outFile,"#include \"link.h\"\n");
fprintf(outFile,"#include \"tsDefs.h\"\n");
pdbMenu = (dbMenu *)ellFirst(&pdbbase->menuList);
src/dbStatic/link.h
+1 -1
View File
@@ -37,7 +37,7 @@
* .06 01-10-96 lrd added ca_link structure fields
*/
#include <dbDefs.h>
#include "dbDefs.h"
#ifndef INClinkh
#define INClinkh 1