diff --git a/src/cas/example/Makefile.Unix b/src/cas/example/Makefile.Unix index 26db77a64..a05d46121 100644 --- a/src/cas/example/Makefile.Unix +++ b/src/cas/example/Makefile.Unix @@ -1,26 +1,29 @@ -TOP = ../../../.. CAS = ../../ +TOP = $(CAS)/../.. include $(TOP)/src/config/CONFIG_BASE #CPLUSPLUS = G++ -GDD = $(CAS)/gdd +GDD = $(CAS)/../gdd CAS_INCLUDES = -I$(CAS)/generic -I$(CAS)/../ca -USR_INCLUDES = -I$(GDD) $(CAS_INCLUDES) +USR_INCLUDES = -I$(GDD) -I$(GDD)/O.$(T_A) $(CAS_INCLUDES) + +USR_LDLIBS = -lcas -lca -lCom -lgdd -lm + ifeq ($(CPLUSPLUS),G++) -USR_LDLIBS = -lca -lCom -lgdd -lm -liberty -else -USR_LDLIBS = -lca -lCom -lgdd -lm +USR_LDLIBS += -liberty endif -USR_LDFLAGS = -L$(GDD)/sun4/ +USR_LDFLAGS = -L$(GDD)/O.$(T_A)/ DEPLIBS_BASE = $(EPICS_BASE_LIB) -DEPLIBS = $(DEPLIBS_BASE)/libca.a $(DEPLIBS_BASE)/libCom.a $(GDD)/sun4/libgdd.a +DEPLIBSWOCAS = $(DEPLIBS_BASE)/libca.a \ + $(DEPLIBS_BASE)/libCom.a $(GDD)/O.$(T_A)/libgdd.a +DEPLIBS = $(DEPLIBS_BASE)/libcas.a $(DEPLIBSWOCAS) SRCS.cc += ../exServer.cc SRCS.cc += ../exPV.cc @@ -75,12 +78,15 @@ GLOMBOBJ += $(BUILDDIR)sigPipeIgnore.o include $(TOP)/src/config/RULES.Unix -#PURIFY = /remote/lear_local/pure/purify-3.0a-sunos4/purify -nolib: $(OBJS) $(GLOMBOBJ) $(DEPLIBS) - $(PURIFY) $(LINK.cc) -o $@ $(OBJS) $(GLOMBOBJ) $(USR_LDFLAGS) $(USR_LDLIBS) +excas: $(OBJS) $(DEPLIBS) + $(LINK.cc) -o $@ $(OBJS) $(LDFLAGS) $(LDLIBS) -excas: $(OBJS) $(DEPLIBS) $(DEPLIBS_BASE)/libcas.a - $(LINK.cc) -o $@ $(OBJS) $(USR_LDFLAGS) -lcas $(USR_LDLIBS) +# +# fast link (without library build) +# +#PURIFY = /remote/lear_local/pure/purify-3.0a-sunos4/purify +nolib: $(OBJS) $(GLOMBOBJ) $(DEPLIBSWOCAS) + $(PURIFY) $(LINK.cc) -o $@ $(OBJS) $(GLOMBOBJ) $(DEPLIBSWOCAS) clean:: @$(RM) excas diff --git a/src/cas/example/exPV.cc b/src/cas/example/exPV.cc index 32ac2237d..6a2f2e7a8 100644 --- a/src/cas/example/exPV.cc +++ b/src/cas/example/exPV.cc @@ -3,6 +3,7 @@ // #include +#include const double myPI = 3.14159265358979323846; @@ -13,7 +14,7 @@ exPV::exPV (const casCtx &ctxIn, const pvInfo &setup) : pValue(NULL), pScanTimer(NULL), info(setup), - casPV(ctxIn, setup.getName().String()), + casPV(ctxIn, setup.getName().string()), interest(aitFalse) { // @@ -32,7 +33,7 @@ exPV::~exPV() this->pScanTimer = NULL; } if (this->pValue) { - this->pValue->Unreference(); + this->pValue->unreference(); this->pValue = NULL; } } @@ -60,7 +61,7 @@ void exPV::scanPV() radians = (rand () * 2.0 * myPI)/RAND_MAX; if (this->pValue) { - this->pValue->GetConvert(newValue); + this->pValue->getConvert(newValue); } else { newValue = 0.0f; @@ -76,7 +77,7 @@ void exPV::scanPV() errMessage (status, "scan update failed\n"); } - pDD->Unreference(); + pDD->unreference(); } // @@ -128,28 +129,28 @@ caStatus exPV::update(gdd &valueIn) } # if DEBUG - printf("%s = %f\n", this->info.getName().String, valueIn); + printf("%s = %f\n", this->info.getName().string, valueIn); # endif gdds = gddApplicationTypeTable:: - app_table.SmartCopy(pNewValue, &valueIn); + app_table.smartCopy(pNewValue, &valueIn); if (gdds) { - pNewValue->Unreference(); + pNewValue->unreference(); return S_cas_noConvert; } cur.get (t.tv_sec, t.tv_nsec); - pNewValue->SetTimeStamp(&t); + pNewValue->setTimeStamp(&t); - pNewValue->SetStat (epicsAlarmNone); - pNewValue->SetSevr (epicsSevNone); + pNewValue->setStat (epicsAlarmNone); + pNewValue->setSevr (epicsSevNone); // // release old value and replace it // with the new one // if (this->pValue) { - this->pValue->Unreference(); + this->pValue->unreference(); } this->pValue = pNewValue; @@ -187,7 +188,7 @@ caStatus exPV::interestRegister() if (!this->pScanTimer) { errPrintf (S_cas_noMemory, __FILE__, __LINE__, "Scan init for %s failed\n", - this->info.getName().String()); + this->info.getName().string()); return S_cas_noMemory; } } @@ -216,8 +217,8 @@ void exPV::show(unsigned level) { if (level>1u) { if (this->pValue) { - printf("exPV: cond=%d\n", this->pValue->GetStat()); - printf("exPV: sevr=%d\n", this->pValue->GetSevr()); + printf("exPV: cond=%d\n", this->pValue->getStat()); + printf("exPV: sevr=%d\n", this->pValue->getSevr()); printf("exPV: value=%f\n", (double) *this->pValue); } printf("exPV: interest=%d\n", this->interest); @@ -231,10 +232,10 @@ void exPV::show(unsigned level) caStatus exPV::getStatus(gdd &value) { if (this->pValue) { - value.PutConvert(this->pValue->GetStat()); + value.putConvert(this->pValue->getStat()); } else { - value.PutConvert(epicsAlarmUDF); + value.putConvert(epicsAlarmUDF); } return S_cas_success; } @@ -245,10 +246,10 @@ caStatus exPV::getStatus(gdd &value) caStatus exPV::getSeverity(gdd &value) { if (this->pValue) { - value.PutConvert(this->pValue->GetSevr()); + value.putConvert(this->pValue->getSevr()); } else { - value.PutConvert(epicsSevInvalid); + value.putConvert(epicsSevInvalid); } return S_cas_success; } @@ -260,7 +261,7 @@ inline aitTimeStamp exPV::getTS() { aitTimeStamp ts; if (this->pValue) { - this->pValue->GetTimeStamp(&ts); + this->pValue->getTimeStamp(&ts); } else { osiTime cur(osiTime::getCurrent()); @@ -275,7 +276,7 @@ inline aitTimeStamp exPV::getTS() caStatus exPV::getSeconds(gdd &value) { aitUint32 sec (this->getTS().tv_sec); - value.PutConvert (sec); + value.putConvert (sec); return S_cas_success; } @@ -285,7 +286,7 @@ caStatus exPV::getSeconds(gdd &value) caStatus exPV::getNanoseconds(gdd &value) { aitUint32 nsec (this->getTS().tv_nsec); - value.PutConvert (nsec); + value.putConvert (nsec); return S_cas_success; } @@ -294,7 +295,7 @@ caStatus exPV::getNanoseconds(gdd &value) // caStatus exPV::getPrecision(gdd &prec) { - prec.PutConvert(4u); + prec.putConvert(4u); return S_cas_success; } @@ -303,7 +304,7 @@ caStatus exPV::getPrecision(gdd &prec) // caStatus exPV::getHighLimit(gdd &value) { - value.PutConvert(info.getHopr()); + value.putConvert(info.getHopr()); return S_cas_success; } @@ -312,7 +313,7 @@ caStatus exPV::getHighLimit(gdd &value) // caStatus exPV::getLowLimit(gdd &value) { - value.PutConvert(info.getLopr()); + value.putConvert(info.getLopr()); return S_cas_success; } @@ -322,7 +323,7 @@ caStatus exPV::getLowLimit(gdd &value) caStatus exPV::getUnits(gdd &units) { static aitString str("@#$%"); - units.PutRef(str); + units.putRef(str); return S_cas_success; } @@ -337,7 +338,7 @@ caStatus exPV::getValue(gdd &value) gddStatus gdds; gdds = gddApplicationTypeTable:: - app_table.SmartCopy(&value, this->pValue); + app_table.smartCopy(&value, this->pValue); if (gdds) { status = S_cas_noConvert; } diff --git a/src/cas/example/exServer.cc b/src/cas/example/exServer.cc index fde8562c9..bf7a69b29 100644 --- a/src/cas/example/exServer.cc +++ b/src/cas/example/exServer.cc @@ -109,7 +109,7 @@ caStatus exServer::pvExistTest(const casCtx &ctxIn, const char *pPVName, * there are no name aliases in this * server's PV name syntax */ - canonicalPVName.PutRef (&pPVI->getName()); + canonicalPVName.putRef (&pPVI->getName()); return S_casApp_success; } @@ -126,7 +126,7 @@ const pvInfo *exServer::findPV(const char *pName) &exServer::pvList[NELEMENTS(exServer::pvList)]; for (pPVI = exServer::pvList; pPVI < pPVAfter; pPVI++) { - if (strcmp (pName, pPVI->getName().String()) == '\0') { + if (strcmp (pName, pPVI->getName().string()) == '\0') { return pPVI; } } diff --git a/src/cas/example/exServer.h b/src/cas/example/exServer.h index 4d6c928ea..ffda4c808 100644 --- a/src/cas/example/exServer.h +++ b/src/cas/example/exServer.h @@ -370,7 +370,7 @@ public: const casCtx &ctxIn, gdd &canonicalPVName) : exAsyncIO(ctxIn, &canonicalPVName) { - canonicalPVName.PutRef(&pPVI->getName()); + canonicalPVName.putRef(&pPVI->getName()); } //