Skip to content

Commit 9d8bb38

Browse files
PriyaPesalaPriyaPesala
authored
Merge branch 'develop' into feature/RDKEMW-2208
2 parents 96db75f + f46b084 commit 9d8bb38

18 files changed

+2326
-1951
lines changed

‎.github/workflows/json_validator.yml‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎.github/workflows/update-changelog-and-api-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Get changed files using defaults
2323
id: changed-files
24-
uses: tj-actions/changed-files@v19
24+
uses: rdkcentral/tj-actions_changed-files@v19
2525

2626
- name: Run step when a CHANGELOG.md didn't change
2727
uses: actions/github-script@v3

‎CHANGELOG.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,37 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
#### [1.0.6](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.5...1.0.6)
8+
9+
- Removed Cec host header [`#35`](https://github.com/rdkcentral/entservices-inputoutput/pull/35)
10+
- Merge tag '1.0.5' into develop [`3b26eeb`](https://github.com/rdkcentral/entservices-inputoutput/commit/3b26eebfdf0e992e369e5cd3cdc981748c9cdb69)
11+
12+
#### [1.0.5](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.4...1.0.5)
13+
14+
> 27 March 2025
15+
16+
- RDK-56621: Update all the power manager plugin clients to new register events [`#17`](https://github.com/rdkcentral/entservices-inputoutput/pull/17)
17+
- RDKEMW-2882: Replace the references of tj-actions/changed_files [`#26`](https://github.com/rdkcentral/entservices-inputoutput/pull/26)
18+
- Replace the references of tj-actions/changed_files [`75a649d`](https://github.com/rdkcentral/entservices-inputoutput/commit/75a649d0c19c9f017701ddf408d3bbaf14680529)
19+
- 1.0.5 release change log updates [`8a276be`](https://github.com/rdkcentral/entservices-inputoutput/commit/8a276be4f917dc4e00110ff4cf1456d3d067a0fe)
20+
- Update update-changelog-and-api-version.yml [`6189d2c`](https://github.com/rdkcentral/entservices-inputoutput/commit/6189d2cf132847a726a2f7ca9e950b112e150ec4)
21+
22+
#### [1.0.4](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.3...1.0.4)
23+
24+
> 26 March 2025
25+
26+
- RDKEMW-1061: RDK-E Add COMRPC [`#29`](https://github.com/rdkcentral/entservices-inputoutput/pull/29)
27+
- Merge pull request #27 from rdkcentral/feature/RDKEMW-1061-RDK-E-Add-… [`#28`](https://github.com/rdkcentral/entservices-inputoutput/pull/28)
28+
- RDKEMW-1061: RDK-E Add COMRPC [`#27`](https://github.com/rdkcentral/entservices-inputoutput/pull/27)
29+
- 1.0.4 release change log updates [`77d6ace`](https://github.com/rdkcentral/entservices-inputoutput/commit/77d6ace1230f6d08fe2604f4de0673bb16fbebe2)
30+
- Merge tag '1.0.3' into develop [`9d73332`](https://github.com/rdkcentral/entservices-inputoutput/commit/9d7333267973f791c7183192c7fce499cbc26efc)
31+
732
#### [1.0.3](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.2...1.0.3)
833

34+
> 3 March 2025
35+
936
- RDKEMW-1691 : Revert Unsupported plugin changes [`#13`](https://github.com/rdkcentral/entservices-inputoutput/pull/13)
37+
- RDKEMW-1691 - Changelog updates for 1.0.3 [`bdbe8c0`](https://github.com/rdkcentral/entservices-inputoutput/commit/bdbe8c0e9572f79e390106242ca7b84880a208ad)
1038
- Merge tag '1.0.2' into develop [`00db359`](https://github.com/rdkcentral/entservices-inputoutput/commit/00db359737a5db24230be599bbe5f3b0345b9673)
1139

1240
#### [1.0.2](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.1...1.0.2)

‎HdcpProfile/HdcpProfile.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ namespace WPEFramework
117117
{
118118
_powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
119119
.withIShell(service)
120+
.withRetryIntervalMS(200)
121+
.withRetryCount(25)
120122
.createInterface();
121123
}
122124

‎HdmiCecSink/HdmiCecSink.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "ccec/CECFrame.hpp"
2424
#include "ccec/MessageEncoder.hpp"
2525
#include "host.hpp"
26-
#include "ccec/host/RDK.hpp"
2726
#include "UtilsgetRFCConfig.h"
2827

2928
#include "dsMgr.h"
@@ -901,6 +900,8 @@ namespace WPEFramework
901900
{
902901
_powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
903902
.withIShell(service)
903+
.withRetryIntervalMS(200)
904+
.withRetryCount(25)
904905
.createInterface();
905906
registerEventHandlers();
906907
}
@@ -910,7 +911,7 @@ namespace WPEFramework
910911

911912
if(!_registeredEventHandlers && _powerManagerPlugin) {
912913
_registeredEventHandlers = true;
913-
_powerManagerPlugin->Register(&_pwrMgrNotification);
914+
_powerManagerPlugin->Register(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
914915
}
915916
}
916917

‎HdmiCecSink/HdmiCecSink.h‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -585,33 +585,35 @@ namespace WPEFramework {
585585
END_INTERFACE_MAP
586586

587587
private:
588-
class PowerManagerNotification : public Exchange::IPowerManager::INotification {
588+
class PowerManagerNotification : public Exchange::IPowerManager::IModeChangedNotification {
589589
private:
590590
PowerManagerNotification(const PowerManagerNotification&) = delete;
591591
PowerManagerNotification& operator=(const PowerManagerNotification&) = delete;
592-
592+
593593
public:
594594
explicit PowerManagerNotification(HdmiCecSink& parent)
595595
: _parent(parent)
596596
{
597597
}
598598
~PowerManagerNotification() override = default;
599-
599+
600600
public:
601601
void OnPowerModeChanged(const PowerState &currentState, const PowerState &newState) override
602602
{
603603
_parent.onPowerModeChanged(currentState, newState);
604604
}
605-
void OnPowerModePreChange(const PowerState &currentState, const PowerState &newState) override {}
606-
void OnDeepSleepTimeout(const int &wakeupTimeout) override {}
607-
void OnNetworkStandbyModeChanged(const bool &enabled) override {}
608-
void OnThermalModeChanged(const ThermalTemperature &currentThermalLevel, const ThermalTemperature &newThermalLevel, const float &currentTemperature) override {}
609-
void OnRebootBegin(const string &rebootReasonCustom, const string &rebootReasonOther, const string &rebootRequestor) override {}
605+
606+
template <typename T>
607+
T* baseInterface()
608+
{
609+
static_assert(std::is_base_of<T, PowerManagerNotification>(), "base type mismatch");
610+
return static_cast<T*>(this);
611+
}
610612

611613
BEGIN_INTERFACE_MAP(PowerManagerNotification)
612-
INTERFACE_ENTRY(Exchange::IPowerManager::INotification)
614+
INTERFACE_ENTRY(Exchange::IPowerManager::IModeChangedNotification)
613615
END_INTERFACE_MAP
614-
616+
615617
private:
616618
HdmiCecSink& _parent;
617619
};

‎HdmiCecSource/CMakeLists.txt‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,37 +14,72 @@
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
17+
1718
set(PLUGIN_NAME HdmiCecSource)
1819
set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
20+
set(PLUGIN_IMPLEMENTATION ${MODULE_NAME}Implementation)
1921

2022
set(PLUGIN_HDMICECSOURCE_STARTUPORDER "" CACHE STRING "To configure startup order of HdmiCecSource plugin")
23+
24+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
25+
2126
set_source_files_properties(HdmiCecSource.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
27+
set_source_files_properties(HdmiCecSourceImplementation.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
2228

2329
find_package(${NAMESPACE}Plugins REQUIRED)
30+
find_package(${NAMESPACE}Definitions REQUIRED)
31+
find_package(CompileSettingsDebug CONFIG REQUIRED)
2432

2533
add_library(${MODULE_NAME} SHARED
2634
HdmiCecSource.cpp
2735
Module.cpp)
28-
2936
set_target_properties(${MODULE_NAME} PROPERTIES
3037
CXX_STANDARD 11
3138
CXX_STANDARD_REQUIRED YES)
3239

40+
target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../helpers)
41+
42+
target_link_libraries(${MODULE_NAME}
43+
PRIVATE
44+
CompileSettingsDebug::CompileSettingsDebug
45+
${NAMESPACE}Plugins::${NAMESPACE}Plugins
46+
${NAMESPACE}Definitions::${NAMESPACE}Definitions
47+
${IARMBUS_LIBRARIES})
48+
49+
install(TARGETS ${MODULE_NAME}
50+
DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
51+
52+
add_library(${PLUGIN_IMPLEMENTATION} SHARED
53+
HdmiCecSourceImplementation.cpp
54+
Module.cpp)
55+
56+
set_target_properties(${PLUGIN_IMPLEMENTATION} PROPERTIES
57+
CXX_STANDARD 11
58+
CXX_STANDARD_REQUIRED YES)
59+
3360
find_package(DS)
3461
find_package(IARMBus)
3562
find_package(CEC)
3663

37-
target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../helpers)
38-
target_include_directories(${MODULE_NAME} PRIVATE ${CEC_INCLUDE_DIRS})
39-
target_include_directories(${MODULE_NAME} PRIVATE ${DS_INCLUDE_DIRS})
4064

41-
target_link_libraries(${MODULE_NAME} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${CEC_LIBRARIES} ${DS_LIBRARIES} )
65+
target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../helpers)
66+
target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${CEC_INCLUDE_DIRS})
67+
target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${DS_INCLUDE_DIRS})
68+
69+
70+
target_link_libraries(${PLUGIN_IMPLEMENTATION} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${CEC_LIBRARIES} ${DS_LIBRARIES} )
71+
72+
target_link_libraries(${PLUGIN_IMPLEMENTATION}
73+
PRIVATE
74+
CompileSettingsDebug::CompileSettingsDebug
75+
${NAMESPACE}Plugins::${NAMESPACE}Plugins)
4276

4377
if (NOT RDK_SERVICES_L1_TEST)
44-
target_compile_options(${MODULE_NAME} PRIVATE -Wno-error=deprecated)
78+
target_compile_options(${PLUGIN_IMPLEMENTATION} PRIVATE -Wno-error=deprecated)
4579
endif ()
4680

47-
install(TARGETS ${MODULE_NAME}
48-
DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
81+
82+
install(TARGETS ${PLUGIN_IMPLEMENTATION}
83+
DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
4984

5085
write_config(${PLUGIN_NAME})

‎HdmiCecSource/HdmiCecSource.conf.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@ precondition = ["Platform"]
22
callsign = "org.rdk.HdmiCecSource"
33
autostart = "false"
44
startuporder = "@PLUGIN_HDMICECSOURCE_STARTUPORDER@"
5+
6+
configuration = JSON()
7+
rootobject = JSON()
8+
9+
rootobject.add("mode", "@PLUGIN_HDMICECSOURCE_MODE@")
10+
rootobject.add("locator", "lib@[email protected]")
11+
configuration.add("root", rootobject)

‎HdmiCecSource/HdmiCecSource.config‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,13 @@ set (callsign "org.rdk.HdmiCecSource")
55
if(PLUGIN_HDMICECSOURCE_STARTUPORDER)
66
set (startuporder ${PLUGIN_HDMICECSOURCE_STARTUPORDER})
77
endif()
8+
9+
10+
map()
11+
key(root)
12+
map()
13+
kv(mode ${PLUGIN_HDMICECSOURCE_MODE})
14+
kv(locator lib${PLUGIN_IMPLEMENTATION}.so)
15+
end()
16+
end()
17+
ans(configuration)

0 commit comments

Comments
 (0)