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>

1 files changed, 8 insertions, 15 deletions

diff --git a/include/keyboard_scan.h b/include/keyboard_scan.h
index e0f883375a..04a21838bb 100644
--- a/include/keyboard_scan.h
+++ b/include/keyboard_scan.h
@@ -26,29 +26,22 @@ enum boot_key {
 /**
  * Return the key held down at boot time in addition to the keyboard-controlled
  * reset keys.  Returns BOOT_KEY_OTHER if none of the keys specifically checked
- * was pressed, or reset was not caused by a keyboard-controlled reset, or if
- * the state has been cleared by keyboard_scan_clear_boot_key().
+ * was pressed, or reset was not caused by a keyboard-controlled reset.
  */
 enum boot_key keyboard_scan_get_boot_key(void);
 
 /**
- * Return non-zero if recovery key was pressed at boot.
- */
-int keyboard_scan_recovery_pressed(void);
-
-/**
- * Clear any saved keyboard state (empty FIFO, etc).
- */
-void keyboard_clear_state(void);
-
-/**
  * Enables/disables keyboard matrix scan.
  */
-void keyboard_enable_scanning(int enable);
+void keyboard_scan_enable(int enable);
 
+#ifdef CONFIG_KEYBOARD_SUPPRESS_NOISE
 /**
- * Sends KEY_BATTERY keystroke.
+ * Indicate to audio codec that a key has been pressed.
+ *
+ * Boards may supply this function to suppress audio noise.
  */
-void keyboard_send_battery_key(void);
+void keyboard_suppress_noise(void);
+#endif
 
 #endif  /* __CROS_EC_KEYBOARD_SCAN_H */