summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Palatin <vpalatin@chromium.org>2015-04-27 14:54:19 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-05-15 00:53:31 +0000
commitcba37a13d2342e4c81b0be3c84010baf3d846162 (patch)
treeb0fd13fd7b9c038f6a6c4e7a3efc9090a8032014
parent6cd67659dbca2cad37a1afcc3234856fffd4d47f (diff)
downloadchrome-ec-cba37a13d2342e4c81b0be3c84010baf3d846162.tar.gz
Fix type mismatch on extern declarations
Update a few extern declarations to match the original variable type. Signed-off-by: Vincent Palatin <vpalatin@chromium.org> BRANCH=none BUG=none TEST=make buildall Compile with LTO enabled and no longer see errors for those declarations. Change-Id: I5b0f0f7f498ec414a861cb1ce50a486036c853bd Reviewed-on: https://chromium-review.googlesource.com/271279 Trybot-Ready: Vincent Palatin <vpalatin@chromium.org> Tested-by: Vincent Palatin <vpalatin@chromium.org> Reviewed-by: Alec Berg <alecaberg@chromium.org> Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
-rw-r--r--chip/host/system.c2
-rw-r--r--test/adapter_externs.h2
-rw-r--r--test/thermal_falco_externs.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/chip/host/system.c b/chip/host/system.c
index e9de6b1214..b6a2fe6ab7 100644
--- a/chip/host/system.c
+++ b/chip/host/system.c
@@ -17,7 +17,7 @@
#include "util.h"
#define SHARED_MEM_SIZE 512 /* bytes */
-char __shared_mem_buf[SHARED_MEM_SIZE];
+uint8_t __shared_mem_buf[SHARED_MEM_SIZE];
#define RAM_DATA_SIZE (sizeof(struct panic_data) + 512) /* bytes */
static char __ram_data[RAM_DATA_SIZE];
diff --git a/test/adapter_externs.h b/test/adapter_externs.h
index c866b23c1b..c55cecea88 100644
--- a/test/adapter_externs.h
+++ b/test/adapter_externs.h
@@ -13,7 +13,7 @@ extern struct adapter_id_vals ad_id_vals[];
extern struct adapter_limits
ad_limits[][NUM_AC_TURBO_STATES][NUM_AC_THRESHOLDS];
extern int ac_turbo;
-extern int ap_is_throttled;
+extern uint32_t ap_is_throttled;
extern void check_threshold(int current, struct adapter_limits *lim);
extern struct adapter_limits batt_limits[NUM_BATT_THRESHOLDS];
extern void watch_battery_closely(struct charge_state_context *ctx);
diff --git a/test/thermal_falco_externs.h b/test/thermal_falco_externs.h
index 6f202e0d5c..48c3c0ef18 100644
--- a/test/thermal_falco_externs.h
+++ b/test/thermal_falco_externs.h
@@ -9,7 +9,7 @@
/* Normally private symbols from the modules that we're testing. */
extern struct adapter_limits
ad_limits[][NUM_AC_TURBO_STATES][NUM_AC_THRESHOLDS];
-extern int ap_is_throttled;
+extern uint32_t ap_is_throttled;
extern struct adapter_limits batt_limits[NUM_BATT_THRESHOLDS];
#endif /* __THERMAL_FALCO_EXTERNS_H */