From ada8314004f43423732d6c0b38051f57b355612b Mon Sep 17 00:00:00 2001 From: Jinsuk Kim Date: Thu, 3 Jul 2014 09:30:42 +0900 Subject: Remove tx_status event in CEC HAL Removes tx_status event type which turns out not in actual use. This changes makes send_message() work in sychrnonous fashion when called by HdmiControlService. HdmiControlService has io thread dedicated to interact with HAL, hence no need to introduce another async flow for HAL. Change-Id: I8ae21b1149cd36bfd0f9da215c4f23b30f0c8d30 --- include/hardware/hdmi_cec.h | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/include/hardware/hdmi_cec.h b/include/hardware/hdmi_cec.h index 46294ae..d7951f3 100644 --- a/include/hardware/hdmi_cec.h +++ b/include/hardware/hdmi_cec.h @@ -156,7 +156,6 @@ enum abort_reason { enum { HDMI_EVENT_CEC_MESSAGE = 1, HDMI_EVENT_HOT_PLUG = 2, - HDMI_EVENT_TX_STATUS = 3, }; /* @@ -168,22 +167,14 @@ enum { HDMI_CONNECTED = 1 }; -/* - * TX result type. Used when the event type is HDMI_EVENT_TX_STATUS. - */ -enum { - HDMI_TX_STATUS_SUCCESS = 0, - HDMI_TX_STATUS_TIMEDOUT = 1, /* failed on wait */ - HDMI_TX_STATUS_NOCONN = 2 /* connection problem */ -}; - /* * error code used for send_message. */ enum { HDMI_RESULT_SUCCESS = 0, HDMI_RESULT_NACK = 1, /* not acknowledged */ - HDMI_RESULT_BUSY = 2 /* bus is busy */ + HDMI_RESULT_BUSY = 2, /* bus is busy */ + HDMI_RESULT_FAIL = 3, }; /* @@ -263,7 +254,6 @@ typedef struct hdmi_event { union { cec_message_t cec; hotplug_event_t hotplug; - tx_status_event_t tx_status; }; } hdmi_event_t; @@ -348,8 +338,7 @@ typedef struct hdmi_cec_device { * some reason. HAL implementation should take the situation into account * so as not to wait forever for the message to get sent out. * - * It should try retransmission at least once as specified in the standard, - * and later should report the transmission result via tx_status_event_t. + * It should try retransmission at least once as specified in the standard. * * Returns error code. See HDMI_RESULT_SUCCESS, HDMI_RESULT_NACK, and * HDMI_RESULT_BUSY. -- cgit v1.2.3