From dfb4d7530d4b4ac59d77e372885ed45cd54c75cf Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Tue, 30 Aug 2011 17:57:09 +0000 Subject: [PATCH] VxWorks 5.5.2 DOES support iostream. Backing out -r 13350 changes. --- motorApp/MotorSrc/asynMotorAxis.cpp | 6 +++++- motorApp/MotorSrc/asynMotorController.cpp | 11 +++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/motorApp/MotorSrc/asynMotorAxis.cpp b/motorApp/MotorSrc/asynMotorAxis.cpp index c0166949..78c64dce 100644 --- a/motorApp/MotorSrc/asynMotorAxis.cpp +++ b/motorApp/MotorSrc/asynMotorAxis.cpp @@ -8,6 +8,10 @@ #include #include +#include +using std::endl; +using std::cout; + #include #include @@ -125,7 +129,7 @@ asynStatus asynMotorAxis::poll(bool *moving) */ asynStatus asynMotorAxis::doMoveToHome() { - asynPrint(pasynUser_, ASYN_TRACEIO_DRIVER, "Dummy implementation of asynMotorAxis::doMoveToHome. Axis: %d\n", pC_->moveToHomeAxis_); + cout << "Dummy implementation of asynMotorAxis::doMoveToHome. Axis: " << pC_->moveToHomeAxis_ << endl; return asynError; } diff --git a/motorApp/MotorSrc/asynMotorController.cpp b/motorApp/MotorSrc/asynMotorController.cpp index d874330e..ac1126f0 100644 --- a/motorApp/MotorSrc/asynMotorController.cpp +++ b/motorApp/MotorSrc/asynMotorController.cpp @@ -8,10 +8,13 @@ #include #include +#include +using std::endl; +using std::cout; + #include #include #include -#include #include #define epicsExportSharedSymbols @@ -671,18 +674,18 @@ asynStatus asynMotorEnableMoveToHome(const char *portName, int axis, int distanc pC = (asynMotorController*) findAsynPortDriver(portName); if (!pC) { - errlogPrintf("%s:%s:: Error port %s not found\n", driverName, functionName, portName); + cout << driverName << "::" << functionName << " Error port " << portName << " not found." << endl; return asynError; } pA = pC->getAxis(axis); if (!pA) { - errlogPrintf("%s:%s:: Error axis %d not found\n", driverName, functionName, axis); + cout << driverName << "::" << functionName << " Error axis " << axis << " not found." << endl; return asynError; } if (distance<=0) { - errlogPrintf("Error in asynMotorEnableMoveToHome. distance must be positive integer.\n"); + cout << "Error in asynMotorEnableMoveToHome. distance must be positive integer." << endl; } else { pA->setReferencingModeMove(distance); }