diff options
| author | Stefan Adolfsson <sadolfsson@google.com> | 2018-05-08 00:00:09 +0200 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-05-12 12:06:06 -0700 |
| commit | 74b5a2ccb58739d4e21fdeb36e40fe01c0ca7ede (patch) | |
| tree | 6e3ee62743efffa65e3ff050d467074e5931da35 /include | |
| parent | 53f61a76b74204b4e44679aa24047c97569c8d1e (diff) | |
| download | chrome-ec-74b5a2ccb58739d4e21fdeb36e40fe01c0ca7ede.tar.gz | |
npcx: CEC: Send CEC message in mkbp event
Instead of fetching incoming CEC messages using a specific read
command, extend the standard mkbp event so the CEC message can
be delivered directly inside the event.
Signed-off-by: Stefan Adolfsson <sadolfsson@chromium.org>
BUG=b:76467407
BRANCH=none
TEST="ectool cec read" still working with a kernel that has support
for the increased mkbp size.
CQ-DEPEND=CL:1046186,CL:1051085
Change-Id: Id9d944be86ba85084b979d1df9057f7f3e7a1fd0
Reviewed-on: https://chromium-review.googlesource.com/1051105
Commit-Ready: Stefan Adolfsson <sadolfsson@chromium.org>
Tested-by: Stefan Adolfsson <sadolfsson@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ec_commands.h | 53 |
1 files changed, 42 insertions, 11 deletions
diff --git a/include/ec_commands.h b/include/ec_commands.h index fcebb42bb2..cf7148e535 100644 --- a/include/ec_commands.h +++ b/include/ec_commands.h @@ -21,6 +21,10 @@ #include "common.h" #endif +#if !defined(__KERNEL__) +#include "compile_time_macros.h" +#endif + /* * Current version of this protocol * @@ -3172,7 +3176,10 @@ enum ec_mkbp_event { EC_MKBP_EVENT_HOST_EVENT64 = 7, /* Notify the AP that something happened on CEC */ - EC_MKBP_EVENT_CEC = 8, + EC_MKBP_EVENT_CEC_EVENT = 8, + + /* Send an incoming CEC message to the AP */ + EC_MKBP_EVENT_CEC_MESSAGE = 9, /* Number of MKBP events */ EC_MKBP_EVENT_COUNT, @@ -3203,12 +3210,46 @@ union __ec_align_offset1 ec_response_get_next_data { uint32_t cec_events; }; +union __ec_align_offset1 ec_response_get_next_data_v1 { + uint8_t key_matrix[16]; + + /* Unaligned */ + uint32_t host_event; + uint64_t host_event64; + + struct __ec_todo_unpacked { + /* For aligning the fifo_info */ + uint8_t reserved[3]; + struct ec_response_motion_sense_fifo_info info; + } sensor_fifo; + + uint32_t buttons; + + uint32_t switches; + + uint32_t fp_events; + + uint32_t sysrq; + + /* CEC events from enum mkbp_cec_event */ + uint32_t cec_events; + + uint8_t cec_message[16]; +}; +BUILD_ASSERT(sizeof(union ec_response_get_next_data_v1) == 16); + struct __ec_align1 ec_response_get_next_event { uint8_t event_type; /* Followed by event data if any */ union ec_response_get_next_data data; }; +struct __ec_align1 ec_response_get_next_event_v1 { + uint8_t event_type; + /* Followed by event data if any */ + union ec_response_get_next_data_v1 data; +}; + /* Bit indices for buttons and switches.*/ /* Buttons */ #define EC_MKBP_POWER_BUTTON 0 @@ -4115,14 +4156,6 @@ struct __ec_align1 ec_params_cec_write { uint8_t msg[MAX_CEC_MSG_LEN]; }; -/* CEC message from a CEC sink reported back to the AP */ -#define EC_CMD_CEC_READ_MSG 0x00B9 - -/* Message read from to the CEC bus */ -struct __ec_align1 ec_response_cec_read { - uint8_t msg[MAX_CEC_MSG_LEN]; -}; - /* Set various CEC parameters */ #define EC_CMD_CEC_SET 0x00BA @@ -4155,8 +4188,6 @@ enum mkbp_cec_event { EC_MKBP_CEC_SEND_OK = 1 << 0, /* Outgoing message was not acknowledged */ EC_MKBP_CEC_SEND_FAILED = 1 << 1, - /* Incoming message can be read out by AP */ - EC_MKBP_CEC_HAVE_DATA = 1 << 2, }; /*****************************************************************************/ |