diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-03-28 12:42:44 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-03-29 11:40:35 -0700 |
| commit | 95a3a4107ae9c9013dbf3fb51ca3e98346cb82bb (patch) | |
| tree | 5626015c33a2850cf6dc10a0194ab7dd20fa4d09 /chip | |
| parent | fe3ccdf70a002e651bc1a13bcc305ae1e3422154 (diff) | |
| download | chrome-ec-95a3a4107ae9c9013dbf3fb51ca3e98346cb82bb.tar.gz | |
Merge i8042.c into keyboard_8042.c
This is in preparation for cleaning up the 8042 protocol stack and
merging the typematic and i8042cmd tasks.
No functionality change, just shuffling code and renaming functions.
BUG=chrome-os-partner:18360
BRANCH=none
TEST=boot link and type on its keyboard
Change-Id: Iefc41cd5b8d18ac87830bff3080cfff92e9d10d2
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/46805
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/lm4/lpc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chip/lm4/lpc.c b/chip/lm4/lpc.c index b082e53fc3..d1028a5ce0 100644 --- a/chip/lm4/lpc.c +++ b/chip/lm4/lpc.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -11,7 +11,7 @@ #include "gpio.h" #include "hooks.h" #include "host_command.h" -#include "i8042.h" +#include "keyboard_protocol.h" #include "lpc.h" #include "port80.h" #include "pwm.h" @@ -560,7 +560,7 @@ static void lpc_interrupt(void) /* Handle keyboard interface writes */ st = LM4_LPC_ST(LPC_CH_KEYBOARD); if (st & LM4_LPC_ST_FRMH) - i8042_receive(LPC_POOL_KEYBOARD[0], st & LM4_LPC_ST_CMD); + keyboard_host_write(LPC_POOL_KEYBOARD[0], st & LM4_LPC_ST_CMD); if (mis & LM4_LPC_INT_MASK(LPC_CH_KEYBOARD, 1)) { /* Host read data; wake up task to send remaining bytes */ |