diff options
| -rw-r--r-- | board/hammer/board.c | 2 | ||||
| -rw-r--r-- | board/hammer/ec.tasklist | 2 | ||||
| -rw-r--r-- | board/hammer/gpio.inc | 6 | ||||
| -rw-r--r-- | driver/touchpad_elan.c | 6 | ||||
| -rw-r--r-- | driver/touchpad_elan.h | 17 | ||||
| -rw-r--r-- | include/console_channel.inc | 2 | ||||
| -rw-r--r-- | include/touchpad.h | 11 |
7 files changed, 21 insertions, 25 deletions
diff --git a/board/hammer/board.c b/board/hammer/board.c index f3b693e93a..c6b5fa778b 100644 --- a/board/hammer/board.c +++ b/board/hammer/board.c @@ -6,7 +6,7 @@ #include "common.h" #include "ec_version.h" -#include "touchpad_elan.h" +#include "touchpad.h" #include "gpio.h" #include "hooks.h" #include "hwtimer.h" diff --git a/board/hammer/ec.tasklist b/board/hammer/ec.tasklist index 71ecd36606..b1675e37e2 100644 --- a/board/hammer/ec.tasklist +++ b/board/hammer/ec.tasklist @@ -19,6 +19,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS_RO(RWSIG, rwsig_task, NULL, 1280) \ TASK_ALWAYS (HOOKS, hook_task, NULL, 2048) \ - TASK_ALWAYS_RW(TOUCHPAD, elan_tp_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS_RW(TOUCHPAD, touchpad_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS (CONSOLE, console_task, NULL, 1024) \ TASK_NOTEST_RW(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) diff --git a/board/hammer/gpio.inc b/board/hammer/gpio.inc index 305a9f95b7..1fdf46fa9b 100644 --- a/board/hammer/gpio.inc +++ b/board/hammer/gpio.inc @@ -8,11 +8,13 @@ /* Declare symbolic names for all the GPIOs that we care about. * Note: Those with interrupt handlers must be declared first. */ +#ifdef SECTION_IS_RW #ifdef BOARD_WHISKERS -GPIO_INT(TOUCHPAD_INT, PIN(B, 9), GPIO_INT_FALLING, elan_tp_interrupt) +GPIO_INT(TOUCHPAD_INT, PIN(B, 9), GPIO_INT_FALLING, touchpad_interrupt) #else -GPIO_INT(TOUCHPAD_INT, PIN(B, 8), GPIO_INT_FALLING, elan_tp_interrupt) +GPIO_INT(TOUCHPAD_INT, PIN(B, 8), GPIO_INT_FALLING, touchpad_interrupt) #endif +#endif /* SECTION_IS_RW */ /* Keyboard inputs */ #define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH) diff --git a/driver/touchpad_elan.c b/driver/touchpad_elan.c index f71bf3d09f..d3f19275ff 100644 --- a/driver/touchpad_elan.c +++ b/driver/touchpad_elan.c @@ -5,13 +5,13 @@ #include "common.h" #include "console.h" -#include "touchpad_elan.h" #include "gpio.h" #include "hwtimer.h" #include "hooks.h" #include "i2c.h" #include "task.h" #include "timer.h" +#include "touchpad.h" #include "update_fw.h" #include "util.h" #include "usb_hid_touchpad.h" @@ -514,14 +514,14 @@ int touchpad_debug(const uint8_t *param, unsigned int param_size, } #endif -void elan_tp_interrupt(enum gpio_signal signal) +void touchpad_interrupt(enum gpio_signal signal) { irq_ts = __hw_clock_source_read(); task_wake(TASK_ID_TOUCHPAD); } -void elan_tp_task(void *u) +void touchpad_task(void *u) { elan_tp_init(); diff --git a/driver/touchpad_elan.h b/driver/touchpad_elan.h deleted file mode 100644 index df6bce8b91..0000000000 --- a/driver/touchpad_elan.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2016 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. - */ - -/* Elan touchpad driver for Chrome EC */ - -#ifndef __CROS_EC_TOUCHPAD_ELAN_H -#define __CROS_EC_TOUCHPAD_ELAN_H - -#ifdef CONFIG_TOUCHPAD_ELAN -void elan_tp_interrupt(enum gpio_signal signal); -#else -static inline void elan_tp_interrupt(enum gpio_signal signal) { } -#endif /* !CONFIG_TOUCHPAD_ELAN */ - -#endif diff --git a/include/console_channel.inc b/include/console_channel.inc index 31ea119c1f..db5cbcdba9 100644 --- a/include/console_channel.inc +++ b/include/console_channel.inc @@ -72,7 +72,7 @@ CONSOLE_CHANNEL(CC_SWITCH, "switch") #endif CONSOLE_CHANNEL(CC_SYSTEM, "system") CONSOLE_CHANNEL(CC_TASK, "task") -#ifdef CONFIG_TOUCHPAD_ELAN +#ifdef CONFIG_TOUCHPAD CONSOLE_CHANNEL(CC_TOUCHPAD, "touchpad") #endif #ifdef CONFIG_DPTF diff --git a/include/touchpad.h b/include/touchpad.h new file mode 100644 index 0000000000..ce0ee5cc3e --- /dev/null +++ b/include/touchpad.h @@ -0,0 +1,11 @@ +/* Copyright 2017 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. + */ + +#ifndef __CROS_EC_TOUCHPAD_H +#define __CROS_EC_TOUCHPAD_H + +void touchpad_interrupt(enum gpio_signal signal); + +#endif |