From c8a40f7a8ecfa22d707920e10691b819c80f48ca Mon Sep 17 00:00:00 2001 From: stefanct Date: Fri, 2 May 2014 15:41:42 +0000 Subject: Make delay values unsigned. There is no reason for negative delays in our use cases: - We don't need it (to work around any quirks). - sleep() (POSIX) uses an unsigned argument. - usleep() (POSIX) uses an unsigned argument. - Sleep() (Windows) uses an unsigned argument. Change all callees as well (without any complications). Signed-off-by: Stefan Tauner Acked-by: Stefan Tauner git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1782 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- jedec.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'jedec.c') diff --git a/jedec.c b/jedec.c index 10f5db9..be4782a 100644 --- a/jedec.c +++ b/jedec.c @@ -37,8 +37,7 @@ uint8_t oddparity(uint8_t val) return (val ^ (val >> 1)) & 0x1; } -static void toggle_ready_jedec_common(const struct flashctx *flash, - chipaddr dst, int delay) +static void toggle_ready_jedec_common(const struct flashctx *flash, chipaddr dst, unsigned int delay) { unsigned int i = 0; uint8_t tmp1, tmp2; @@ -128,7 +127,7 @@ static int probe_jedec_common(struct flashctx *flash, unsigned int mask) uint8_t id1, id2; uint32_t largeid1, largeid2; uint32_t flashcontent1, flashcontent2; - int probe_timing_enter, probe_timing_exit; + unsigned int probe_timing_enter, probe_timing_exit; if (chip->probe_timing > 0) probe_timing_enter = probe_timing_exit = chip->probe_timing; @@ -245,9 +244,9 @@ static int erase_sector_jedec_common(struct flashctx *flash, unsigned int page, unsigned int pagesize, unsigned int mask) { chipaddr bios = flash->virtual_memory; - int delay_us = 0; + unsigned int delay_us = 0; if(flash->chip->probe_timing != TIMING_ZERO) - delay_us = 10; + delay_us = 10; /* Issue the Sector Erase command */ chip_writeb(flash, 0xAA, bios + (0x5555 & mask)); @@ -275,9 +274,9 @@ static int erase_block_jedec_common(struct flashctx *flash, unsigned int block, unsigned int blocksize, unsigned int mask) { chipaddr bios = flash->virtual_memory; - int delay_us = 0; + unsigned int delay_us = 0; if(flash->chip->probe_timing != TIMING_ZERO) - delay_us = 10; + delay_us = 10; /* Issue the Sector Erase command */ chip_writeb(flash, 0xAA, bios + (0x5555 & mask)); @@ -304,9 +303,9 @@ static int erase_block_jedec_common(struct flashctx *flash, unsigned int block, static int erase_chip_jedec_common(struct flashctx *flash, unsigned int mask) { chipaddr bios = flash->virtual_memory; - int delay_us = 0; + unsigned int delay_us = 0; if(flash->chip->probe_timing != TIMING_ZERO) - delay_us = 10; + delay_us = 10; /* Issue the JEDEC Chip Erase command */ chip_writeb(flash, 0xAA, bios + (0x5555 & mask)); -- cgit v1.2.1