summaryrefslogtreecommitdiff
path: root/common/keyboard_mkbp.c
diff options
context:
space:
mode:
authorVic Yang <victoryang@chromium.org>2014-10-20 23:31:28 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-10-24 01:37:58 +0000
commitd1ed75815efe513449c653d28fe7bd3c53a3441d (patch)
tree48a256c4154ad8f195ef5447abce6eeb99e3fd42 /common/keyboard_mkbp.c
parentbe2ed33b1976e407d107b20e90441a194f7b5fb7 (diff)
downloadchrome-ec-d1ed75815efe513449c653d28fe7bd3c53a3441d.tar.gz
MKBP event signalling implementation
This implements a new API for EC modules to define MKBP event sources and send MKBP event to the AP. Also, a new host command EC_CMD_GET_NEXT_EVENT is added for the AP to query the pending MKBP events. Each event type may have custom event data sent along with the event. BRANCH=None BUG=chrome-os-partner:33194 TEST=Enable MKBP event on Ryu. Set a host event from EC console, run 'ectool nextevent', and see MKBP event 0x01 (HOST_EVENT) and the set host event. Signed-off-by: Vic Yang <victoryang@chromium.org> Change-Id: I28a1b7e826bcc102bbe39016c9bb3e37d125664c Reviewed-on: https://chromium-review.googlesource.com/224905 Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'common/keyboard_mkbp.c')
-rw-r--r--common/keyboard_mkbp.c24
1 files changed, 23 insertions, 1 deletions
diff --git a/common/keyboard_mkbp.c b/common/keyboard_mkbp.c
index 7e9f6f5c45..82fc93bdf2 100644
--- a/common/keyboard_mkbp.c
+++ b/common/keyboard_mkbp.c
@@ -15,6 +15,7 @@
#include "keyboard_raw.h"
#include "keyboard_scan.h"
#include "keyboard_test.h"
+#include "mkbp_event.h"
#include "system.h"
#include "task.h"
#include "timer.h"
@@ -146,12 +147,33 @@ test_mockable int keyboard_fifo_add(const uint8_t *buffp)
kb_fifo_push_done:
- if (ret == EC_SUCCESS)
+ if (ret == EC_SUCCESS) {
set_host_interrupt(1);
+#ifdef CONFIG_MKBP_EVENT
+ mkbp_send_event(EC_MKBP_EVENT_KEY_MATRIX);
+#endif
+ }
return ret;
}
+#ifdef CONFIG_MKBP_EVENT
+static int keyboard_get_next_event(uint8_t *out)
+{
+ if (!kb_fifo_entries)
+ return -1;
+
+ kb_fifo_remove(out);
+
+ /* Keep sending events if FIFO is not empty */
+ if (kb_fifo_entries)
+ mkbp_send_event(EC_MKBP_EVENT_KEY_MATRIX);
+
+ return KEYBOARD_COLS;
+}
+DECLARE_EVENT_SOURCE(EC_MKBP_EVENT_KEY_MATRIX, keyboard_get_next_event);
+#endif
+
void keyboard_send_battery_key(void)
{
uint8_t state[KEYBOARD_COLS];