diff options
| author | Patryk Duda <pdk@semihalf.com> | 2021-06-16 09:56:56 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-17 11:04:48 +0000 |
| commit | 2219c2267a301978877fd17f5e60ed850bf7956d (patch) | |
| tree | 721e2a7ba3caffe0b37250bf335b1cee85e7afd9 | |
| parent | f767b8ebaa0b304aa79167c2407d1d1fc5618c63 (diff) | |
| download | chrome-ec-2219c2267a301978877fd17f5e60ed850bf7956d.tar.gz | |
Fix compilation issues with nocturne SDK
Compiler in nocturne cros SDK doesn't allow for variable declaration
inside for loop. This patch removes variable declaration inside for
loop in code which is used by nocturne board.
This patch doesn't introduce any logical changes.
BUG=b:160676144
BRANCH=none
TEST=Make sure EC points to commit on cros/main.
On nocturne SDK:
cros_workon-nocturne start chromeos-ec
emerge-nocturne chromeos-ec chromeos-bootimage
Make sure that firmware compiles
Signed-off-by: Patryk Duda <pdk@semihalf.com>
Change-Id: I75ff21d966d5e353d1f7873695127bac4357fb32
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2965922
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
| -rw-r--r-- | chip/npcx/system.c | 3 | ||||
| -rw-r--r-- | common/i2c_controller.c | 6 | ||||
| -rw-r--r-- | driver/tcpm/ps8xxx.c | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/chip/npcx/system.c b/chip/npcx/system.c index ce8851b18f..48727c2686 100644 --- a/chip/npcx/system.c +++ b/chip/npcx/system.c @@ -1082,6 +1082,7 @@ const char *system_get_chip_revision(void) #ifdef CHIP_FAMILY_NPCX7 uint8_t chip_id = NPCX_DEVICE_ID_CR; #endif + int s; switch (chip_gen) { #if defined(CHIP_FAMILY_NPCX5) @@ -1115,7 +1116,7 @@ const char *system_get_chip_revision(void) * For npcx5/npcx7, the revision number is 1 byte. * For NPCX9 and later chips, the revision number is 4 bytes. */ - for (int s = sizeof(rev_num) - 1; s >= 0; s--) { + for (s = sizeof(rev_num) - 1; s >= 0; s--) { uint8_t r = rev_num >> (s * 8); *p++ = system_to_hex(r >> 4); diff --git a/common/i2c_controller.c b/common/i2c_controller.c index e2fa3ec28f..09eb255a22 100644 --- a/common/i2c_controller.c +++ b/common/i2c_controller.c @@ -152,7 +152,9 @@ static int i2c_xfer_no_retry(const int port, const uint8_t *out, int out_size, uint8_t *in, int in_size, int flags) { - for (int offset = 0; offset < out_size; ) { + int offset; + + for (offset = 0; offset < out_size; ) { int chunk_size = MIN(out_size - offset, CONFIG_I2C_CHIP_MAX_TRANSFER_SIZE); int out_flags = 0; @@ -167,7 +169,7 @@ static int i2c_xfer_no_retry(const int port, out_flags)); offset += chunk_size; } - for (int offset = 0; offset < in_size; ) { + for (offset = 0; offset < in_size; ) { int chunk_size = MIN(in_size - offset, CONFIG_I2C_CHIP_MAX_TRANSFER_SIZE); int in_flags = 0; diff --git a/driver/tcpm/ps8xxx.c b/driver/tcpm/ps8xxx.c index b9e83c6d13..798fe266d6 100644 --- a/driver/tcpm/ps8xxx.c +++ b/driver/tcpm/ps8xxx.c @@ -292,10 +292,12 @@ static struct ps8xxx_variant_map variant_map[] = { static int get_reg_by_product(const int port, const enum ps8xxx_variant_regs reg) { + int i; + if (reg < REG_FIRST_INDEX || reg >= REG_MAX_COUNT) return INT32_MAX; - for (int i = 0; i < ARRAY_SIZE(variant_map); i++) { + for (i = 0; i < ARRAY_SIZE(variant_map); i++) { if (product_id[port] == variant_map[i].product_id) { return variant_map[i].reg_map[reg]; @@ -611,7 +613,9 @@ static int ps8xxx_enter_low_power_mode(int port) static int ps8xxx_dci_disable(int port) { - for (int i = 0; i < ARRAY_SIZE(variant_map); i++) { + int i; + + for (i = 0; i < ARRAY_SIZE(variant_map); i++) { if (product_id[port] == variant_map[i].product_id) return variant_map[i].dci_disable_ptr(port); } |