diff options
| author | Vic Yang <victoryang@google.com> | 2015-01-20 20:34:38 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-01-21 20:41:20 +0000 |
| commit | 10c8a41571ed153a7ccfd2d9e0e1520adf3b8723 (patch) | |
| tree | b3e432404b2d13faf4e686f4ab10fc1661f5ec46 | |
| parent | edf0648a0a1aa0e91a8aac805ffb2fa25cf5fff7 (diff) | |
| download | chrome-ec-10c8a41571ed153a7ccfd2d9e0e1520adf3b8723.tar.gz | |
ryu: Remove printf in interrupt handlers
We should avoid printing log in interrupt handlers:
- Move VBUS logging to a deferred function.
- Remove unused interrupt handler.
BRANCH=Ryu
BUG=None
TEST=Run on Ryu P3 and see VBUS logging when VBUS changes.
Change-Id: I06ffe62a656d63fdd63b5d1c5e2f6481eeddc445
Signed-off-by: Vic Yang <victoryang@google.com>
Reviewed-on: https://chromium-review.googlesource.com/242180
Tested-by: Vic Yang <victoryang@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Queue: Vic Yang <victoryang@chromium.org>
| -rw-r--r-- | board/ryu/board.c | 11 | ||||
| -rw-r--r-- | board/ryu/board.h | 2 | ||||
| -rw-r--r-- | board/ryu/gpio.inc | 10 |
3 files changed, 12 insertions, 11 deletions
diff --git a/board/ryu/board.c b/board/ryu/board.c index bf58d1887c..da923d4b89 100644 --- a/board/ryu/board.c +++ b/board/ryu/board.c @@ -33,15 +33,16 @@ #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) -void vbus_evt(enum gpio_signal signal) +static void vbus_log(void) { - ccprintf("VBUS %d, %d!\n", signal, gpio_get_level(signal)); - task_wake(TASK_ID_PD); + CPRINTS("VBUS %d", gpio_get_level(GPIO_CHGR_ACOK)); } +DECLARE_DEFERRED(vbus_log); -void unhandled_evt(enum gpio_signal signal) +void vbus_evt(enum gpio_signal signal) { - ccprintf("Unhandled INT %d,%d!\n", signal, gpio_get_level(signal)); + hook_call_deferred(vbus_log, 0); + task_wake(TASK_ID_PD); } /* Wait 200ms after a charger is detected to debounce pin contact order */ diff --git a/board/ryu/board.h b/board/ryu/board.h index 5453965d2d..0d54abdb99 100644 --- a/board/ryu/board.h +++ b/board/ryu/board.h @@ -101,7 +101,7 @@ /* Maximum number of deferrable functions */ #undef DEFERRABLE_MAX_COUNT -#define DEFERRABLE_MAX_COUNT 9 +#define DEFERRABLE_MAX_COUNT 10 #ifndef __ASSEMBLER__ diff --git a/board/ryu/gpio.inc b/board/ryu/gpio.inc index 4b6d5cc717..eddcabec3b 100644 --- a/board/ryu/gpio.inc +++ b/board/ryu/gpio.inc @@ -7,16 +7,16 @@ /* Interrupts */ GPIO(CHGR_ACOK, D, 4, GPIO_INT_BOTH | GPIO_PULL_UP, vbus_evt) -GPIO(BC_TEMP_ALERT_L, C, 5, GPIO_INT_FALLING, unhandled_evt) +GPIO(BC_TEMP_ALERT_L, C, 5, GPIO_INT_FALLING, NULL) GPIO(POWER_BUTTON_L, C, 13, GPIO_INT_BOTH, power_button_interrupt) /* active high, the name is for compatibility with existing code */ GPIO(USBC_BC12_INT_L, D, 11, GPIO_INT_FALLING | GPIO_PULL_UP, usb_evt) GPIO(LID_OPEN, E, 1, GPIO_INT_BOTH | GPIO_PULL_UP, lid_interrupt) GPIO(CHARGE_DONE, E, 6, GPIO_INT_BOTH, inductive_charging_interrupt) -GPIO(LB_INT_L, E, 7, GPIO_INT_FALLING | GPIO_PULL_UP, unhandled_evt) -GPIO(LIGHTBAR_EN_L, E, 8, GPIO_INT_FALLING | GPIO_PULL_UP, unhandled_evt) +GPIO(LB_INT_L, E, 7, GPIO_INT_FALLING | GPIO_PULL_UP, NULL) +GPIO(LIGHTBAR_EN_L, E, 8, GPIO_INT_FALLING | GPIO_PULL_UP, NULL) GPIO(AP_IN_SUSPEND, F, 9, GPIO_INT_BOTH, power_signal_interrupt) -GPIO(BASE_PRES_L, E, 10, GPIO_INT_BOTH | GPIO_PULL_UP, unhandled_evt) -GPIO(AP_HOLD, E, 3, GPIO_INT_BOTH, power_signal_interrupt) +GPIO(BASE_PRES_L, E, 10, GPIO_INT_BOTH | GPIO_PULL_UP, NULL) +GPIO(AP_HOLD, E, 3, GPIO_INT_BOTH, power_signal_interrupt) /* Buttons */ GPIO(BTN_VOLD_L, C, 0, GPIO_INPUT | GPIO_PULL_UP, NULL) |