Skip to content

Commit 3034d01

Browse files
RDKEMW-4196: Cleanup and remove pwrmgr references from workflows (#126)
Reason for change: Cleanup and remove pwrmgr references from workflows Test Procedure: build Risks: Medium Signed-off-by:gsanto722 [email protected]
1 parent ef949f3 commit 3034d01

File tree

7 files changed

+3
-30
lines changed

7 files changed

+3
-30
lines changed

.github/workflows/L1-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ jobs:
252252
rdk/iarmbus/libIBusDaemon.h
253253
rdk/halif/deepsleep-manager/deepSleepMgr.h
254254
rdk/iarmmgrs-hal/mfrMgr.h
255-
rdk/iarmmgrs-hal/pwrMgr.h
256255
rdk/iarmmgrs-hal/sysMgr.h
257256
network/wifiSrvMgrIarmIf.h
258257
network/netsrvmgrIarm.h

.github/workflows/L2-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ jobs:
195195
rdk/iarmbus/libIBus.h
196196
rdk/iarmbus/libIBusDaemon.h
197197
rdk/iarmmgrs-hal/mfrMgr.h
198-
rdk/iarmmgrs-hal/pwrMgr.h
199198
rdk/iarmmgrs-hal/sysMgr.h
200199
rdk/iarmbus/iarmUtil.h
201200
rfcapi.h

L2HalMock/build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@ cp $SCRIPTS_DIR/patches/rdkservices/files/wdmp-c.h /usr/local/include/wdmp-c
184184
cd /usr/include/
185185
mkdir rdk
186186
cd /usr/include/rdk
187-
mkdir iarmmgrs-hal
188-
cp $WORKSPACE/deps/rdk/iarmmgrs/hal/include/pwrMgr.h /usr/include/rdk/iarmmgrs-hal
187+
189188

190189
sed -i 's/sendNotify/Notify/g' $RDK_DIR/HdmiCecSource/HdmiCecSource.cpp
191190
sed -i 's/sendNotify/Notify/g' $RDK_DIR/HdmiCecSink/HdmiCecSink.cpp

Tests/L1Tests/tests/test_HdcpProfile.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "dsMgr.h"
3232
#include "dsDisplay.h"
3333
#include "ThunderPortability.h"
34-
#include "pwrMgr.h"
3534
#include "PowerManagerMock.h"
3635

3736
#include <iostream>
@@ -505,16 +504,6 @@ TEST_F(HDCPProfileEventIarmTest, onHdmiOutputHDCPStatusEvent)
505504
return Core::ERROR_NONE;
506505
}));
507506

508-
ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call)
509-
.WillByDefault(
510-
[](const char* ownerName, const char* methodName, void* arg, size_t argLen) {
511-
if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) {
512-
auto* param = static_cast<IARM_Bus_PWRMgr_GetPowerState_Param_t*>(arg);
513-
param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON;
514-
}
515-
return IARM_RESULT_SUCCESS;
516-
});
517-
518507
EVENT_SUBSCRIBE(0, _T("onDisplayConnectionChanged"), _T("client.events"), message);
519508

520509
IARM_Bus_DSMgr_EventData_t eventData;

Tests/L1Tests/tests/test_HdmiCecSource.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "HdmiCecSourceImplementation.h"
2727
#include "HdmiCec.h"
2828
#include "HdmiCecSource.h"
29-
#include "pwrMgr.h"
3029
#include "PowerManagerMock.h"
3130
#include "FactoriesImplementation.h"
3231
#include "IarmBusMock.h"
@@ -365,16 +364,6 @@ class HdmiCecSourceTest : public ::testing::Test {
365364

366365
return IARM_RESULT_SUCCESS;
367366
}));
368-
369-
ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call)
370-
.WillByDefault(
371-
[](const char* ownerName, const char* methodName, void* arg, size_t argLen) {
372-
if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) {
373-
auto* param = static_cast<IARM_Bus_PWRMgr_GetPowerState_Param_t*>(arg);
374-
param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON;
375-
}
376-
return IARM_RESULT_SUCCESS;
377-
});
378367

379368
}
380369
virtual ~HdmiCecSourceTest() override

build_dependencies.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ touch rdk/iarmbus/libIBus.h
153153
touch rdk/iarmbus/libIBusDaemon.h
154154
touch rdk/iarmmgrs-hal/deepSleepMgr.h
155155
touch rdk/iarmmgrs-hal/mfrMgr.h
156-
touch rdk/iarmmgrs-hal/pwrMgr.h
157156
touch rdk/iarmmgrs-hal/sysMgr.h
158157
touch network/wifiSrvMgrIarmIf.h
159158
touch network/netsrvmgrIarm.h

cmake/FindIARMBus.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ find_package(PkgConfig)
2828
find_library(IARMBUS_LIBRARIES NAMES IARMBus)
2929
find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
3030
find_path(IARMRECEIVER_INCLUDE_DIRS NAMES receiverMgr.h PATH_SUFFIXES rdk/iarmmgrs/receiver)
31-
find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
3231

3332
set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
34-
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS})
35-
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
33+
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS})
34+
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
3635

3736
include(FindPackageHandleStandardArgs)
3837
FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES)

0 commit comments

Comments
 (0)