Skip to content

Commit a659fe3

Browse files
committed
Merge branch 'release/1.3.5' into main
2 parents a785f89 + b12cd97 commit a659fe3

File tree

3 files changed

+27
-11
lines changed

3 files changed

+27
-11
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@ 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.3.5](https://github.com/rdkcentral/entservices-inputoutput/compare/1.3.4...1.3.5)
8+
9+
- RDKEMW-6230: Retry logic used dsGetHDMIARCPortId in HdmiCecSink [`#203`](https://github.com/rdkcentral/entservices-inputoutput/pull/203)
10+
- Merge tag '1.3.4' into develop [`760ee0f`](https://github.com/rdkcentral/entservices-inputoutput/commit/760ee0f9da46e0b0ed2e2adb4523bfec85c5a927)
11+
712
#### [1.3.4](https://github.com/rdkcentral/entservices-inputoutput/compare/1.3.3...1.3.4)
813

14+
> 22 July 2025
15+
916
- RDKEMW-6279: Revert of HdmiCecSink comrpc changes (#129) [`#199`](https://github.com/rdkcentral/entservices-inputoutput/pull/199)
17+
- RDKEMW-6279 - Changelog updates for 1.3.4 [`8a6fd55`](https://github.com/rdkcentral/entservices-inputoutput/commit/8a6fd55be4c187be3c725d2ca6512720bd6c018b)
1018
- Merge tag '1.3.3' into develop [`7abaec3`](https://github.com/rdkcentral/entservices-inputoutput/commit/7abaec32ed58c36ef05640ca9baaf8077b90a5d5)
1119

1220
#### [1.3.3](https://github.com/rdkcentral/entservices-inputoutput/compare/1.3.2...1.3.3)

HdmiCecSink/HdmiCecSink.cpp

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3531,15 +3531,25 @@ namespace WPEFramework
35313531
{
35323532
int err;
35333533
dsGetHDMIARCPortIdParam_t param;
3534-
err = IARM_Bus_Call(IARM_BUS_DSMGR_NAME,
3535-
(char *)IARM_BUS_DSMGR_API_dsGetHDMIARCPortId,
3536-
(void *)&param,
3537-
sizeof(param));
3538-
if (IARM_RESULT_SUCCESS == err)
3539-
{
3540-
LOGINFO("HDMI ARC port ID HdmiArcPortID=[%d] \n", param.portId);
3541-
HdmiArcPortID = param.portId;
3542-
}
3534+
unsigned int retryCount = 1;
3535+
do {
3536+
usleep(50000); // Sleep for 50ms before retrying
3537+
param.portId = -1; // Initialize to an invalid port ID
3538+
err = IARM_Bus_Call(IARM_BUS_DSMGR_NAME,
3539+
(char *)IARM_BUS_DSMGR_API_dsGetHDMIARCPortId,
3540+
(void *)&param,
3541+
sizeof(param));
3542+
if (IARM_RESULT_SUCCESS == err)
3543+
{
3544+
LOGINFO("HDMI ARC port ID HdmiArcPortID[%d] on retry count[%d]", param.portId, retryCount);
3545+
HdmiArcPortID = param.portId;
3546+
break;
3547+
}
3548+
else
3549+
{
3550+
LOGWARN("IARM_Bus_Call failed with error[%d], retry count[%d]", err, retryCount);
3551+
}
3552+
} while(retryCount++ <= 6);
35433553
}
35443554

35453555
void HdmiCecSink::getCecVersion()

Tests/L1Tests/tests/test_HdmiCecSink.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <string>
2424

2525

26-
#include "HdmiCecSinkImplementation.h"
27-
#include "HdmiCecSinkMock.h"
2826
#include "HdmiCecSink.h"
2927
#include "FactoriesImplementation.h"
3028
#include "IarmBusMock.h"

0 commit comments

Comments
 (0)