diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml index 9d741808..336d9d38 100755 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -252,7 +252,6 @@ jobs: rdk/iarmbus/libIBusDaemon.h rdk/halif/deepsleep-manager/deepSleepMgr.h rdk/iarmmgrs-hal/mfrMgr.h - rdk/iarmmgrs-hal/pwrMgr.h rdk/iarmmgrs-hal/sysMgr.h network/wifiSrvMgrIarmIf.h network/netsrvmgrIarm.h diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 11cb4f3b..c8fbcf6c 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -195,7 +195,6 @@ jobs: rdk/iarmbus/libIBus.h rdk/iarmbus/libIBusDaemon.h rdk/iarmmgrs-hal/mfrMgr.h - rdk/iarmmgrs-hal/pwrMgr.h rdk/iarmmgrs-hal/sysMgr.h rdk/iarmbus/iarmUtil.h rfcapi.h diff --git a/L2HalMock/build.sh b/L2HalMock/build.sh index 31ab3ef5..5f123247 100644 --- a/L2HalMock/build.sh +++ b/L2HalMock/build.sh @@ -184,8 +184,7 @@ cp $SCRIPTS_DIR/patches/rdkservices/files/wdmp-c.h /usr/local/include/wdmp-c cd /usr/include/ mkdir rdk cd /usr/include/rdk -mkdir iarmmgrs-hal -cp $WORKSPACE/deps/rdk/iarmmgrs/hal/include/pwrMgr.h /usr/include/rdk/iarmmgrs-hal + sed -i 's/sendNotify/Notify/g' $RDK_DIR/HdmiCecSource/HdmiCecSource.cpp sed -i 's/sendNotify/Notify/g' $RDK_DIR/HdmiCecSink/HdmiCecSink.cpp diff --git a/Tests/L1Tests/tests/test_HdcpProfile.cpp b/Tests/L1Tests/tests/test_HdcpProfile.cpp index dbcd5562..f0f6a06f 100755 --- a/Tests/L1Tests/tests/test_HdcpProfile.cpp +++ b/Tests/L1Tests/tests/test_HdcpProfile.cpp @@ -31,7 +31,6 @@ #include "dsMgr.h" #include "dsDisplay.h" #include "ThunderPortability.h" -#include "pwrMgr.h" #include "PowerManagerMock.h" #include @@ -505,16 +504,6 @@ TEST_F(HDCPProfileEventIarmTest, onHdmiOutputHDCPStatusEvent) return Core::ERROR_NONE; })); - ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call) - .WillByDefault( - [](const char* ownerName, const char* methodName, void* arg, size_t argLen) { - if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) { - auto* param = static_cast(arg); - param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON; - } - return IARM_RESULT_SUCCESS; - }); - EVENT_SUBSCRIBE(0, _T("onDisplayConnectionChanged"), _T("client.events"), message); IARM_Bus_DSMgr_EventData_t eventData; diff --git a/Tests/L1Tests/tests/test_HdmiCecSource.cpp b/Tests/L1Tests/tests/test_HdmiCecSource.cpp index 9a08cadb..3ae56adb 100755 --- a/Tests/L1Tests/tests/test_HdmiCecSource.cpp +++ b/Tests/L1Tests/tests/test_HdmiCecSource.cpp @@ -26,7 +26,6 @@ #include "HdmiCecSourceImplementation.h" #include "HdmiCec.h" #include "HdmiCecSource.h" -#include "pwrMgr.h" #include "PowerManagerMock.h" #include "FactoriesImplementation.h" #include "IarmBusMock.h" @@ -365,16 +364,6 @@ class HdmiCecSourceTest : public ::testing::Test { return IARM_RESULT_SUCCESS; })); - - ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call) - .WillByDefault( - [](const char* ownerName, const char* methodName, void* arg, size_t argLen) { - if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) { - auto* param = static_cast(arg); - param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON; - } - return IARM_RESULT_SUCCESS; - }); } virtual ~HdmiCecSourceTest() override diff --git a/build_dependencies.sh b/build_dependencies.sh index d03a3082..c085255d 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -153,7 +153,6 @@ touch rdk/iarmbus/libIBus.h touch rdk/iarmbus/libIBusDaemon.h touch rdk/iarmmgrs-hal/deepSleepMgr.h touch rdk/iarmmgrs-hal/mfrMgr.h -touch rdk/iarmmgrs-hal/pwrMgr.h touch rdk/iarmmgrs-hal/sysMgr.h touch network/wifiSrvMgrIarmIf.h touch network/netsrvmgrIarm.h diff --git a/cmake/FindIARMBus.cmake b/cmake/FindIARMBus.cmake index 7d32a1ba..da1d5877 100644 --- a/cmake/FindIARMBus.cmake +++ b/cmake/FindIARMBus.cmake @@ -28,11 +28,10 @@ find_package(PkgConfig) find_library(IARMBUS_LIBRARIES NAMES IARMBus) find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus) find_path(IARMRECEIVER_INCLUDE_DIRS NAMES receiverMgr.h PATH_SUFFIXES rdk/iarmmgrs/receiver) -find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal) set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library") -set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS}) -set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include") +set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS}) +set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include") include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES)