diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-03-26 13:18:39 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-03-27 11:35:20 -0700 |
| commit | c2b94fd184e6f5df5e5d8fe4018055a29a96a064 (patch) | |
| tree | 7ccb95f13ca0cf5ff21b67687b4bb8fe30ad06d3 /board/spring | |
| parent | 0a2603e8ea234a9263a0a2e6be5daed362c12d72 (diff) | |
| download | chrome-ec-c2b94fd184e6f5df5e5d8fe4018055a29a96a064.tar.gz | |
Move files in preparation for merging keyboard_scan modules
This is part one of a series to merge the keyboard scan interface to
be common across all platforms.
This change just moves and renames files and APIs and removes some
read code, and sets up protocol-specific CONFIG options. It makes the
next CL which actually merges keyboard scanning easier to parse.
BUG=chrome-os-partner:18360
BRANCH=none
TEST=compile all boards; test keyboard on spring and link
Change-Id: I815a40aae4e5d5f333b8501aff9656080533d913
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/46549
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'board/spring')
| -rw-r--r-- | board/spring/board.h | 1 | ||||
| -rw-r--r-- | board/spring/usb_charging.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/board/spring/board.h b/board/spring/board.h index 31043b0f13..4387162df9 100644 --- a/board/spring/board.h +++ b/board/spring/board.h @@ -23,6 +23,7 @@ #define CONFIG_CHIPSET_GAIA #define CONFIG_HOST_COMMAND_STATUS #define CONFIG_I2C +#define CONFIG_KEYBOARD_PROTOCOL_MKBP #undef CONFIG_TASK_PROFILING #define CONFIG_WATCHDOG_HELP diff --git a/board/spring/usb_charging.c b/board/spring/usb_charging.c index e57e6ebd46..72fcf54335 100644 --- a/board/spring/usb_charging.c +++ b/board/spring/usb_charging.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. */ @@ -12,7 +12,7 @@ #include "console.h" #include "hooks.h" #include "gpio.h" -#include "keyboard_scan.h" +#include "keyboard_protocol.h" #include "pmu_tpschrome.h" #include "registers.h" #include "smart_battery.h" |