From 6aabf0406bf3e848ee171d705963e8c3d18106ba Mon Sep 17 00:00:00 2001 From: Ruibin Chang Date: Mon, 17 May 2021 15:50:43 +0800 Subject: zephyr: move keyboard_raw most functions to shim/src Move shim/chip/npcx/keyboard_raw.c most functions to shim/src/keyboard_raw.c. BUG=none BRANCH=none TEST=zmake -lDEBUG configure -B zephyr/build -b zephyr/projects/volteer/volteer Signed-off-by: Ruibin Chang Change-Id: Ic69752223517cabb9e1d1c7ff16c9eb4914186db Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2900122 Reviewed-by: Keith Short --- zephyr/shim/chip/npcx/keyboard_raw.c | 66 ------------------------------------ 1 file changed, 66 deletions(-) (limited to 'zephyr/shim/chip/npcx') diff --git a/zephyr/shim/chip/npcx/keyboard_raw.c b/zephyr/shim/chip/npcx/keyboard_raw.c index 14fb7fcb22..aa075d2d56 100644 --- a/zephyr/shim/chip/npcx/keyboard_raw.c +++ b/zephyr/shim/chip/npcx/keyboard_raw.c @@ -6,8 +6,6 @@ /* Functions needed by keyboard scanner module for Chrome EC */ #include -#include -#include #include #include #include @@ -16,70 +14,6 @@ #include "drivers/cros_kb_raw.h" #include "keyboard_raw.h" -LOG_MODULE_REGISTER(shim_cros_kb_raw, LOG_LEVEL_ERR); - -#define CROS_KB_RAW_DEV DT_LABEL(DT_NODELABEL(cros_kb_raw)) -static const struct device *cros_kb_raw_dev; - -/** - * Initialize the raw keyboard interface. - */ -void keyboard_raw_init(void) -{ - cros_kb_raw_dev = device_get_binding(CROS_KB_RAW_DEV); - if (!cros_kb_raw_dev) { - LOG_ERR("Fail to find %s", CROS_KB_RAW_DEV); - return; - } - - LOG_INF("%s", __func__); - cros_kb_raw_init(cros_kb_raw_dev); -} - -/** - * Finish initialization after task scheduling has started. - */ -void keyboard_raw_task_start(void) -{ - keyboard_raw_enable_interrupt(1); -} - -/** - * Drive the specified column low. - */ -test_mockable void keyboard_raw_drive_column(int col) -{ - if (cros_kb_raw_dev) - cros_kb_raw_drive_column(cros_kb_raw_dev, col); - else - LOG_ERR("%s: no cros_kb_raw device!", __func__); -} - -/** - * Read raw row state. - * Bits are 1 if signal is present, 0 if not present. - */ -test_mockable int keyboard_raw_read_rows(void) -{ - if (cros_kb_raw_dev) { - return cros_kb_raw_read_rows(cros_kb_raw_dev); - } else { - LOG_ERR("%s: no cros_kb_raw device!", __func__); - return -EIO; - } -} - -/** - * Enable or disable keyboard interrupts. - */ -void keyboard_raw_enable_interrupt(int enable) -{ - if (cros_kb_raw_dev) - cros_kb_raw_enable_interrupt(cros_kb_raw_dev, enable); - else - LOG_ERR("%s: no cros_kb_raw device!", __func__); -} - /** * Return true if the current value of the given input GPIO port is zero */ -- cgit v1.2.1