diff options
| author | Ruibin Chang <Ruibin.Chang@ite.com.tw> | 2022-01-04 14:14:38 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-12 03:26:55 +0000 |
| commit | 288122f834be85e09d6990dfcad8fb6c151a8e29 (patch) | |
| tree | 2b26975ab403b4ab19ba44f7a8ded99320251d3d | |
| parent | 06bbb13141acef66ded7141cc6b6a6eaf9dbca53 (diff) | |
| download | chrome-ec-288122f834be85e09d6990dfcad8fb6c151a8e29.tar.gz | |
zephyr: cleanup the structure member type
Declare the member type to match the kscan_it8xxx2_regs, so
we needn't to transform the type every time in function for
the local structure.
BUG=none
BRANCH=none
TEST=on board krabby, console cmd "ksstate on",
1.press multi-key at a time:
[1811.881622 KB state: -- -- -- -- -- -- 12 -- -- -- -- -- --]
[1811.933868 KB state: -- -- -- -- -- 10 12 -- -- -- -- -- --]
[1811.981567 KB state: -- -- -- -- -- 10 10 -- -- -- -- -- --]
2.press a key at a time:
check all keyboard key bit field triggered
Signed-off-by: Ruibin Chang <Ruibin.Chang@ite.com.tw>
Change-Id: Id9cfdb3ad2626721a615da46a2b28fdb8962ef3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3359109
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c index 29ff8f77aa..d5b84cb0fd 100644 --- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c +++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c @@ -36,7 +36,7 @@ struct cros_kb_raw_wuc_map_cfg { struct cros_kb_raw_ite_config { /* keyboard scan controller base address */ - uintptr_t base; + struct kscan_it8xxx2_regs *base; /* Keyboard scan input (KSI) wake-up irq */ int irq; /* KSI[7:0] wake-up input source configuration list */ @@ -84,8 +84,7 @@ static int cros_kb_raw_ite_enable_interrupt(const struct device *dev, static int cros_kb_raw_ite_read_row(const struct device *dev) { const struct cros_kb_raw_ite_config *config = dev->config; - struct kscan_it8xxx2_regs *const inst = - (struct kscan_it8xxx2_regs *) config->base; + struct kscan_it8xxx2_regs *const inst = config->base; /* Bits are active-low, so invert returned levels */ return ((inst->KBS_KSI) ^ 0xff); @@ -96,8 +95,7 @@ static int cros_kb_raw_ite_drive_column(const struct device *dev, int col) int mask; unsigned int key; const struct cros_kb_raw_ite_config *config = dev->config; - struct kscan_it8xxx2_regs *const inst = - (struct kscan_it8xxx2_regs *) config->base; + struct kscan_it8xxx2_regs *const inst = config->base; /* Tri-state all outputs */ if (col == KEYBOARD_COLUMN_NONE) @@ -156,8 +154,7 @@ static int cros_kb_raw_ite_init(const struct device *dev) unsigned int key; const struct cros_kb_raw_ite_config *config = dev->config; struct cros_kb_raw_ite_data *data = dev->data; - struct kscan_it8xxx2_regs *const inst = - (struct kscan_it8xxx2_regs *) config->base; + struct kscan_it8xxx2_regs *const inst = config->base; /* Ensure top-level interrupt is disabled */ cros_kb_raw_ite_enable_interrupt(dev, 0); @@ -239,7 +236,7 @@ static const struct cros_kb_raw_wuc_map_cfg IT8XXX2_DT_WUC_ITEMS_LIST(0); static const struct cros_kb_raw_ite_config cros_kb_raw_cfg = { - .base = DT_INST_REG_ADDR(0), + .base = (struct kscan_it8xxx2_regs *)DT_INST_REG_ADDR(0), .irq = DT_INST_IRQN(0), .wuc_map_list = cros_kb_raw_wuc_0, }; |