From 56eac4647265deb8b115eb1c970a0b81153a03cc Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Wed, 30 Dec 2020 22:17:08 +0100 Subject: [PATCH] Revert "device handler base update" This reverts commit 44dcd3104eae56157adee88e0ecbd8712fe86881. --- devicehandlers/DeviceHandlerBase.cpp | 19 ++++++++----------- devicehandlers/DeviceHandlerBase.h | 4 ++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/devicehandlers/DeviceHandlerBase.cpp b/devicehandlers/DeviceHandlerBase.cpp index efee1462..d0630854 100644 --- a/devicehandlers/DeviceHandlerBase.cpp +++ b/devicehandlers/DeviceHandlerBase.cpp @@ -16,8 +16,8 @@ #include -object_id_t DeviceHandlerBase::defaultPowerSwitcherId = objects::NO_OBJECT; -object_id_t DeviceHandlerBase::defaultRawDataReceiverId = objects::NO_OBJECT; +object_id_t DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT; +object_id_t DeviceHandlerBase::rawDataReceiverId = objects::NO_OBJECT; object_id_t DeviceHandlerBase::defaultFdirParentId = objects::NO_OBJECT; DeviceHandlerBase::DeviceHandlerBase(object_id_t setObjectId, @@ -151,9 +151,9 @@ ReturnValue_t DeviceHandlerBase::initialize() { return ObjectManagerIF::CHILD_INIT_FAILED; } - if(defaultRawDataReceiverId != objects::NO_OBJECT) { + if(rawDataReceiverId != objects::NO_OBJECT) { AcceptsDeviceResponsesIF *rawReceiver = objectManager->get< - AcceptsDeviceResponsesIF>(defaultRawDataReceiverId); + AcceptsDeviceResponsesIF>(rawDataReceiverId); if (rawReceiver == nullptr) { sif::error << "DeviceHandlerBase::initialize: Raw receiver object " @@ -165,9 +165,8 @@ ReturnValue_t DeviceHandlerBase::initialize() { defaultRawReceiver = rawReceiver->getDeviceQueue(); } - if(defaultPowerSwitcherId != objects::NO_OBJECT) { - powerSwitcher = objectManager->get( - defaultPowerSwitcherId); + if(powerSwitcherId != objects::NO_OBJECT) { + powerSwitcher = objectManager->get(powerSwitcherId); if (powerSwitcher == nullptr) { sif::error << "DeviceHandlerBase::initialize: Power switcher " << "object ID set but no valid object found." << std::endl; @@ -683,10 +682,8 @@ void DeviceHandlerBase::doGetRead() { replyRawData(receivedData, receivedDataLen, requestedRawTraffic); } - if (mode == MODE_RAW) { - if(defaultRawReceiver != MessageQueueIF::NO_QUEUE) { - replyRawReplyIfnotWiretapped(receivedData, receivedDataLen); - } + if (mode == MODE_RAW and defaultRawReceiver != MessageQueueIF::NO_QUEUE) { + replyRawReplyIfnotWiretapped(receivedData, receivedDataLen); } else { parseReply(receivedData, receivedDataLen); diff --git a/devicehandlers/DeviceHandlerBase.h b/devicehandlers/DeviceHandlerBase.h index 0d14bf4e..24ba0372 100644 --- a/devicehandlers/DeviceHandlerBase.h +++ b/devicehandlers/DeviceHandlerBase.h @@ -739,10 +739,10 @@ protected: PeriodicTaskIF* executingTask = nullptr; //!< Object which switches power on and off. - static object_id_t defaultPowerSwitcherId; + static object_id_t powerSwitcherId; //!< Object which receives RAW data by default. - static object_id_t defaultRawDataReceiverId; + static object_id_t rawDataReceiverId; //!< Object which may be the root cause of an identified fault. static object_id_t defaultFdirParentId;