Skip to content

Commit b57e501

Browse files
srikanth-vvsrikanth-vv
committed
Merge branch 'release/1.9.0' into main
2 parents c4dd162 + a523151 commit b57e501

File tree

3 files changed

+54
-46
lines changed

3 files changed

+54
-46
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,18 @@ 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.9.0](https://github.com/rdkcentral/entservices-apis/compare/1.8.0...1.9.0)
8+
9+
- Rdkemw 2865 device info guidelines [`#319`](https://github.com/rdkcentral/entservices-apis/pull/319)
10+
- Merge tag '1.8.0' into develop [`1e2ba8e`](https://github.com/rdkcentral/entservices-apis/commit/1e2ba8eec4dc7b6de03815c7a086887b9fa1867e)
11+
712
#### [1.8.0](https://github.com/rdkcentral/entservices-apis/compare/1.7.4...1.8.0)
813

14+
> 20 June 2025
15+
916
- * RDKEMW-1015 : HDMICEC SINK COMRPC [`#114`](https://github.com/rdkcentral/entservices-apis/pull/114)
1017
- RDK-57197: Add Analytics sendEvent.appId and update documentation [`#280`](https://github.com/rdkcentral/entservices-apis/pull/280)
18+
- 1.8.0 release changelog updates [`50afe6f`](https://github.com/rdkcentral/entservices-apis/commit/50afe6ff13547c3f96caf33f32bb80b095ba030f)
1119
- Merge tag '1.7.4' into develop [`501e1b2`](https://github.com/rdkcentral/entservices-apis/commit/501e1b27a3ea1734fff8b3a50d5f1e3e76ec629c)
1220

1321
#### [1.7.4](https://github.com/rdkcentral/entservices-apis/compare/1.7.3...1.7.4)

‎apis/DeviceInfo/IDeviceInfo.h‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ namespace Exchange {
3131

3232
virtual ~IDeviceInfo() override = default;
3333

34-
virtual uint32_t SerialNumber(string& serialNumber /* @out */) const = 0;
35-
virtual uint32_t Sku(string& sku /* @out */) const = 0;
36-
virtual uint32_t Make(string& make /* @out */) const = 0;
37-
virtual uint32_t Model(string& model /* @out */) const = 0;
38-
virtual uint32_t DeviceType(string& deviceType /* @out */) const = 0;
39-
virtual uint32_t SocName(string& socName /* @out */) const = 0;
40-
virtual uint32_t DistributorId(string& distributorId /* @out */) const = 0;
41-
virtual uint32_t Brand(string& brand /* @out */) const = 0;
34+
virtual Core::hresult SerialNumber(string& serialNumber /* @out */) const = 0;
35+
virtual Core::hresult Sku(string& sku /* @out */) const = 0;
36+
virtual Core::hresult Make(string& make /* @out */) const = 0;
37+
virtual Core::hresult Model(string& model /* @out */) const = 0;
38+
virtual Core::hresult DeviceType(string& deviceType /* @out */) const = 0;
39+
virtual Core::hresult SocName(string& socName /* @out */) const = 0;
40+
virtual Core::hresult DistributorId(string& distributorId /* @out */) const = 0;
41+
virtual Core::hresult Brand(string& brand /* @out */) const = 0;
4242
virtual Core::hresult ReleaseVersion(string& releaseVersion /* @out */) const = 0;
4343
virtual Core::hresult ChipSet(string& chipSet /* @out */) const = 0;
4444
};
@@ -87,10 +87,10 @@ namespace Exchange {
8787
typedef RPC::IIteratorType<MS12Capability, ID_DEVICE_CAPABILITIES_AUDIO_MS12_CAPABILITY> IMS12CapabilityIterator;
8888
typedef RPC::IIteratorType<MS12Profile, ID_DEVICE_CAPABILITIES_AUDIO_MS12_PROFILE> IMS12ProfileIterator;
8989

90-
virtual uint32_t SupportedAudioPorts(RPC::IStringIterator*& supportedAudioPorts /* @out */) const = 0;
91-
virtual uint32_t AudioCapabilities(const string& audioPort /* @in */, IAudioCapabilityIterator*& audioCapabilities /* @out */) const = 0;
92-
virtual uint32_t MS12Capabilities(const string& audioPort /* @in */, IMS12CapabilityIterator*& ms12Capabilities /* @out */) const = 0;
93-
virtual uint32_t SupportedMS12AudioProfiles(const string& audioPort /* @in */, RPC::IStringIterator*& supportedMS12AudioProfiles /* @out */) const = 0;
90+
virtual Core::hresult SupportedAudioPorts(RPC::IStringIterator*& supportedAudioPorts /* @out */) const = 0;
91+
virtual Core::hresult AudioCapabilities(const string& audioPort /* @in */, IAudioCapabilityIterator*& audioCapabilities /* @out */) const = 0;
92+
virtual Core::hresult MS12Capabilities(const string& audioPort /* @in */, IMS12CapabilityIterator*& ms12Capabilities /* @out */) const = 0;
93+
virtual Core::hresult SupportedMS12AudioProfiles(const string& audioPort /* @in */, RPC::IStringIterator*& supportedMS12AudioProfiles /* @out */) const = 0;
9494
};
9595

9696
struct EXTERNAL IDeviceVideoCapabilities : virtual public Core::IUnknown {
@@ -111,31 +111,31 @@ namespace Exchange {
111111
};
112112

113113
enum ScreenResolution : uint8_t {
114-
ScreenResolution_Unknown = 0,
115-
ScreenResolution_480i = 1,
116-
ScreenResolution_480p = 2,
117-
ScreenResolution_576i = 3,
118-
ScreenResolution_576p = 4,
119-
ScreenResolution_576p50Hz = 5,
120-
ScreenResolution_720p = 6,
121-
ScreenResolution_720p50Hz = 7,
122-
ScreenResolution_768p60Hz = 8,
123-
ScreenResolution_1080i = 9,
124-
ScreenResolution_1080i25Hz = 10,
125-
ScreenResolution_1080i50Hz = 11,
126-
ScreenResolution_1080p = 12,
127-
ScreenResolution_1080p24Hz = 13,
128-
ScreenResolution_1080p25Hz = 14,
129-
ScreenResolution_1080p30Hz = 15,
130-
ScreenResolution_1080p50Hz = 16,
131-
ScreenResolution_1080p60Hz = 17,
132-
ScreenResolution_2160p24Hz = 18,
133-
ScreenResolution_2160p25Hz = 19,
134-
ScreenResolution_2160p30Hz = 20,
135-
ScreenResolution_2160p50Hz = 21,
136-
ScreenResolution_2160p60Hz = 22,
137-
ScreenResolution_4320p30Hz = 23,
138-
ScreenResolution_4320p60Hz = 24
114+
SCREENRESOLUTION_UNKNOWN = 0,
115+
SCREENRESOLUTION_480I = 1,
116+
SCREENRESOLUTION_480P = 2,
117+
SCREENRESOLUTION_576I = 3,
118+
SCREENRESOLUTION_576P = 4,
119+
SCREENRESOLUTION_576P50HZ = 5,
120+
SCREENRESOLUTION_720P = 6,
121+
SCREENRESOLUTION_720P50HZ = 7,
122+
SCREENRESOLUTION_768P60HZ = 8,
123+
SCREENRESOLUTION_1080I = 9,
124+
SCREENRESOLUTION_1080I25HZ = 10,
125+
SCREENRESOLUTION_1080I50HZ = 11,
126+
SCREENRESOLUTION_1080P = 12,
127+
SCREENRESOLUTION_1080P24HZ = 13,
128+
SCREENRESOLUTION_1080P25HZ = 14,
129+
SCREENRESOLUTION_1080P30HZ = 15,
130+
SCREENRESOLUTION_1080P50HZ = 16,
131+
SCREENRESOLUTION_1080P60HZ = 17,
132+
SCREENRESOLUTION_2160P24HZ = 18,
133+
SCREENRESOLUTION_2160P25HZ = 19,
134+
SCREENRESOLUTION_2160P30HZ = 20,
135+
SCREENRESOLUTION_2160P50HZ = 21,
136+
SCREENRESOLUTION_2160P60HZ = 22,
137+
SCREENRESOLUTION_4320P30HZ = 23,
138+
SCREENRESOLUTION_4320P60HZ = 24
139139
};
140140

141141
enum CopyProtection : uint8_t {
@@ -149,11 +149,11 @@ namespace Exchange {
149149
typedef RPC::IIteratorType<VideoOutput, ID_DEVICE_CAPABILITIES_VIDEO_OUTPUT> IVideoOutputIterator;
150150
typedef RPC::IIteratorType<ScreenResolution, ID_DEVICE_CAPABILITIES_RESOLUTION> IScreenResolutionIterator;
151151

152-
virtual uint32_t SupportedVideoDisplays(RPC::IStringIterator*& supportedVideoDisplays /* @out */) const = 0;
153-
virtual uint32_t DefaultResolution(const string& videoDisplay /* @in */, string& defaultResolution /* @out */) const = 0;
154-
virtual uint32_t SupportedResolutions(const string& videoDisplay /* @in */, RPC::IStringIterator*& supportedResolutions /* @out */) const = 0;
155-
virtual uint32_t HostEDID(string& edid /* @out */) const = 0;
156-
virtual uint32_t SupportedHdcp(const string& videoDisplay /* @in */, CopyProtection& supportedHDCPVersion /* @out */) const = 0;
152+
virtual Core::hresult SupportedVideoDisplays(RPC::IStringIterator*& supportedVideoDisplays /* @out */) const = 0;
153+
virtual Core::hresult DefaultResolution(const string& videoDisplay /* @in */, string& defaultResolution /* @out */) const = 0;
154+
virtual Core::hresult SupportedResolutions(const string& videoDisplay /* @in */, RPC::IStringIterator*& supportedResolutions /* @out */) const = 0;
155+
virtual Core::hresult HostEDID(string& edid /* @out */) const = 0;
156+
virtual Core::hresult SupportedHdcp(const string& videoDisplay /* @in */, CopyProtection& supportedHDCPVersion /* @out */) const = 0;
157157
};
158158
}
159159
}

‎apis/DeviceInfo/IFirmwareVersion.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ namespace Exchange {
2929

3030
virtual ~IFirmwareVersion() override = default;
3131

32-
virtual uint32_t Imagename(string& imagename /* @out */) const = 0;
33-
virtual uint32_t Sdk(string& sdk /* @out */) const = 0;
34-
virtual uint32_t Mediarite(string& mediarite /* @out */) const = 0;
35-
virtual uint32_t Yocto(string& yocto /* @out */) const = 0;
32+
virtual Core::hresult Imagename(string& imagename /* @out */) const = 0;
33+
virtual Core::hresult Sdk(string& sdk /* @out */) const = 0;
34+
virtual Core::hresult Mediarite(string& mediarite /* @out */) const = 0;
35+
virtual Core::hresult Yocto(string& yocto /* @out */) const = 0;
3636
};
3737
}
3838
}

0 commit comments

Comments
 (0)