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

changed to use symFindByNameEPICS

Browse Source
This commit is contained in:
William Lupton
1998-06-04 19:21:23 +00:00
parent d4cf4cdaf7
commit 142aa9571a
13 changed files with 87 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bdt/bdtServ.c
+4 -1
View File
@@ -4,6 +4,9 @@
* Date: 95-05-22
*
* $Log$
* Revision 1.1 1995/07/27 14:22:56 winans
* first release
*
*/
/*****************************************************************************
@@ -133,7 +136,7 @@ STATIC int BDT_ProcessConnect(BDT *Bdt)
printf("BDT_ProcessConnect NAME service (%s)\n", HandlerName);
/*Bdt->pHandlers = (BdthandlerFunc *)(&BDT_NameServicehandlers);*/
if (symFindByName(sysSymTbl, HandlerName, (char **)&(Bdt->pHandlers), &Type) != OK)
if (symFindByNameEPICS(sysSymTbl, HandlerName, (char **)&(Bdt->pHandlers), &Type) != OK)
{
printf("BDT_ProcessConnect Connect to unknown service (%s)\n", Buf);
BdtSendHeader(Bdt, BDT_Error, 0);
src/db/devLib.c
+3 -3
View File
@@ -947,7 +947,7 @@ void initHandlerAddrList(void)
for(i=0; i<NELEMENTS(defaultHandlerNames); i++){
status =
symFindByName( sysSymTbl,
symFindByNameEPICS( sysSymTbl,
defaultHandlerNames[i],
(char **)&defaultHandlerAddr[i],
&type);
@@ -1299,7 +1299,7 @@ void *devLibA24Malloc(size_t size)
if (A24MallocFunc == NULL)
{
/* See if the sysA24Malloc() function is present. */
if(symFindByName(sysSymTbl,"_sysA24Malloc", (char**)&A24MallocFunc,&stype)==ERROR)
if(symFindByNameEPICS(sysSymTbl,"_sysA24Malloc", (char**)&A24MallocFunc,&stype)==ERROR)
{ /* Could not find sysA24Malloc... use the malloc one and hope we are OK */
if (devLibA24Debug)
logMsg("devLibA24Malloc() using regular malloc\n",0,0,0,0,0,0);
@@ -1308,7 +1308,7 @@ void *devLibA24Malloc(size_t size)
}
else
{
if(symFindByName(sysSymTbl,"_sysA24Free", (char**)&A24FreeFunc, &stype) == ERROR)
if(symFindByNameEPICS(sysSymTbl,"_sysA24Free", (char**)&A24FreeFunc, &stype) == ERROR)
{ /* That's strange... we have malloc, but no free! */
if (devLibA24Debug)
logMsg("devLibA24Malloc() using regular malloc\n",0,0,0,0,0,0);
src/db/drvTS.c
+20 -10
View File
@@ -12,6 +12,16 @@ of this distribution.
**********************************************************************/
/*
* $Log$
* Revision 1.23 1998/03/19 20:41:15 mrk
* Checked for Y2K complience. It turns out it was even ok when NTP time overflows
* in 2036. However it was modified so that no overflows should occur while convert
* ing between NTP, UNIX, and EPICS epochs.
* In addition the conversion of fractions of a second to nanaoseconds was changed
* Formatting was changed so that interesting code does not run off right side of page.
* Hopefully EPICS base is now fine for Y2K.
* In fact it should be fine (as far as time is converned) until the Unix epoch
* overflows a 32 unsigned integer in the year 2106.
*
* Revision 1.22 1998/01/22 14:48:34 mrk
* get rid of some warning messages
*
@@ -517,42 +527,42 @@ long TSinit(void)
/* default configuration probe */
/* ------------------------------------------------------------- */
/* find the lower level event system functions */
if(symFindByName(sysSymTbl,"_ErHaveReceiver",
if(symFindByNameEPICS(sysSymTbl,"_ErHaveReceiver",
(char**)&TShaveReceiver,&stype)==ERROR)
TShaveReceiver = TShaveReceiverError;
if(symFindByName(sysSymTbl,"_ErGetTicks",
if(symFindByNameEPICS(sysSymTbl,"_ErGetTicks",
(char**)&TSgetTicks,&stype)==ERROR)
TSgetTicks = TSgetTicksError;
if(symFindByName(sysSymTbl,"_ErRegisterEventHandler",
if(symFindByNameEPICS(sysSymTbl,"_ErRegisterEventHandler",
(char**)&TSregisterEventHandler,&stype)==ERROR)
TSregisterEventHandler = TSregisterEventHandlerError;
if(symFindByName(sysSymTbl,"_ErRegisterErrorHandler",
if(symFindByNameEPICS(sysSymTbl,"_ErRegisterErrorHandler",
(char**)&TSregisterErrorHandler,&stype)==ERROR)
TSregisterErrorHandler = TSregisterErrorHandlerError;
if(symFindByName(sysSymTbl,"_ErForceSync",
if(symFindByNameEPICS(sysSymTbl,"_ErForceSync",
(char**)&TSforceSync,&stype)==ERROR)
TSforceSync = TSforceSoftSync;
if(symFindByName(sysSymTbl,"_ErDirectTime",
if(symFindByNameEPICS(sysSymTbl,"_ErDirectTime",
(char**)&TSdirectTime,&stype)==ERROR)
TSdirectTime = TSdirectTimeError;
if(symFindByName(sysSymTbl,"_ErDriverInit",
if(symFindByNameEPICS(sysSymTbl,"_ErDriverInit",
(char**)&TSdriverInit,&stype)==ERROR)
TSdriverInit = TSdriverInitError;
if(symFindByName(sysSymTbl,"_ErGetTime",
if(symFindByNameEPICS(sysSymTbl,"_ErGetTime",
(char**)&TSgetTime,&stype)==ERROR)
TSgetTime = TSgetCurrentTime;
if(symFindByName(sysSymTbl,"_ErUserGetTimeStamp",
if(symFindByNameEPICS(sysSymTbl,"_ErUserGetTimeStamp",
(char**)&TSuserGet,&stype)==ERROR)
TSuserGet = TSuserGetJunk;
if(symFindByName(sysSymTbl,"_ErSyncEvent",
if(symFindByNameEPICS(sysSymTbl,"_ErSyncEvent",
(char**)&TSsyncEvent,&stype)==ERROR)
TSdata.sync_event=ER_EVENT_RESET_TICK;
else
src/db/iocInit.c
+5 -5
View File
@@ -149,7 +149,7 @@ int iocInit(char * pResourceFilename)
/* Setup initialization hooks, if initHooks routine has been defined. */
strcpy(name, "_");
strcat(name, "initHooks");
rtnval = symFindByName(sysSymTbl, name, (void *) &pinitHooks, &type);
rtnval = symFindByNameEPICS(sysSymTbl, name, (void *) &pinitHooks, &type);
if (pinitHooks) (*pinitHooks)(initHookAtBeginning);
coreRelease();
@@ -268,7 +268,7 @@ LOCAL long initDrvSup(void) /* Locate all driver support entry tables */
pdrvSup = (drvSup *)ellNext(&pdrvSup->node)) {
strcpy(name,"_");
strcat(name,pdrvSup->name);
vxstatus = symFindByName(sysSymTbl, name,
vxstatus = symFindByNameEPICS(sysSymTbl, name,
(void *) &pdrvet, &type);
if (vxstatus != OK) {
status = S_drv_noDrvet;
@@ -310,7 +310,7 @@ LOCAL long initRecSup(void)
strcpy(name,"_");
strcat(name,pdbRecordType->name);
strcat(name,"RSET");
vxstatus = symFindByName(sysSymTbl, name,
vxstatus = symFindByNameEPICS(sysSymTbl, name,
(void *)&pdbRecordType->prset, &type);
if (vxstatus != OK) {
status = S_rec_noRSET;
@@ -354,7 +354,7 @@ LOCAL long initDevSup(void)
if(!(pname = pdevSup->name)) continue;
strcpy(name, "_");
strcat(name, pname);
vxstatus = (long) symFindByName(sysSymTbl, name,
vxstatus = (long) symFindByNameEPICS(sysSymTbl, name,
(void *) &pdset, &type);
if (vxstatus != OK) {
status = S_dev_noDSET;
@@ -623,7 +623,7 @@ long getResources(char *fname)
strcpy(name, "_");
strcat(name, s1);
status = symFindByName(sysSymTbl, name, &pSymAddr, &type);
status = symFindByNameEPICS(sysSymTbl, name, &pSymAddr, &type);
if (status!= OK) {
errPrintf (
-1L,
src/dbStatic/dbStaticRun.c
+1 -1
View File
@@ -660,7 +660,7 @@ void dbGetRecordtypeSizeOffset(dbRecordType *pdbRecordType)
strcpy(name,"_");
strcat(name,pdbRecordType->name);
strcat(name,"RecordSizeOffset");
vxstatus = symFindByName(sysSymTbl, name,
vxstatus = symFindByNameEPICS(sysSymTbl, name,
(void *)&sizeOffset, &type);
if (vxstatus != OK) {
status = S_dbLib_noSizeOffset;
src/dev/symbDev/devSymbFind.c
+6 -3
View File
@@ -8,6 +8,9 @@
/* modification history:
* $Log$
* Revision 1.1 1998/01/21 20:47:45 mrk
* restructure; new Symb support
*
* Revision 1.2.2.1 1997/10/11 02:26:54 wlupton
* now working with R3.13
*
@@ -130,7 +133,7 @@ int devSymbFind(char *name, struct link *plink, void *pdpvt)
return ERROR;
}
if (symFindByName(sysSymTbl, nptr, (char **) &paddr, &stype))
if (symFindByNameEPICS(sysSymTbl, nptr, (char **) &paddr, &stype))
return ERROR;
/* Name exists, allocate a private structure */
@@ -284,7 +287,7 @@ int test(char *string)
error = parseInstio(string, &deref, &nptr, &index);
printf("%s: ", error ? "error" : "ok" );
printf("deref=%d, name=%s, index=%d", deref, nptr, index);
if (!symFindByName(sysSymTbl, nptr, &addr, &stype))
if (!symFindByNameEPICS(sysSymTbl, nptr, &addr, &stype))
{
if (deref) addr = *((char **)addr);
addr += sizeof(long) * index;
@@ -296,7 +299,7 @@ int test(char *string)
error = parseName(string, &deref, &nptr, &index);
printf("%s: ", error ? "error" : "ok" );
printf("deref=%d, name=%s, index=%d", deref, nptr, index);
if (!symFindByName(sysSymTbl, nptr, &addr, &stype))
if (!symFindByNameEPICS(sysSymTbl, nptr, &addr, &stype))
printf(" -> value = %d", *(long *)addr);
printf("\n");
src/drv/ansi/drvEpvxi.c
+9 -9
View File
@@ -454,7 +454,7 @@ EPVXISTAT epvxiResman(void)
unsigned char *pEPICS_VXI_LA_COUNT = 0;
unsigned char *pEPICS_VXI_LA_BASE = 0;
status = symFindByName(
status = symFindByNameEPICS(
sysSymTbl,
"_EPICS_VXI_LA_BASE",
(char **)&pEPICS_VXI_LA_BASE,
@@ -469,7 +469,7 @@ EPVXISTAT epvxiResman(void)
EPICS_VXI_LA_BASE = 0;
}
status = symFindByName(
status = symFindByNameEPICS(
sysSymTbl,
"_EPICS_VXI_LA_COUNT",
(char **)&pEPICS_VXI_LA_COUNT,
@@ -1967,7 +1967,7 @@ VXIE *pvxie
continue;
}
status = symFindByName(
status = symFindByNameEPICS(
sysSymTbl,
nivxi_func_names[i],
(char **) &pnivxi_func[i],
@@ -3053,7 +3053,7 @@ unsigned dest_size
SYM_TYPE type;
char *pvalue;
status = symFindByName(
status = symFindByNameEPICS(
sysSymTbl,
pname,
&pvalue,
@@ -3082,7 +3082,7 @@ LOCAL EPVXISTAT vxi_init_ignore_list(void)
for(i=0; i<NELEMENTS(ignore_list); i++){
status =
symFindByName( sysSymTbl,
symFindByNameEPICS( sysSymTbl,
ignore_list[i],
(char **) &ignore_addr_list[i],
&type);
@@ -4371,7 +4371,7 @@ char *pmodel_name
free(pcopy);
status = symFindByNameAndType(
status = symFindByNameEPICS(
epvxiSymbolTable,
name,
&pold_model_name,
@@ -4432,7 +4432,7 @@ char *pmake_name
free(pcopy);
status = symFindByNameAndType(
status = symFindByNameAndTypeEPICS(
epvxiSymbolTable,
name,
&pold_make_name,
@@ -4476,7 +4476,7 @@ unsigned int *preadcount) /* n bytes written */
}
sprintf(name, epvxiSymbolTableMakeIdString, make);
status = symFindByNameAndType(
status = symFindByNameAndTypeEPICS(
epvxiSymbolTable,
name,
&pmake_name,
@@ -4522,7 +4522,7 @@ unsigned int *preadcount) /* n bytes written */
}
sprintf(name, epvxiSymbolTableDeviceIdString, make, model);
status = symFindByNameAndType(
status = symFindByNameAndTypeEPICS(
epvxiSymbolTable,
name,
&pmodel_name,
src/drv/old/drvGpib.c
+8 -5
View File
@@ -59,6 +59,9 @@
*
*
* $Log$
* Revision 1.8 1998/01/20 21:51:53 mrk
* add includes for error messages
*
* Revision 1.7 1997/04/30 19:02:08 mrk
* Fixed many compiler warning messages
*
@@ -2823,11 +2826,11 @@ HiDEOSGpibLinkConfig(int link, int BoardId, char *TaskName)
return(ERROR);
}
if ((symFindByName(sysSymTbl,"_GpibHideosInit", (char**)&LHideosInit,&stype)==ERROR)
|| (symFindByName(sysSymTbl,"_GpibHideosWrite", (char**)&LHideosWrite,&stype)==ERROR)
|| (symFindByName(sysSymTbl,"_GpibHideosRead", (char**)&LHideosRead,&stype)==ERROR)
|| (symFindByName(sysSymTbl,"_GpibHideosWriteRead", (char**)&LHideosWriteRead,&stype)==ERROR)
|| (symFindByName(sysSymTbl,"_GpibHideosWriteCmd", (char**)&LHideosWriteCmd,&stype)==ERROR))
if ((symFindByNameEPICS(sysSymTbl,"_GpibHideosInit", (char**)&LHideosInit,&stype)==ERROR)
|| (symFindByNameEPICS(sysSymTbl,"_GpibHideosWrite", (char**)&LHideosWrite,&stype)==ERROR)
|| (symFindByNameEPICS(sysSymTbl,"_GpibHideosRead", (char**)&LHideosRead,&stype)==ERROR)
|| (symFindByNameEPICS(sysSymTbl,"_GpibHideosWriteRead", (char**)&LHideosWriteRead,&stype)==ERROR)
|| (symFindByNameEPICS(sysSymTbl,"_GpibHideosWriteCmd", (char**)&LHideosWriteCmd,&stype)==ERROR))
{
free (pHiDEOSIbLink);
logMsg("HiDEOSGpibLinkConfig: Can not locate Hideos GPIB services\n");
src/libvxWorks/ldpp.c
+4 -1
View File
@@ -1,6 +1,9 @@
/*
* $Log$
* Revision 1.2 1996/09/16 21:56:03 jhill
* added several compiler support functions and updated to gcc 2.7.2
*
* Revision 1.1 1996/01/29 17:05:58 jbk
* Added the simple program to allow loading of C++ object modules.
*
@@ -65,7 +68,7 @@ void cpp_main(void)
SYM_TYPE stype;
func_ptr *ctorlist;
if( symFindByName(sysSymTbl,"___CTOR_LIST__",
if( symFindByNameEPICS(sysSymTbl,"___CTOR_LIST__",
(char**)&ctorlist, &stype)==OK)
{
/*
src/rec/gsubRecord.c
+2 -2
View File
@@ -130,7 +130,7 @@ static long init_record(psub,pass)
strcpy(temp,"_");
}
strcat(temp,psub->inam);
ret = symFindByName(sysSymTbl,temp,(void *)&psub->sadr,(void *)&sub_type);
ret = symFindByNameEPICS(sysSymTbl,temp,(void *)&psub->sadr,(void *)&sub_type);
if ((ret !=OK) || ((sub_type & N_TEXT) == 0)){
recGblRecordError(S_db_BadSub,(void *)psub,"recGsub(init_record)");
return(S_db_BadSub);
@@ -148,7 +148,7 @@ static long init_record(psub,pass)
strcpy(temp,"_");
}
strcat(temp,psub->snam);
ret = symFindByName(sysSymTbl,temp,(void *)&psub->sadr,(void *)&sub_type);
ret = symFindByNameEPICS(sysSymTbl,temp,(void *)&psub->sadr,(void *)&sub_type);
if ((ret < 0) || ((sub_type & N_TEXT) == 0)){
recGblRecordError(S_db_BadSub,(void *)psub,"recGsub(init_record)");
return(S_db_BadSub);
src/rec/subRecord.c
+2 -2
View File
@@ -145,7 +145,7 @@ static long init_record(psub,pass)
strcpy(temp,"_");
}
strcat(temp,psub->inam);
ret = symFindByName(sysSymTbl,temp,(void *)&psub->sadr,(void *)&sub_type);
ret = symFindByNameEPICS(sysSymTbl,temp,(void *)&psub->sadr,(void *)&sub_type);
if ((ret !=OK) || ((sub_type & N_TEXT) == 0)){
recGblRecordError(S_db_BadSub,(void *)psub,"recSub(init_record)");
return(S_db_BadSub);
@@ -168,7 +168,7 @@ static long init_record(psub,pass)
strcpy(temp,"_");
}
strcat(temp,psub->snam);
ret = symFindByName(sysSymTbl,temp,(void *)&psub->sadr,(void *)&sub_type);
ret = symFindByNameEPICS(sysSymTbl,temp,(void *)&psub->sadr,(void *)&sub_type);
if ((ret < 0) || ((sub_type & N_TEXT) == 0)){
recGblRecordError(S_db_BadSub,(void *)psub,"recSub(init_record)");
return(S_db_BadSub);
src/vxWorks/db/devLib.c
+3 -3
View File
@@ -947,7 +947,7 @@ void initHandlerAddrList(void)
for(i=0; i<NELEMENTS(defaultHandlerNames); i++){
status =
symFindByName( sysSymTbl,
symFindByNameEPICS( sysSymTbl,
defaultHandlerNames[i],
(char **)&defaultHandlerAddr[i],
&type);
@@ -1299,7 +1299,7 @@ void *devLibA24Malloc(size_t size)
if (A24MallocFunc == NULL)
{
/* See if the sysA24Malloc() function is present. */
if(symFindByName(sysSymTbl,"_sysA24Malloc", (char**)&A24MallocFunc,&stype)==ERROR)
if(symFindByNameEPICS(sysSymTbl,"_sysA24Malloc", (char**)&A24MallocFunc,&stype)==ERROR)
{ /* Could not find sysA24Malloc... use the malloc one and hope we are OK */
if (devLibA24Debug)
logMsg("devLibA24Malloc() using regular malloc\n",0,0,0,0,0,0);
@@ -1308,7 +1308,7 @@ void *devLibA24Malloc(size_t size)
}
else
{
if(symFindByName(sysSymTbl,"_sysA24Free", (char**)&A24FreeFunc, &stype) == ERROR)
if(symFindByNameEPICS(sysSymTbl,"_sysA24Free", (char**)&A24FreeFunc, &stype) == ERROR)
{ /* That's strange... we have malloc, but no free! */
if (devLibA24Debug)
logMsg("devLibA24Malloc() using regular malloc\n",0,0,0,0,0,0);
src/vxWorks/db/drvTS.c
+20 -10
View File
@@ -12,6 +12,16 @@ of this distribution.
**********************************************************************/
/*
* $Log$
* Revision 1.23 1998/03/19 20:41:15 mrk
* Checked for Y2K complience. It turns out it was even ok when NTP time overflows
* in 2036. However it was modified so that no overflows should occur while convert
* ing between NTP, UNIX, and EPICS epochs.
* In addition the conversion of fractions of a second to nanaoseconds was changed
* Formatting was changed so that interesting code does not run off right side of page.
* Hopefully EPICS base is now fine for Y2K.
* In fact it should be fine (as far as time is converned) until the Unix epoch
* overflows a 32 unsigned integer in the year 2106.
*
* Revision 1.22 1998/01/22 14:48:34 mrk
* get rid of some warning messages
*
@@ -517,42 +527,42 @@ long TSinit(void)
/* default configuration probe */
/* ------------------------------------------------------------- */
/* find the lower level event system functions */
if(symFindByName(sysSymTbl,"_ErHaveReceiver",
if(symFindByNameEPICS(sysSymTbl,"_ErHaveReceiver",
(char**)&TShaveReceiver,&stype)==ERROR)
TShaveReceiver = TShaveReceiverError;
if(symFindByName(sysSymTbl,"_ErGetTicks",
if(symFindByNameEPICS(sysSymTbl,"_ErGetTicks",
(char**)&TSgetTicks,&stype)==ERROR)
TSgetTicks = TSgetTicksError;
if(symFindByName(sysSymTbl,"_ErRegisterEventHandler",
if(symFindByNameEPICS(sysSymTbl,"_ErRegisterEventHandler",
(char**)&TSregisterEventHandler,&stype)==ERROR)
TSregisterEventHandler = TSregisterEventHandlerError;
if(symFindByName(sysSymTbl,"_ErRegisterErrorHandler",
if(symFindByNameEPICS(sysSymTbl,"_ErRegisterErrorHandler",
(char**)&TSregisterErrorHandler,&stype)==ERROR)
TSregisterErrorHandler = TSregisterErrorHandlerError;
if(symFindByName(sysSymTbl,"_ErForceSync",
if(symFindByNameEPICS(sysSymTbl,"_ErForceSync",
(char**)&TSforceSync,&stype)==ERROR)
TSforceSync = TSforceSoftSync;
if(symFindByName(sysSymTbl,"_ErDirectTime",
if(symFindByNameEPICS(sysSymTbl,"_ErDirectTime",
(char**)&TSdirectTime,&stype)==ERROR)
TSdirectTime = TSdirectTimeError;
if(symFindByName(sysSymTbl,"_ErDriverInit",
if(symFindByNameEPICS(sysSymTbl,"_ErDriverInit",
(char**)&TSdriverInit,&stype)==ERROR)
TSdriverInit = TSdriverInitError;
if(symFindByName(sysSymTbl,"_ErGetTime",
if(symFindByNameEPICS(sysSymTbl,"_ErGetTime",
(char**)&TSgetTime,&stype)==ERROR)
TSgetTime = TSgetCurrentTime;
if(symFindByName(sysSymTbl,"_ErUserGetTimeStamp",
if(symFindByNameEPICS(sysSymTbl,"_ErUserGetTimeStamp",
(char**)&TSuserGet,&stype)==ERROR)
TSuserGet = TSuserGetJunk;
if(symFindByName(sysSymTbl,"_ErSyncEvent",
if(symFindByNameEPICS(sysSymTbl,"_ErSyncEvent",
(char**)&TSsyncEvent,&stype)==ERROR)
TSdata.sync_event=ER_EVENT_RESET_TICK;
else