diff options
author | Vic Yang <victoryang@chromium.org> | 2013-05-08 04:50:56 +0800 |
---|---|---|
committer | ChromeBot <chrome-bot@google.com> | 2013-05-07 20:59:53 -0700 |
commit | 5007bbc009ccc8c8e64fac5f5540c85573d4ae80 (patch) | |
tree | b0e7f1c5d4bd2ec286d8866759711b30cb5345a2 /include | |
parent | 235e6e1d0d713ddad79fa77d6982c006378053cd (diff) | |
download | chrome-ec-5007bbc009ccc8c8e64fac5f5540c85573d4ae80.tar.gz |
Use uintptr_t when converting integer from/to pointer
Perviously we use uint32_t for this, but this doesn't compile for 64-bit
environment (and likely doesn't for 16-bit either.) Use uintptr_t so that
we don't get size mismatch errors.
BUG=chrome-os-partner:19257
TEST=Run host emulated tests
BRANCH=None
Change-Id: I3cd66a745fa171c41a5f142514284ec106586acb
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/50358
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/flash.h | 2 | ||||
-rw-r--r-- | include/system.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/flash.h b/include/flash.h index cef27065dd..9a9454bf52 100644 --- a/include/flash.h +++ b/include/flash.h @@ -27,7 +27,7 @@ */ static inline char *flash_physical_dataptr(int offset) { - return (char *)(CONFIG_FLASH_BASE + offset); + return (char *)((uintptr_t)CONFIG_FLASH_BASE + offset); } /** diff --git a/include/system.h b/include/system.h index 174efa9388..fb31e54268 100644 --- a/include/system.h +++ b/include/system.h @@ -133,7 +133,7 @@ const uint8_t *system_get_jump_tag(uint16_t tag, int *version, int *size); /** * Return the address just past the last usable byte in RAM. */ -int system_usable_ram_end(void); +uintptr_t system_usable_ram_end(void); /** * Return non-zero if the given range is overlapped with the active image. |