diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2012-02-27 15:04:37 -0800 |
|---|---|---|
| committer | Bill Richardson <wfrichar@chromium.org> | 2012-02-27 15:54:00 -0800 |
| commit | ae8dd20d77385ed9822d17345c68ee54362cdfb2 (patch) | |
| tree | ff12df84568a5b40cc343a645bda3c5ad9ad3802 /chip/lm4/flash.c | |
| parent | f40df60a9a963d43f1a3a0309f2c2f98f28dd1aa (diff) | |
| download | chrome-ec-ae8dd20d77385ed9822d17345c68ee54362cdfb2.tar.gz | |
Make all warnings into errors.
Also fix a couple places where that makes it fail.
BUG=none
TEST=none
Change-Id: I3b434b4bfa547a579193aac67c1a9d440a2c4e51
Diffstat (limited to 'chip/lm4/flash.c')
| -rw-r--r-- | chip/lm4/flash.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/chip/lm4/flash.c b/chip/lm4/flash.c index 43f5d5923b..9d7d33f2ed 100644 --- a/chip/lm4/flash.c +++ b/chip/lm4/flash.c @@ -188,7 +188,7 @@ static int find_last_wp_block(void) return -1; } -static int get_wp_range(int *start, int *nblock) +static int get_wp_range(uint32_t *start, uint32_t *nblock) { int start_blk, end_blk; @@ -204,8 +204,8 @@ static int get_wp_range(int *start, int *nblock) /* TODO: Sanity check the shadow value? */ end_blk = find_last_wp_block(); - *nblock = end_blk - start_blk + 1; - *start = start_blk; + *nblock = (uint32_t)(end_blk - start_blk + 1); + *start = (uint32_t)start_blk; return EC_SUCCESS; } @@ -225,9 +225,9 @@ static int set_wp_range(int start, int nblock) return EC_SUCCESS; } -int flash_get_write_protect_range(int *offset, int *size) +int flash_get_write_protect_range(uint32_t *offset, uint32_t *size) { - int start, nblock; + uint32_t start, nblock; int rv; rv = get_wp_range(&start, &nblock); @@ -239,13 +239,12 @@ int flash_get_write_protect_range(int *offset, int *size) return EC_SUCCESS; } -int flash_set_write_protect_range(int offset, int size) +int flash_set_write_protect_range(uint32_t offset, uint32_t size) { int start, nblock; int rv; - if ((offset < 0) || (size < 0) || ((offset + size) > - (LM4_FLASH_FSIZE * FLASH_PROTECT_BYTES))) + if ((offset + size) > (LM4_FLASH_FSIZE * FLASH_PROTECT_BYTES)) return EC_ERROR_UNKNOWN; /* Invalid range */ rv = flash_get_write_protect_status(); @@ -272,7 +271,7 @@ int flash_set_write_protect_range(int offset, int size) int flash_get_write_protect_status(void) { - int start, nblock; + uint32_t start, nblock; int rv; rv = get_wp_range(&start, &nblock); |