diff options
| author | Raul E Rangel <rrangel@chromium.org> | 2020-02-25 16:36:35 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-27 19:42:27 +0000 |
| commit | 621cc6985400e77dbc5bfe1724a12baa4899641d (patch) | |
| tree | b90aa5f4aeea5b31a865632f30d1cedd330f25a0 | |
| parent | d98339ecc037bcd4c6a0675058e56ea059a69710 (diff) | |
| download | chrome-ec-621cc6985400e77dbc5bfe1724a12baa4899641d.tar.gz | |
common/keyboard_8042: Rename i8042_irq_enabled
Rename i8042_irq_enabled to i8042_keyboard_irq_enabled to avoid
confusion when adding i8042_aux_irq_enabled.
BUG=b:145575366
BRANCH=none
TEST=Build test
Change-Id: I031bf941faf80d99a01bf2a3834f61b5040f7674
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2073283
Reviewed-by: Edward Hill <ecgh@chromium.org>
| -rw-r--r-- | common/keyboard_8042.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index 69669a740a..3640b2704e 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -94,7 +94,7 @@ struct host_byte { */ static struct queue const from_host = QUEUE_NULL(8, struct host_byte); -static int i8042_irq_enabled; +static int i8042_keyboard_irq_enabled; /* i8042 global settings */ static int keyboard_enabled; /* default the keyboard is disabled. */ @@ -207,7 +207,7 @@ static void keyboard_enable_irq(int enable) { CPRINTS("KB IRQ %s", enable ? "enable" : "disable"); - i8042_irq_enabled = enable; + i8042_keyboard_irq_enabled = enable; if (enable) lpc_keyboard_resume_irq(); } @@ -826,7 +826,7 @@ void keyboard_protocol_task(void *u) /* Handle data waiting for host */ if (lpc_keyboard_has_char()) { /* If interrupts disabled, nothing we can do */ - if (!i8042_irq_enabled) + if (!i8042_keyboard_irq_enabled) break; /* Give the host a little longer to respond */ @@ -852,7 +852,7 @@ void keyboard_protocol_task(void *u) kblog_put('K', chr); /* Write to host. */ - lpc_keyboard_put_char(chr, i8042_irq_enabled); + lpc_keyboard_put_char(chr, i8042_keyboard_irq_enabled); retries = 0; } } @@ -1045,7 +1045,7 @@ static int command_8042_internal(int argc, char **argv) int i; ccprintf("data_port_state=%d\n", data_port_state); - ccprintf("i8042_irq_enabled=%d\n", i8042_irq_enabled); + ccprintf("i8042_keyboard_irq_enabled=%d\n", i8042_keyboard_irq_enabled); ccprintf("keyboard_enabled=%d\n", keyboard_enabled); ccprintf("keystroke_enabled=%d\n", keystroke_enabled); |