aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2016-07-13 16:09:18 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2016-07-13 16:09:18 +0200
commitdd6cbd3799607bcfa8a1068ae3d811e600488b1b (patch)
treeb0e5995f7c6f92dd78af85e69b8d6e701d6ead03 /include
parent3d225130559e8578dce347052bee3813ddf08f28 (diff)
cec-ctl: sync to master, update timestamp code
Sync to the latest cec.h from the media_tree master branch. This splits the ts field up into two fields rx_ts and tx_ts. Adapt cec-ctl accordingly. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/cec.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/include/linux/cec.h b/include/linux/cec.h
index 6678afe2..b3e22893 100644
--- a/include/linux/cec.h
+++ b/include/linux/cec.h
@@ -48,9 +48,10 @@
/**
* struct cec_msg - CEC message structure.
- * @ts: Timestamp in nanoseconds using CLOCK_MONOTONIC. Set by the
- * driver. It is set when the message transmission has finished
- * and it is set when a message was received.
+ * @tx_ts: Timestamp in nanoseconds using CLOCK_MONOTONIC. Set by the
+ * driver when the message transmission has finished.
+ * @rx_ts: Timestamp in nanoseconds using CLOCK_MONOTONIC. Set by the
+ * driver when the message was received.
* @len: Length in bytes of the message.
* @timeout: The timeout (in ms) that is used to timeout CEC_RECEIVE.
* Set to 0 if you want to wait forever. This timeout can also be
@@ -61,8 +62,6 @@
* sent. This can be used to track replies to previously sent
* messages.
* @flags: Set to 0.
- * @rx_status: The message receive status bits. Set by the driver.
- * @tx_status: The message transmit status bits. Set by the driver.
* @msg: The message payload.
* @reply: This field is ignored with CEC_RECEIVE and is only used by
* CEC_TRANSMIT. If non-zero, then wait for a reply with this
@@ -80,6 +79,8 @@
* broadcast, then -EINVAL is returned.
* if reply is non-zero, then timeout is set to 1000 (the required
* maximum response time).
+ * @rx_status: The message receive status bits. Set by the driver.
+ * @tx_status: The message transmit status bits. Set by the driver.
* @tx_arb_lost_cnt: The number of 'Arbitration Lost' events. Set by the driver.
* @tx_nack_cnt: The number of 'Not Acknowledged' events. Set by the driver.
* @tx_low_drive_cnt: The number of 'Low Drive Detected' events. Set by the
@@ -87,15 +88,16 @@
* @tx_error_cnt: The number of 'Error' events. Set by the driver.
*/
struct cec_msg {
- __u64 ts;
+ __u64 tx_ts;
+ __u64 rx_ts;
__u32 len;
__u32 timeout;
__u32 sequence;
__u32 flags;
- __u8 rx_status;
- __u8 tx_status;
__u8 msg[CEC_MAX_MSG_SIZE];
__u8 reply;
+ __u8 rx_status;
+ __u8 tx_status;
__u8 tx_arb_lost_cnt;
__u8 tx_nack_cnt;
__u8 tx_low_drive_cnt;

Privacy Policy