diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c index bbfe60ecf..70f368f5a 100644 --- a/src/db/dbAccess.c +++ b/src/db/dbAccess.c @@ -417,7 +417,7 @@ long dbPutField(paddr,dbrType,pbuffer,nRequest) dbScanLock(paddr->precord); status=dbPut(paddr,dbrType,pbuffer,nRequest); if(status) recGblDbaddrError(status,paddr,"dbPutField"); - if(RTN_SUCCESS(status) && pfldDes->process_passive) status=dbScanPassive(paddr); + if(RTN_SUCCESS(status) && pfldDes->process_passive) (void)dbScanPassive(paddr); dbScanUnlock(paddr->precord); return(status); } diff --git a/src/db/iocInit.c b/src/db/iocInit.c index 987a8e8a4..063b9c274 100644 --- a/src/db/iocInit.c +++ b/src/db/iocInit.c @@ -84,8 +84,7 @@ char * pResourceFilename; return(-1); } if(status=initBusController()) { - logMsg("iocInit aborting because initBusController failed\n"); - return(-1); + logMsg("Xycom SRM010 Bus Controller Not Present\n"); } if(status=sdrLoad(pfilename)) { logMsg("iocInit aborting because sdrLoad failed\n"); @@ -98,13 +97,13 @@ char * pResourceFilename; logMsg("getResources completed\n"); initialized = TRUE; logMsg("sdrLoad completed\n"); + /* enable interrupt level 5 and 6 */ + sysIntEnable(5); + sysIntEnable(6); if(initDrvSup()==0) logMsg("Drivers Initialized\n"); if(initRecSup()==0) logMsg("Record Support Initialized\n"); if(initDevSup()==0) logMsg("Device Support Initialized\n"); ts_init(); logMsg("Time Stamp Driver Initialized\n"); - /* enable interrupt level 5 and 6 */ - sysIntEnable(5); - sysIntEnable(6); if(initDatabase()==0) logMsg("Database Initialized\n"); /* if user exit exists call it */ strcpy(name,"_"); @@ -508,7 +507,7 @@ static long getResources(fname) /* Resource Definition File interpreter */ float n_float; double n_double; if (!fname) { - printf("getResources(): RETURNING because of NULL arg\n"); + errMessage("getResources(): RETURNING because of NULL arg\n"); return (0); } if ((fd = open(fname, READ, 0x0)) < 0) {