Merge branch 'develop' into feature/RDK-52028

Author: aktamilbe

.github/workflows/json_validator.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Get changed files using defaults
         id: changed-files
-        uses: tj-actions/changed-files@v19
+        uses: rdkcentral/tj-actions_changed-files@v19
 
       - name: Run step when a CHANGELOG.md didn't change
         uses: actions/github-script@v3

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

@@ -4,9 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.0.4](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.3...1.0.4)
+
+- RDKEMW-1061: RDK-E Add COMRPC [`#29`](https://github.com/rdkcentral/entservices-inputoutput/pull/29)
+- Merge pull request #27 from rdkcentral/feature/RDKEMW-1061-RDK-E-Add-… [`#28`](https://github.com/rdkcentral/entservices-inputoutput/pull/28)
+- RDKEMW-1061: RDK-E Add COMRPC [`#27`](https://github.com/rdkcentral/entservices-inputoutput/pull/27)
+- Merge tag '1.0.3' into develop [`9d73332`](https://github.com/rdkcentral/entservices-inputoutput/commit/9d7333267973f791c7183192c7fce499cbc26efc)
+
 #### [1.0.3](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.2...1.0.3)
 
+> 3 March 2025
+
 - RDKEMW-1691 : Revert Unsupported plugin changes  [`#13`](https://github.com/rdkcentral/entservices-inputoutput/pull/13)
+- RDKEMW-1691 - Changelog updates for 1.0.3 [`bdbe8c0`](https://github.com/rdkcentral/entservices-inputoutput/commit/bdbe8c0e9572f79e390106242ca7b84880a208ad)
 - Merge tag '1.0.2' into develop [`00db359`](https://github.com/rdkcentral/entservices-inputoutput/commit/00db359737a5db24230be599bbe5f3b0345b9673)
 
 #### [1.0.2](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.1...1.0.2)

CHANGELOG.md

@@ -117,6 +117,8 @@ namespace WPEFramework
         {
             _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
                                     .withIShell(service)
+                                    .withRetryIntervalMS(200)
+                                    .withRetryCount(25)
                                     .createInterface();
         }
 

HdcpProfile/HdcpProfile.cpp

@@ -23,7 +23,6 @@
 #include "ccec/CECFrame.hpp"
 #include "ccec/MessageEncoder.hpp"
 #include "host.hpp"
-#include "ccec/host/RDK.hpp"
 #include "UtilsgetRFCConfig.h"
 
 #include "dsMgr.h"
@@ -901,6 +900,8 @@ namespace WPEFramework
         {
             _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
                                     .withIShell(service)
+                                    .withRetryIntervalMS(200)
+                                    .withRetryCount(25)
                                     .createInterface();
             registerEventHandlers();
         }
@@ -910,7 +911,7 @@ namespace WPEFramework
 
            if(!_registeredEventHandlers && _powerManagerPlugin) {
                _registeredEventHandlers = true;
-               _powerManagerPlugin->Register(&_pwrMgrNotification);
+               _powerManagerPlugin->Register(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
            }
        }
 

HdmiCecSink/HdmiCecSink.cpp

@@ -585,33 +585,35 @@ namespace WPEFramework {
             END_INTERFACE_MAP
 
         private:
-            class PowerManagerNotification : public Exchange::IPowerManager::INotification {
+            class PowerManagerNotification : public Exchange::IPowerManager::IModeChangedNotification {
             private:
                 PowerManagerNotification(const PowerManagerNotification&) = delete;
                 PowerManagerNotification& operator=(const PowerManagerNotification&) = delete;
-            
+
             public:
                 explicit PowerManagerNotification(HdmiCecSink& parent)
                     : _parent(parent)
                 {
                 }
                 ~PowerManagerNotification() override = default;
-            
+
             public:
                 void OnPowerModeChanged(const PowerState &currentState, const PowerState &newState) override
                 {
                     _parent.onPowerModeChanged(currentState, newState);
                 }
-                void OnPowerModePreChange(const PowerState &currentState, const PowerState &newState) override {}
-                void OnDeepSleepTimeout(const int &wakeupTimeout) override {}
-                void OnNetworkStandbyModeChanged(const bool &enabled) override {}
-                void OnThermalModeChanged(const ThermalTemperature &currentThermalLevel, const ThermalTemperature &newThermalLevel, const float &currentTemperature) override {}
-                void OnRebootBegin(const string &rebootReasonCustom, const string &rebootReasonOther, const string &rebootRequestor) override {}
+
+                template <typename T>
+                T* baseInterface()
+                {
+                    static_assert(std::is_base_of<T, PowerManagerNotification>(), "base type mismatch");
+                    return static_cast<T*>(this);
+                }
 
                 BEGIN_INTERFACE_MAP(PowerManagerNotification)
-                INTERFACE_ENTRY(Exchange::IPowerManager::INotification)
+                INTERFACE_ENTRY(Exchange::IPowerManager::IModeChangedNotification)
                 END_INTERFACE_MAP
-            
+
             private:
                 HdmiCecSink& _parent;
             };

HdmiCecSink/HdmiCecSink.h

@@ -14,37 +14,72 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 set(PLUGIN_NAME HdmiCecSource)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
+set(PLUGIN_IMPLEMENTATION ${MODULE_NAME}Implementation)
 
 set(PLUGIN_HDMICECSOURCE_STARTUPORDER "" CACHE STRING "To configure startup order of HdmiCecSource plugin")
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
 set_source_files_properties(HdmiCecSource.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
+set_source_files_properties(HdmiCecSourceImplementation.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
+find_package(${NAMESPACE}Definitions REQUIRED)
+find_package(CompileSettingsDebug CONFIG REQUIRED)
 
 add_library(${MODULE_NAME} SHARED
         HdmiCecSource.cpp
         Module.cpp)
-
 set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../helpers)
+
+target_link_libraries(${MODULE_NAME}
+    PRIVATE
+        CompileSettingsDebug::CompileSettingsDebug
+        ${NAMESPACE}Plugins::${NAMESPACE}Plugins
+        ${NAMESPACE}Definitions::${NAMESPACE}Definitions
+        ${IARMBUS_LIBRARIES})        
+
+install(TARGETS ${MODULE_NAME}
+    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+
+add_library(${PLUGIN_IMPLEMENTATION} SHARED
+        HdmiCecSourceImplementation.cpp
+        Module.cpp)
+
+set_target_properties(${PLUGIN_IMPLEMENTATION} PROPERTIES
+        CXX_STANDARD 11
+        CXX_STANDARD_REQUIRED YES)
+
 find_package(DS)
 find_package(IARMBus)
 find_package(CEC)
 
-target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../helpers)
-target_include_directories(${MODULE_NAME} PRIVATE ${CEC_INCLUDE_DIRS})
-target_include_directories(${MODULE_NAME} PRIVATE ${DS_INCLUDE_DIRS})
 
-target_link_libraries(${MODULE_NAME} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${CEC_LIBRARIES} ${DS_LIBRARIES} )
+target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../helpers)
+target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${CEC_INCLUDE_DIRS})
+target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${DS_INCLUDE_DIRS})
+
+
+target_link_libraries(${PLUGIN_IMPLEMENTATION} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${CEC_LIBRARIES} ${DS_LIBRARIES} )
+
+target_link_libraries(${PLUGIN_IMPLEMENTATION}
+    PRIVATE
+        CompileSettingsDebug::CompileSettingsDebug
+        ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 
 if (NOT RDK_SERVICES_L1_TEST)
-    target_compile_options(${MODULE_NAME} PRIVATE -Wno-error=deprecated)
+    target_compile_options(${PLUGIN_IMPLEMENTATION} PRIVATE -Wno-error=deprecated)
 endif ()
 
-install(TARGETS ${MODULE_NAME}
-        DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+
+install(TARGETS ${PLUGIN_IMPLEMENTATION}
+    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
 
 write_config(${PLUGIN_NAME})

HdmiCecSource/CMakeLists.txt

@@ -2,3 +2,10 @@ precondition = ["Platform"]
 callsign = "org.rdk.HdmiCecSource"
 autostart = "false"
 startuporder = "@PLUGIN_HDMICECSOURCE_STARTUPORDER@"
+
+configuration = JSON()
+rootobject = JSON()
+
+rootobject.add("mode", "@PLUGIN_HDMICECSOURCE_MODE@")
+rootobject.add("locator", "lib@[email protected]")
+configuration.add("root", rootobject)

HdmiCecSource/HdmiCecSource.conf.in

@@ -5,3 +5,13 @@ set (callsign "org.rdk.HdmiCecSource")
 if(PLUGIN_HDMICECSOURCE_STARTUPORDER)
 set (startuporder ${PLUGIN_HDMICECSOURCE_STARTUPORDER})
 endif()
+
+
+map()
+   key(root)
+   map()
+       kv(mode ${PLUGIN_HDMICECSOURCE_MODE})
+       kv(locator lib${PLUGIN_IMPLEMENTATION}.so)
+   end()
+end()
+ans(configuration)