diff options
author | Randall Spangler <rspangler@chromium.org> | 2013-03-20 13:47:35 -0700 |
---|---|---|
committer | ChromeBot <chrome-bot@google.com> | 2013-03-22 11:24:28 -0700 |
commit | 743c05f01f8f2b19dbf565bee645076fff75c42d (patch) | |
tree | cbad9ab036c32b3b4d47ad2ad4ded17f18fb02b6 /board | |
parent | cdb08e12217367f0ac8c6ce0dc1df2e27f80563e (diff) | |
download | chrome-ec-743c05f01f8f2b19dbf565bee645076fff75c42d.tar.gz |
Add keyboard_raw interface
This is the low-level platform-dependent interface to drive keyboard
columns, read rows, and handle keyboard interrupts.
Both lm4 and stm32 had something like this before, but the interfaces
weren't fully explicit or compatible.
BUG=chrome-os-partner:18360
BRANCH=none
TEST=manual
- Build all platforms.
- Boot system and test typing on keyboard.
- Hold power+refresh+esc to test boot key detection; should go to recovery.
Change-Id: Ie3bcc1d066a4da5204f0e236daeb52c4064a6213
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/46156
Diffstat (limited to 'board')
-rw-r--r-- | board/daisy/board.c | 18 | ||||
-rw-r--r-- | board/mccroskey/board.c | 18 | ||||
-rw-r--r-- | board/snow/board.c | 18 | ||||
-rw-r--r-- | board/spring/board.c | 18 |
4 files changed, 36 insertions, 36 deletions
diff --git a/board/daisy/board.c b/board/daisy/board.c index 0a7b4bf54e..7052ec68fc 100644 --- a/board/daisy/board.c +++ b/board/daisy/board.c @@ -10,7 +10,7 @@ #include "gaia_power.h" #include "gpio.h" #include "i2c.h" -#include "keyboard_scan.h" +#include "keyboard_raw.h" #include "pmu_tpschrome.h" #include "registers.h" #include "spi.h" @@ -44,21 +44,21 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_RISING, gaia_lid_event}, {"SUSPEND_L", GPIO_A, (1<<7), GPIO_INT_BOTH, gaia_suspend_event}, {"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN01", GPIO_C, (1<<9), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN02", GPIO_C, (1<<10), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN03", GPIO_C, (1<<11), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN04", GPIO_C, (1<<12), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN05", GPIO_C, (1<<14), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN06", GPIO_C, (1<<15), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN07", GPIO_D, (1<<2), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, /* Other inputs */ {"AC_PWRBTN_L", GPIO_A, (1<<0), GPIO_INT_BOTH, NULL}, {"SPI1_NSS", GPIO_A, (1<<4), GPIO_PULL_UP, NULL}, diff --git a/board/mccroskey/board.c b/board/mccroskey/board.c index 1e4d9cfa76..ba18740b24 100644 --- a/board/mccroskey/board.c +++ b/board/mccroskey/board.c @@ -11,7 +11,7 @@ #include "gpio.h" #include "hooks.h" #include "i2c.h" -#include "keyboard_scan.h" +#include "keyboard_raw.h" #include "registers.h" #include "spi.h" #include "task.h" @@ -30,21 +30,21 @@ static void kbd_power_on(enum gpio_signal signal); const struct gpio_info gpio_list[GPIO_COUNT] = { /* Inputs with interrupt handlers are first for efficiency */ {"KB_IN00", GPIO_B, (1<<8), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN01", GPIO_B, (1<<9), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN02", GPIO_B, (1<<10), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN03", GPIO_B, (1<<11), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN04", GPIO_B, (1<<12), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN05", GPIO_B, (1<<13), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN06", GPIO_B, (1<<14), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN07", GPIO_B, (1<<15), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KBD_PWR_BUTTON", GPIO_B, (1<<2), GPIO_INPUT, kbd_power_on}, {"OMZO_RDY_L", GPIO_A, (1<<0), GPIO_INPUT, NULL}, /* PA0_WKUP */ diff --git a/board/snow/board.c b/board/snow/board.c index cebdcab1fe..a70a112b79 100644 --- a/board/snow/board.c +++ b/board/snow/board.c @@ -13,7 +13,7 @@ #include "gpio.h" #include "hooks.h" #include "i2c.h" -#include "keyboard_scan.h" +#include "keyboard_raw.h" #include "pmu_tpschrome.h" #include "power_led.h" #include "registers.h" @@ -41,21 +41,21 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"SUSPEND_L", GPIO_A, (1<<7), INT_BOTH_FLOATING, gaia_suspend_event}, {"WP_L", GPIO_B, (1<<4), GPIO_INPUT, NULL}, {"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN01", GPIO_C, (1<<9), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN02", GPIO_C, (1<<10), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN03", GPIO_C, (1<<11), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN04", GPIO_C, (1<<12), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN05", GPIO_C, (1<<14), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN06", GPIO_C, (1<<15), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN07", GPIO_D, (1<<2), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, /* Other inputs */ {"AC_PWRBTN_L", GPIO_A, (1<<0), GPIO_INT_BOTH, NULL}, {"SPI1_NSS", GPIO_A, (1<<4), GPIO_DEFAULT, spi_event}, diff --git a/board/spring/board.c b/board/spring/board.c index e4d361a8ae..dd597a1a08 100644 --- a/board/spring/board.c +++ b/board/spring/board.c @@ -15,7 +15,7 @@ #include "hooks.h" #include "host_command.h" #include "i2c.h" -#include "keyboard_scan.h" +#include "keyboard_raw.h" #include "pmu_tpschrome.h" #include "registers.h" #include "stm32_adc.h" @@ -43,21 +43,21 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"SUSPEND_L", GPIO_A, (1<<7), INT_BOTH_FLOATING, gaia_suspend_event}, {"WP_L", GPIO_A, (1<<13), GPIO_INPUT, NULL}, {"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN01", GPIO_C, (1<<9), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN02", GPIO_C, (1<<10), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN03", GPIO_C, (1<<11), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN04", GPIO_C, (1<<12), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN05", GPIO_C, (1<<14), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN06", GPIO_C, (1<<15), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"KB_IN07", GPIO_D, (1<<2), GPIO_KB_INPUT, - keyboard_scan_interrupt}, + keyboard_raw_gpio_interrupt}, {"USB_CHG_INT", GPIO_A, (1<<6), GPIO_INT_FALLING, usb_charge_interrupt}, /* Other inputs */ |