summaryrefslogtreecommitdiffstats
path: root/jedec.c
diff options
context:
space:
mode:
authorStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2014-05-02 15:41:42 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2014-05-02 15:41:42 +0000
commitf80419c75a344b303275e380add3b8cb750bab9d (patch)
tree124a732dd0d8c171b28649986c716af0477ca746 /jedec.c
parentb66ed84d193b8c0eddf5d946c6d2d94a8e8360ee (diff)
downloadast2050-flashrom-f80419c75a344b303275e380add3b8cb750bab9d.zip
ast2050-flashrom-f80419c75a344b303275e380add3b8cb750bab9d.tar.gz
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). Corresponding to flashrom svn r1782. Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'jedec.c')
-rw-r--r--jedec.c17
1 files changed, 8 insertions, 9 deletions
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));
OpenPOWER on IntegriCloud