diff options
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/common/main.c b/common/main.c index 93e68fb1ca..ef5aef8acf 100644 --- a/common/main.c +++ b/common/main.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -29,6 +29,7 @@ #ifdef CONFIG_MPU #include "mpu.h" #endif +#include "panic.h" #include "rwsig.h" #include "system.h" #include "task.h" @@ -40,8 +41,8 @@ /* Console output macros */ #define CPUTS(outstr) cputs(CC_SYSTEM, outstr) -#define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ## args) -#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ## args) +#define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ##args) +#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args) test_mockable __keep int main(void) { @@ -182,12 +183,12 @@ test_mockable __keep int main(void) if (IS_ENABLED(CONFIG_EEPROM_CBI_WP) && system_is_locked()) cbi_latch_eeprom_wp(); - /* - * Keyboard scan init/Button init can set recovery events to - * indicate to host entry into recovery mode. Before this is - * done, LPC_HOST_EVENT_ALWAYS_REPORT mask needs to be initialized - * correctly. - */ + /* + * Keyboard scan init/Button init can set recovery events to + * indicate to host entry into recovery mode. Before this is + * done, LPC_HOST_EVENT_ALWAYS_REPORT mask needs to be + * initialized correctly. + */ #ifdef CONFIG_HOSTCMD_X86 lpc_init_mask(); #endif @@ -228,9 +229,9 @@ test_mockable __keep int main(void) #endif /* defined(CONFIG_DEDICATED_RECOVERY_BUTTON | CONFIG_VOLUME_BUTTONS) */ /* Make sure recovery boot won't be paused. */ - if (IS_ENABLED(CONFIG_POWER_BUTTON_INIT_IDLE) - && system_is_manual_recovery() - && (system_get_reset_flags() & EC_RESET_FLAG_AP_IDLE)) { + if (IS_ENABLED(CONFIG_POWER_BUTTON_INIT_IDLE) && + system_is_manual_recovery() && + (system_get_reset_flags() & EC_RESET_FLAG_AP_IDLE)) { CPRINTS("Clear AP_IDLE for recovery mode"); system_clear_reset_flags(EC_RESET_FLAG_AP_IDLE); } @@ -270,15 +271,14 @@ test_mockable __keep int main(void) rwsig_jump_now(); } } -#endif /* !CONFIG_VBOOT_EFS && CONFIG_RWSIG && !HAS_TASK_RWSIG */ +#endif /* !CONFIG_VBOOT_EFS && CONFIG_RWSIG && !HAS_TASK_RWSIG */ /* * Disable I2C raw mode for the ports which needed pre-task i2c * transactions as the task is about to start and the I2C can resume * to event based transactions. */ - if (IS_ENABLED(CONFIG_I2C_BITBANG) && - IS_ENABLED(CONFIG_I2C_CONTROLLER)) + if (IS_ENABLED(CONFIG_I2C_BITBANG) && IS_ENABLED(CONFIG_I2C_CONTROLLER)) enable_i2c_raw_mode(false); /* |