diff options
| author | Nicolas Boichat <drinkcat@google.com> | 2016-11-14 14:48:56 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-11-16 07:09:28 -0800 |
| commit | bd60328a6e5f7f6199868f0d29414001f45d91d6 (patch) | |
| tree | b467e7a97f46a5380a3abd41bc907cea6bbed5e2 | |
| parent | c66d36761f9b590f10218a434e0cf9a320fd4424 (diff) | |
| download | chrome-ec-bd60328a6e5f7f6199868f0d29414001f45d91d6.tar.gz | |
include/host_command: Conditionally define host event functions
Some functions are only defined if CONFIG_HOSTCMD_EVENTS is set,
leading to link-time failures.
In particular, do not call these functions from keyboard_scan,
and do not define PD host event commands if the configuration
option is not set.
BRANCH=none
BUG=chrome-os-partner:59083
TEST=make buildall -j
Change-Id: I0da31cdec08f86f148aa883698a44f462de46d8e
Reviewed-on: https://chromium-review.googlesource.com/410923
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | common/host_command_pd.c | 2 | ||||
| -rw-r--r-- | common/keyboard_scan.c | 2 | ||||
| -rw-r--r-- | include/host_command.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/common/host_command_pd.c b/common/host_command_pd.c index c3fc385216..831b6159bc 100644 --- a/common/host_command_pd.c +++ b/common/host_command_pd.c @@ -225,7 +225,7 @@ void pd_command_task(void) } } -#ifdef USB_TCPM_WITH_OFF_CHIP_TCPC +#if defined(USB_TCPM_WITH_OFF_CHIP_TCPC) && defined(CONFIG_HOSTCMD_EVENTS) /* * PD host event status for host command * Note: this variable must be aligned on 4-byte boundary because we pass the diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index e7f42d47a7..dd97e7f757 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -638,12 +638,14 @@ void keyboard_scan_init(void) if (boot_key_value & ~(BOOT_KEY_ESC | BOOT_KEY_LEFT_SHIFT)) return; +#ifdef CONFIG_HOSTCMD_EVENTS if (boot_key_value & BOOT_KEY_ESC) { host_set_single_event(EC_HOST_EVENT_KEYBOARD_RECOVERY); if (boot_key_value & BOOT_KEY_LEFT_SHIFT) host_set_single_event( EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT); } +#endif } void keyboard_scan_task(void) diff --git a/include/host_command.h b/include/host_command.h index 9df4689f24..720492158e 100644 --- a/include/host_command.h +++ b/include/host_command.h @@ -131,6 +131,7 @@ uint8_t *host_get_memmap(int offset); */ enum ec_status host_command_process(struct host_cmd_handler_args *args); +#ifdef CONFIG_HOSTCMD_EVENTS /** * Set one or more host event bits. * @@ -160,6 +161,7 @@ void host_clear_events(uint32_t mask); * Return the raw event state. */ uint32_t host_get_events(void); +#endif /** * Send a response to the relevant driver for transmission |