Removed dsMgr and IARM header

Author: KaleeswaranGnanagurusamy

HdcpProfile/CMakeLists.txt

@@ -67,7 +67,6 @@ target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}Protocols::${
 endif (USE_THUNDER_R4)
 
 find_package(DS)
-find_package(IARMBus)
 find_package(CEC)
 
 if (RDK_SERVICE_L2_TEST)
@@ -82,14 +81,13 @@ if (RDK_SERVICE_L2_TEST)
 endif()
 
 
-target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${IARMBUS_INCLUDE_DIRS})
 target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${DS_INCLUDE_DIRS})
 target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ../helpers)
 
 
 set_source_files_properties(HdcpProfile.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
 
-target_link_libraries(${PLUGIN_IMPLEMENTATION} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${DS_LIBRARIES})
+target_link_libraries(${PLUGIN_IMPLEMENTATION} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${DS_LIBRARIES})
 
 install(TARGETS ${PLUGIN_IMPLEMENTATION}
         DESTINATION lib/${STORAGE_DIRECTORY}/plugins)

HdcpProfile/HdcpProfileImplementation.cpp

@@ -23,7 +23,6 @@
 
  #include "videoOutputPort.hpp"
  #include "videoOutputPortConfig.hpp"
- #include "dsMgr.h"
  #include "manager.hpp"
 
  #include "UtilsJsonRpc.h"
@@ -79,7 +78,7 @@
                                      .createInterface();
          }
 
-         void HdcpProfileImplementation::onHdmiOutputHotPlug(int connectStatus)
+         void HdcpProfileImplementation::onHdmiOutputHotPlug(dsDisplayEvent_t connectStatus)
          {
              if (HDMI_HOT_PLUG_EVENT_CONNECTED == connectStatus)
              {
@@ -115,7 +114,7 @@
                      status.hdcpReason);
         }
 
-         void HdcpProfileImplementation::onHdmiOutputHDCPStatusEvent(int hdcpStatus)
+         void HdcpProfileImplementation::onHdmiOutputHDCPStatusEvent(dsHdcpStatus_t hdcpStatus)
          {
              LOGINFO("hdcpStatus[%d]",hdcpStatus);
              onHdcpProfileDisplayConnectionChanged();
@@ -124,7 +123,7 @@
          void HdcpProfileImplementation::OnDisplayHDMIHotPlug(dsDisplayEvent_t displayEvent)
          {
              LOGINFO("Received OnDisplayHDMIHotPlug  event data:%d \r\n", displayEvent);
-             HdcpProfileImplementation::_instance->onHdmiOutputHotPlug(static_cast<int>(displayEvent));
+             HdcpProfileImplementation::_instance->onHdmiOutputHotPlug(displayEvent);
          }
 
          void HdcpProfileImplementation::OnHDCPStatusChange(dsHdcpStatus_t hdcpStatus)
@@ -143,7 +142,7 @@
                  else
                  {
                      LOGINFO("Received OnHDCPStatusChange  event data:%d  param.curState: %d \r\n", hdcpStatus,pwrStateCur);
-                     HdcpProfileImplementation::_instance->onHdmiOutputHDCPStatusEvent(static_cast<int>(hdcpStatus));
+                     HdcpProfileImplementation::_instance->onHdmiOutputHDCPStatusEvent(hdcpStatus);
                  }
              }
          }
@@ -211,8 +210,8 @@
              _service = service;
              _service->AddRef();
              ASSERT(service != nullptr);
-             device::Host::getInstance().Register(baseInterface<device::Host::IVideoOutputPortEvents>(),"WPE[HdcpProfile]");
-             device::Host::getInstance().Register(baseInterface<device::Host::IDisplayDeviceEvents>(),"WPE[HdcpProfile]");
+             device::Host::getInstance().Register(baseInterface<device::Host::IVideoOutputPortEvents>(),"WPE::HdcpProfile");
+             device::Host::getInstance().Register(baseInterface<device::Host::IDisplayDeviceEvents>(),"WPE::HdcpProfile");
              InitializePowerManager(service);
              return result;
          }

HdcpProfile/HdcpProfileImplementation.h

@@ -127,8 +127,8 @@
              Core::hresult GetSettopHDCPSupport(string& supportedHDCPVersion,bool& isHDCPSupported,bool& success) override;
              bool GetHDCPStatusInternal(HDCPStatus& hdcpstatus);
              void InitializePowerManager(PluginHost::IShell *service);
-             void onHdmiOutputHotPlug(int connectStatus);
-             void onHdmiOutputHDCPStatusEvent(int);
+             void onHdmiOutputHotPlug(dsDisplayEvent_t connectStatus);
+             void onHdmiOutputHDCPStatusEvent(dsHdcpStatus_t);
              void logHdcpStatus (const char *trigger, HDCPStatus& status);   
              void onHdcpProfileDisplayConnectionChanged();  
              static PowerManagerInterfaceRef _powerManagerPlugin;