From bf7bc342ff2bb816d910bd2c142661fecd25c867 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 5 Nov 2019 19:30:02 +0100 Subject: [PATCH] Revert "documentation for DHB init function, ioBoard addres has default value 0 now, order in ctor changed (not used in source)" This reverts commit c6e34cada64f59757e420347dec8373401d73c7a. --- devicehandlers/ChildHandlerBase.cpp | 4 ++-- devicehandlers/DeviceHandlerBase.cpp | 9 +++++---- devicehandlers/DeviceHandlerBase.h | 21 +++------------------ 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/devicehandlers/ChildHandlerBase.cpp b/devicehandlers/ChildHandlerBase.cpp index fb9238f7e..50a5c07e5 100644 --- a/devicehandlers/ChildHandlerBase.cpp +++ b/devicehandlers/ChildHandlerBase.cpp @@ -7,8 +7,8 @@ ChildHandlerBase::ChildHandlerBase(uint32_t ioBoardAddress, uint32_t maxDeviceReplyLen, uint8_t setDeviceSwitch, uint32_t thermalStatePoolId, uint32_t thermalRequestPoolId, uint32_t parent, FailureIsolationBase* customFdir, uint32_t cmdQueueSize) : - DeviceHandlerBase(setObjectId, maxDeviceReplyLen, - setDeviceSwitch, deviceCommunication,ioBoardAddress, thermalStatePoolId, + DeviceHandlerBase(ioBoardAddress, setObjectId, maxDeviceReplyLen, + setDeviceSwitch, deviceCommunication, thermalStatePoolId, thermalRequestPoolId, (customFdir == NULL? &childHandlerFdir : customFdir), cmdQueueSize), parentId( parent), childHandlerFdir(setObjectId) { } diff --git a/devicehandlers/DeviceHandlerBase.cpp b/devicehandlers/DeviceHandlerBase.cpp index 6150954d9..def9a7245 100644 --- a/devicehandlers/DeviceHandlerBase.cpp +++ b/devicehandlers/DeviceHandlerBase.cpp @@ -16,10 +16,11 @@ object_id_t DeviceHandlerBase::powerSwitcherId = 0; object_id_t DeviceHandlerBase::rawDataReceiverId = 0; object_id_t DeviceHandlerBase::defaultFDIRParentId = 0; -DeviceHandlerBase::DeviceHandlerBase(object_id_t setObjectId, - uint32_t maxDeviceReplyLen, uint8_t setDeviceSwitch, - object_id_t deviceCommunication, uint32_t ioBoardAddress, uint32_t thermalStatePoolId, - uint32_t thermalRequestPoolId, FailureIsolationBase* fdirInstance, uint32_t cmdQueueSize) : +DeviceHandlerBase::DeviceHandlerBase(uint32_t ioBoardAddress, + object_id_t setObjectId, uint32_t maxDeviceReplyLen, + uint8_t setDeviceSwitch, object_id_t deviceCommunication, + uint32_t thermalStatePoolId, uint32_t thermalRequestPoolId, + FailureIsolationBase* fdirInstance, uint32_t cmdQueueSize) : SystemObject(setObjectId),ioBoardAddress(ioBoardAddress), rawPacket(0), rawPacketLen(0), mode(MODE_OFF), submode(SUBMODE_NONE), pstStep(0), maxDeviceReplyLen(maxDeviceReplyLen), wiretappingMode(OFF), defaultRawReceiver(0), storedRawData(StorageManagerIF::INVALID_ADDRESS), diff --git a/devicehandlers/DeviceHandlerBase.h b/devicehandlers/DeviceHandlerBase.h index 040c21903..03e35727e 100644 --- a/devicehandlers/DeviceHandlerBase.h +++ b/devicehandlers/DeviceHandlerBase.h @@ -76,10 +76,10 @@ public: * @param maxDeviceReplyLen the length the RMAP getRead call will be sent with * @param setDeviceSwitch the switch the device is connected to, for devices using two switches, overwrite getSwitches() */ - DeviceHandlerBase(object_id_t setObjectId, + DeviceHandlerBase(uint32_t ioBoardAddress, object_id_t setObjectId, uint32_t maxDeviceReplyLen, uint8_t setDeviceSwitch, - object_id_t deviceCommunication,uint32_t ioBoardAddress = 0, - uint32_t thermalStatePoolId = PoolVariableIF::NO_PARAMETER, + object_id_t deviceCommunication, uint32_t thermalStatePoolId = + PoolVariableIF::NO_PARAMETER, uint32_t thermalRequestPoolId = PoolVariableIF::NO_PARAMETER, FailureIsolationBase* fdirInstance = NULL, uint32_t cmdQueueSize = 20); @@ -116,21 +116,6 @@ public: */ virtual ReturnValue_t performOperation(uint8_t counter); - /** - * Prerequisites to call initialize function without custom implementation: - * 1. The three static framework IDs are set to respective objects in the Factory function - * - First ID: Power Switcher ID. Example: PCDU Handler Object - * - Second ID: Raw Data Receiver. Example: PUS Service 2 Object - * - Third ID: Default FDIR parent ID. Example: ? - * 2. Communication Interface Object for respective device. - * Example: UART Communication Interface which calls respective UART drivers - * 3. Health table class has been instantiated in Factory - * 4. deviceThermalRequestPoolId and deviceThermalStatePoolId are set to the respective data pool entries. - * This is only required if thermal checking is needed. Otherwise, set both variables to - * PoolVariableIF::NO_PARAMETER - * - * @return - */ virtual ReturnValue_t initialize(); /**