Skip to content

Commit 9bdf158

Browse files
srikanth-vvsrikanth-vv
committed
Merge branch 'release/1.0.10' into main
2 parents 4d132d4 + 36cea31 commit 9bdf158

File tree

5 files changed

+42
-37
lines changed

5 files changed

+42
-37
lines changed

‎.github/workflows/L1-tests.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ jobs:
247247
network/wifiSrvMgrIarmIf.h
248248
network/netsrvmgrIarm.h
249249
libudev.h
250-
libusb.h
251250
rfcapi.h
252251
rbus.h
253252
motionDetector.h
@@ -297,7 +296,6 @@ jobs:
297296
-I $GITHUB_WORKSPACE/Thunder/Source/core
298297
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
299298
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
300-
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/libusb.h
301299
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
302300
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/RBus.h
303301
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Telemetry.h
@@ -367,7 +365,6 @@ jobs:
367365
-I $GITHUB_WORKSPACE/Thunder/Source/core
368366
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
369367
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
370-
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/libusb.h
371368
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
372369
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/RBus.h
373370
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Telemetry.h

‎.github/workflows/L2-tests.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ jobs:
203203
rfcapi.h
204204
rbus.h
205205
libudev.h
206-
libusb.h
207206
systemservices/proc/readproc.h
208207
systemservices/secure_wrapper.h
209208
systemaudioplatform.h
@@ -283,7 +282,6 @@ jobs:
283282
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/RBus.h
284283
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Udev.h
285284
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Wraps.h
286-
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/libusb.h
287285
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/maintenanceMGR.h
288286
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/pkg.h
289287
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/secure_wrappermock.h

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,19 @@ 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.10](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.9...1.0.10)
8+
9+
- RDK-55554 Update return type [`#60`](https://github.com/rdkcentral/entservices-inputoutput/pull/60)
10+
- RDKEMW-3207 [OSCR SCAN] RDKE - entservices-testframework [`#61`](https://github.com/rdkcentral/entservices-inputoutput/pull/61)
11+
- Modifying L1-tests.yml L2-tests.yml [`fd0a678`](https://github.com/rdkcentral/entservices-inputoutput/commit/fd0a6783526fa0dd6d6541b31aeef4c2d8272fb5)
12+
- Merge tag '1.0.9' into develop [`668cc7c`](https://github.com/rdkcentral/entservices-inputoutput/commit/668cc7ce09864ac16e6c609cabbfcf94ae16faba)
13+
714
#### [1.0.9](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.8...1.0.9)
815

16+
> 15 April 2025
17+
918
- RDK-57093: Resolved the compilation error [`#55`](https://github.com/rdkcentral/entservices-inputoutput/pull/55)
19+
- 1.0.9 release change log updates [`fb8eb3c`](https://github.com/rdkcentral/entservices-inputoutput/commit/fb8eb3c4fe58d2165dbab6d57d8eab46673ed1f3)
1020
- Merge tag '1.0.8' into develop [`fe37f21`](https://github.com/rdkcentral/entservices-inputoutput/commit/fe37f210ddbf3e698fccc454fd7593e7fb6e4a9d)
1121

1222
#### [1.0.8](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.7...1.0.8)

‎HdmiCecSource/HdmiCecSourceImplementation.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ namespace WPEFramework
392392
DeinitializeIARM();
393393
}
394394

395-
uint32_t HdmiCecSourceImplementation::Configure(PluginHost::IShell* service)
395+
Core::hresult HdmiCecSourceImplementation::Configure(PluginHost::IShell* service)
396396
{
397397
LOGINFO("Configure");
398398
ASSERT(service != nullptr);
@@ -479,7 +479,7 @@ namespace WPEFramework
479479

480480
}
481481

482-
uint32_t HdmiCecSourceImplementation::Register(Exchange::IHdmiCecSource::INotification* notification)
482+
Core::hresult HdmiCecSourceImplementation::Register(Exchange::IHdmiCecSource::INotification* notification)
483483
{
484484

485485
LOGINFO("Register");
@@ -501,7 +501,7 @@ namespace WPEFramework
501501
}
502502

503503

504-
uint32_t HdmiCecSourceImplementation::Unregister(Exchange::IHdmiCecSource::INotification* notification)
504+
Core::hresult HdmiCecSourceImplementation::Unregister(Exchange::IHdmiCecSource::INotification* notification)
505505
{
506506
LOGINFO("Unregister");
507507
if(notification != nullptr){
@@ -572,7 +572,7 @@ namespace WPEFramework
572572
}
573573

574574

575-
uint32_t HdmiCecSourceImplementation::GetActiveSourceStatus(bool &isActiveSource, bool &success)
575+
Core::hresult HdmiCecSourceImplementation::GetActiveSourceStatus(bool &isActiveSource, bool &success)
576576
{
577577
isActiveSource = isDeviceActiveSource;
578578
success = true;
@@ -653,7 +653,7 @@ namespace WPEFramework
653653
return Core::ERROR_NONE;
654654
}
655655

656-
uint32_t HdmiCecSourceImplementation::SendKeyPressEvent(const uint32_t &logicalAddress,const uint32_t &keyCode, HdmiCecSourceSuccess &success)
656+
Core::hresult HdmiCecSourceImplementation::SendKeyPressEvent(const uint32_t &logicalAddress,const uint32_t &keyCode, HdmiCecSourceSuccess &success)
657657
{
658658
SendKeyInfo keyInfo;
659659
try {
@@ -684,7 +684,7 @@ namespace WPEFramework
684684

685685
}
686686

687-
uint32_t HdmiCecSourceImplementation::SendStandbyMessage(HdmiCecSourceSuccess &success)
687+
Core::hresult HdmiCecSourceImplementation::SendStandbyMessage(HdmiCecSourceSuccess &success)
688688
{
689689
bool ret = false;
690690

@@ -946,7 +946,7 @@ namespace WPEFramework
946946
return cecSettingEnabled;
947947
}
948948

949-
uint32_t HdmiCecSourceImplementation::SetEnabled(const bool &enabled, HdmiCecSourceSuccess &success)
949+
Core::hresult HdmiCecSourceImplementation::SetEnabled(const bool &enabled, HdmiCecSourceSuccess &success)
950950
{
951951
LOGINFO("Entered SetEnabled ");
952952

@@ -967,7 +967,7 @@ namespace WPEFramework
967967
return Core::ERROR_NONE;
968968
}
969969

970-
uint32_t HdmiCecSourceImplementation::SetOTPEnabled(const bool &enabled, HdmiCecSourceSuccess &success)
970+
Core::hresult HdmiCecSourceImplementation::SetOTPEnabled(const bool &enabled, HdmiCecSourceSuccess &success)
971971
{
972972
if (cecOTPSettingEnabled != enabled)
973973
{
@@ -1197,31 +1197,31 @@ namespace WPEFramework
11971197
return;
11981198
}
11991199

1200-
uint32_t HdmiCecSourceImplementation::GetEnabled(bool &enabled, bool &success)
1200+
Core::hresult HdmiCecSourceImplementation::GetEnabled(bool &enabled, bool &success)
12011201
{
12021202
LOGINFO("GetEnabled :%d ",cecEnableStatus);
12031203
enabled = cecEnableStatus;
12041204
success = true;
12051205
return Core::ERROR_NONE;
12061206
}
12071207

1208-
uint32_t HdmiCecSourceImplementation::GetOTPEnabled(bool &enabled, bool &success)
1208+
Core::hresult HdmiCecSourceImplementation::GetOTPEnabled(bool &enabled, bool &success)
12091209
{
12101210
enabled = cecOTPSettingEnabled;
12111211
LOGINFO("GetOTPEnabled :%d ",cecOTPSettingEnabled);
12121212
success = true;
12131213
return Core::ERROR_NONE;
12141214
}
12151215

1216-
uint32_t HdmiCecSourceImplementation::GetOSDName(std::string &name, bool &success)
1216+
Core::hresult HdmiCecSourceImplementation::GetOSDName(std::string &name, bool &success)
12171217
{
12181218
name = osdName.toString();
12191219
LOGINFO("GetOSDName :%s ",name.c_str());
12201220
success = true;
12211221
return Core::ERROR_NONE;
12221222
}
12231223

1224-
uint32_t HdmiCecSourceImplementation::SetOSDName(const std::string &name, HdmiCecSourceSuccess &success)
1224+
Core::hresult HdmiCecSourceImplementation::SetOSDName(const std::string &name, HdmiCecSourceSuccess &success)
12251225
{
12261226
LOGINFO("SetOSDName :%s ",name.c_str());
12271227
osdName = name.c_str();
@@ -1230,15 +1230,15 @@ namespace WPEFramework
12301230
return Core::ERROR_NONE;
12311231
}
12321232

1233-
uint32_t HdmiCecSourceImplementation::GetVendorId(std::string &vendorid, bool &success)
1233+
Core::hresult HdmiCecSourceImplementation::GetVendorId(std::string &vendorid, bool &success)
12341234
{
12351235
vendorid = appVendorId.toString();
12361236
LOGINFO("GetVendorId :%s ",vendorid.c_str());
12371237
success = true;
12381238
return Core::ERROR_NONE;
12391239
}
12401240

1241-
uint32_t HdmiCecSourceImplementation::SetVendorId(const string &vendorid, HdmiCecSourceSuccess &success)
1241+
Core::hresult HdmiCecSourceImplementation::SetVendorId(const string &vendorid, HdmiCecSourceSuccess &success)
12421242
{
12431243
LOGINFO("SetVendorId :%s ",vendorid.c_str());
12441244
unsigned int vendorIdInt = 0;
@@ -1258,7 +1258,7 @@ namespace WPEFramework
12581258
return Core::ERROR_NONE;
12591259
}
12601260

1261-
uint32_t HdmiCecSourceImplementation::PerformOTPAction(HdmiCecSourceSuccess &success)
1261+
Core::hresult HdmiCecSourceImplementation::PerformOTPAction(HdmiCecSourceSuccess &success)
12621262
{
12631263
LOGINFO("PerformOTPAction ");
12641264
bool ret = false;
@@ -1300,7 +1300,7 @@ namespace WPEFramework
13001300
}
13011301
}
13021302

1303-
uint32_t HdmiCecSourceImplementation::GetDeviceList(uint32_t &numberofdevices, IHdmiCecSourceDeviceListIterator*& deviceList, bool &success)
1303+
Core::hresult HdmiCecSourceImplementation::GetDeviceList(uint32_t &numberofdevices, IHdmiCecSourceDeviceListIterator*& deviceList, bool &success)
13041304
{ //sample servicemanager response:
13051305
std::vector<Exchange::IHdmiCecSource::HdmiCecSourceDevices> localDevices;
13061306
Exchange::IHdmiCecSource::HdmiCecSourceDevices actual_hdmicecdevices = {0};

‎HdmiCecSource/HdmiCecSourceImplementation.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -319,22 +319,22 @@ namespace WPEFramework {
319319
std::list<Exchange::IHdmiCecSource::INotification*> _hdmiCecSourceNotifications;
320320

321321
public:
322-
uint32_t SetEnabled(const bool &enabled, HdmiCecSourceSuccess &success) override;
323-
uint32_t GetEnabled(bool &enabled, bool &success) override;
324-
uint32_t SetOTPEnabled(const bool &enabled, HdmiCecSourceSuccess &success) override;
325-
uint32_t GetOTPEnabled(bool &enabled, bool &success) override;
326-
uint32_t SetOSDName(const string &name, HdmiCecSourceSuccess &success) override;
327-
uint32_t GetOSDName(string &name, bool &success) override;
328-
uint32_t SetVendorId(const string &vendorid, HdmiCecSourceSuccess &success) override;
329-
uint32_t GetVendorId(string &vendorid, bool &success) override;
330-
uint32_t PerformOTPAction(HdmiCecSourceSuccess &success) override;
331-
uint32_t SendStandbyMessage(HdmiCecSourceSuccess &success) override;
332-
uint32_t SendKeyPressEvent(const uint32_t &logicalAddress,const uint32_t &keyCode, HdmiCecSourceSuccess &success) override;
333-
uint32_t GetActiveSourceStatus(bool &isActiveSource, bool &success) override;
334-
uint32_t GetDeviceList(uint32_t &numberofdevices, IHdmiCecSourceDeviceListIterator*& deviceList, bool &success) override;
335-
uint32_t Configure(PluginHost::IShell* service) override;
336-
uint32_t Register(Exchange::IHdmiCecSource::INotification *notification) override;
337-
uint32_t Unregister(Exchange::IHdmiCecSource::INotification *notification) override;
322+
Core::hresult SetEnabled(const bool &enabled, HdmiCecSourceSuccess &success) override;
323+
Core::hresult GetEnabled(bool &enabled, bool &success) override;
324+
Core::hresult SetOTPEnabled(const bool &enabled, HdmiCecSourceSuccess &success) override;
325+
Core::hresult GetOTPEnabled(bool &enabled, bool &success) override;
326+
Core::hresult SetOSDName(const string &name, HdmiCecSourceSuccess &success) override;
327+
Core::hresult GetOSDName(string &name, bool &success) override;
328+
Core::hresult SetVendorId(const string &vendorid, HdmiCecSourceSuccess &success) override;
329+
Core::hresult GetVendorId(string &vendorid, bool &success) override;
330+
Core::hresult PerformOTPAction(HdmiCecSourceSuccess &success) override;
331+
Core::hresult SendStandbyMessage(HdmiCecSourceSuccess &success) override;
332+
Core::hresult SendKeyPressEvent(const uint32_t &logicalAddress,const uint32_t &keyCode, HdmiCecSourceSuccess &success) override;
333+
Core::hresult GetActiveSourceStatus(bool &isActiveSource, bool &success) override;
334+
Core::hresult GetDeviceList(uint32_t &numberofdevices, IHdmiCecSourceDeviceListIterator*& deviceList, bool &success) override;
335+
Core::hresult Configure(PluginHost::IShell* service) override;
336+
Core::hresult Register(Exchange::IHdmiCecSource::INotification *notification) override;
337+
Core::hresult Unregister(Exchange::IHdmiCecSource::INotification *notification) override;
338338

339339

340340
};

0 commit comments

Comments
 (0)