Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 23:35:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

tv.cec: Add a constant and fix cec module name

Browse Source 
Bug: 32073236
Test: Checked CEC features works on fugu after applying Treble HAL
Change-Id: I70f542dff6dce7b336523788a4e203f432b1b6a7
This commit is contained in:
Donghyun Cho
2016-11-04 05:38:40 +09:00
parent d81c8e6db2
commit c22bed3255
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tv/cec/1.0/default/HdmiCec.cpp
View File

@@ -389,7 +389,7 @@ IHdmiCec* HIDL_FETCH_IHdmiCec(const char* hal) {
int ret = 0;
const hw_module_t* hw_module = nullptr;
ret = hw_get_module (hal, &hw_module);
ret = hw_get_module (HDMI_CEC_HARDWARE_MODULE_ID, &hw_module);
if (ret == 0) {
ret = hdmi_cec_open (hw_module, &hdmi_cec_device);
if (ret != 0) {

4
tv/cec/1.0/default/HdmiCec.h
View File

@@ -34,6 +34,7 @@ namespace implementation {
using ::android::hardware::tv::cec::V1_0::CecLogicalAddress;
using ::android::hardware::tv::cec::V1_0::CecMessage;
using ::android::hardware::tv::cec::V1_0::MaxLength;
using ::android::hardware::tv::cec::V1_0::HdmiPortInfo;
using ::android::hardware::tv::cec::V1_0::IHdmiCec;
using ::android::hardware::tv::cec::V1_0::IHdmiCecCallback;
@@ -65,7 +66,8 @@ struct HdmiCec : public IHdmiCec {
static void eventCallback(const hdmi_event_t* event, void* arg) {
if (mCallback != nullptr && event != nullptr) {
if (event->type == HDMI_EVENT_CEC_MESSAGE) {
size_t length = std::min(event->cec.length, static_cast<size_t>(15));
size_t length = std::min(event->cec.length,
static_cast<size_t>(MaxLength::MESSAGE_BODY));
CecMessage cecMessage {
.initiator = static_cast<CecLogicalAddress>(event->cec.initiator),
.destination = static_cast<CecLogicalAddress>(event->cec.destination),

8
tv/cec/1.0/types.hal
View File

@@ -16,6 +16,10 @@
package android.hardware.tv.cec@1.0;
enum MaxLength : int32_t {
MESSAGE_BODY = 15,
};
enum CecDeviceType : int32_t {
INACTIVE = -1,
TV = 0,
@@ -196,8 +200,8 @@ struct CecMessage {
/* logical address of receiver */
CecLogicalAddress destination;
/* The maximum size of body is 15 as specified in the section 6 of the CEC
* Spec 1.4b. Overflowed data must be ignored. */
/* The maximum size of body is 15 (MaxLength::MESSAGE_BODY) as specified in
* the section 6 of the CEC Spec 1.4b. Overflowed data must be ignored. */
vec<uint8_t> body;
};