From 142aa9571aa949b3c68aa1b1b190a4d4a9f05e49 Mon Sep 17 00:00:00 2001 From: William Lupton Date: Thu, 4 Jun 1998 19:21:23 +0000 Subject: [PATCH] changed to use symFindByNameEPICS --- src/bdt/bdtServ.c | 5 ++++- src/db/devLib.c | 6 +++--- src/db/drvTS.c | 30 ++++++++++++++++++++---------- src/db/iocInit.c | 10 +++++----- src/dbStatic/dbStaticRun.c | 2 +- src/dev/symbDev/devSymbFind.c | 9 ++++++--- src/drv/ansi/drvEpvxi.c | 18 +++++++++--------- src/drv/old/drvGpib.c | 13 ++++++++----- src/libvxWorks/ldpp.c | 5 ++++- src/rec/gsubRecord.c | 4 ++-- src/rec/subRecord.c | 4 ++-- src/vxWorks/db/devLib.c | 6 +++--- src/vxWorks/db/drvTS.c | 30 ++++++++++++++++++++---------- 13 files changed, 87 insertions(+), 55 deletions(-) diff --git a/src/bdt/bdtServ.c b/src/bdt/bdtServ.c index 4a2072092..ed8bed86e 100644 --- a/src/bdt/bdtServ.c +++ b/src/bdt/bdtServ.c @@ -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); diff --git a/src/db/devLib.c b/src/db/devLib.c index acbc19222..9fae68376 100644 --- a/src/db/devLib.c +++ b/src/db/devLib.c @@ -947,7 +947,7 @@ void initHandlerAddrList(void) for(i=0; inode)) { 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, diff --git a/src/dbStatic/dbStaticRun.c b/src/dbStatic/dbStaticRun.c index 4bb9155e0..caecfb049 100644 --- a/src/dbStatic/dbStaticRun.c +++ b/src/dbStatic/dbStaticRun.c @@ -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; diff --git a/src/dev/symbDev/devSymbFind.c b/src/dev/symbDev/devSymbFind.c index 67614258e..8a8e81dce 100644 --- a/src/dev/symbDev/devSymbFind.c +++ b/src/dev/symbDev/devSymbFind.c @@ -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"); diff --git a/src/drv/ansi/drvEpvxi.c b/src/drv/ansi/drvEpvxi.c index 3a9f91225..00e4d622b 100644 --- a/src/drv/ansi/drvEpvxi.c +++ b/src/drv/ansi/drvEpvxi.c @@ -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; iinam); - 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); diff --git a/src/rec/subRecord.c b/src/rec/subRecord.c index 1cb8853d6..c3dd61ff3 100644 --- a/src/rec/subRecord.c +++ b/src/rec/subRecord.c @@ -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); diff --git a/src/vxWorks/db/devLib.c b/src/vxWorks/db/devLib.c index acbc19222..9fae68376 100644 --- a/src/vxWorks/db/devLib.c +++ b/src/vxWorks/db/devLib.c @@ -947,7 +947,7 @@ void initHandlerAddrList(void) for(i=0; i