diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-21 16:51:36 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-21 16:51:36 +1000 |
commit | 29e64bd696cd340e1d4674aa21e99f6d711521e7 (patch) | |
tree | 14a46ee451ee03ab32b5a99136017c297d703131 /include | |
parent | 82dafefa7711ccbf206f445726d1e56a8b8a7a74 (diff) | |
parent | 1269594a93bb14f70c357de4dcb3183bfd2142b4 (diff) |
Merge remote-tracking branch 'hsi/for-next'
Diffstat (limited to 'include')
-rw-r--r-- | include/uapi/linux/hsi/cs-protocol.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/uapi/linux/hsi/cs-protocol.h b/include/uapi/linux/hsi/cs-protocol.h index 4957bba57cbe..f153d6ea7c62 100644 --- a/include/uapi/linux/hsi/cs-protocol.h +++ b/include/uapi/linux/hsi/cs-protocol.h @@ -76,6 +76,15 @@ struct cs_buffer_config { }; /* + * struct for monotonic timestamp taken when the + * last control command was received + */ +struct cs_timestamp { + __u32 tv_sec; /* seconds */ + __u32 tv_nsec; /* nanoseconds */ +}; + +/* * Struct describing the layout and contents of the driver mmap area. * This information is meant as read-only information for the application. */ @@ -91,11 +100,8 @@ struct cs_mmap_config_block { __u32 rx_ptr; __u32 rx_ptr_boundary; __u32 reserved3[2]; - /* - * if enabled with CS_FEAT_TSTAMP_RX_CTRL, monotonic - * timestamp taken when the last control command was received - */ - struct timespec tstamp_rx_ctrl; + /* enabled with CS_FEAT_TSTAMP_RX_CTRL */ + struct cs_timestamp tstamp_rx_ctrl; }; #define CS_IO_MAGIC 'C' |