diff options
| author | Keith Short <keithshort@chromium.org> | 2022-02-11 15:46:24 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-02-25 21:08:30 +0000 |
| commit | d197a82baaa0a637531d68774f8f11bd20407b60 (patch) | |
| tree | b2f2af107362a9052ed8ac0da30df9521d9c71c8 | |
| parent | fa06f3d55f5ed80a6e2564f3f1954218a8413008 (diff) | |
| download | chrome-ec-d197a82baaa0a637531d68774f8f11bd20407b60.tar.gz | |
gpio: cleanup header usage for buttons
button.h only requires the enum gpio_signal, so use gpio_signal.h
instead of gpio.h.
The build compare doesn't match due to the ASSERT() call in
keyboard_vivaldi.c. The line number increases by 1, changing the assert
output text.
From vivaldi_init(), before the change:
21a1 movs r1, #161 ; 0xa1
f7fe f856 bl 10099484 <panic_assert_fail>
After the change:
21a2 movs r1, #162 ; 0xa2
f7fe f856 bl 10099484 <panic_assert_fail>
BUG=b:218856245
BRANCH=none
TEST=compare_build.sh
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: Ib0aae4e7b66dd9f83071095b7db233444f6dc4be
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3489092
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Yuval Peress <peress@google.com>
| -rw-r--r-- | board/primus/ps2.c | 1 | ||||
| -rw-r--r-- | common/keyboard_vivaldi.c | 1 | ||||
| -rw-r--r-- | include/button.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/board/primus/ps2.c b/board/primus/ps2.c index 5ccc457b8e..5ef29283f6 100644 --- a/board/primus/ps2.c +++ b/board/primus/ps2.c @@ -3,6 +3,7 @@ * found in the LICENSE file. */ +#include "gpio.h" #include "hooks.h" #include "i8042_protocol.h" #include "keyboard_8042.h" diff --git a/common/keyboard_vivaldi.c b/common/keyboard_vivaldi.c index c21924b3e0..beddf421f3 100644 --- a/common/keyboard_vivaldi.c +++ b/common/keyboard_vivaldi.c @@ -8,6 +8,7 @@ #include "keyboard_8042_sharedlib.h" #include "keyboard_scan.h" #include "ec_commands.h" +#include "gpio.h" #include <host_command.h> #include <util.h> #include <hooks.h> diff --git a/include/button.h b/include/button.h index 3ab5892083..30d2969e8c 100644 --- a/include/button.h +++ b/include/button.h @@ -10,7 +10,7 @@ #include "common.h" #include "compile_time_macros.h" -#include "gpio.h" +#include "gpio_signal.h" #include "ec_commands.h" #define BUTTON_FLAG_ACTIVE_HIGH BIT(0) |