diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-19 15:43:55 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-19 15:43:55 -0800 |
| commit | b72bfabf0dc697e6445c4ed3dba632b164a006e1 (patch) | |
| tree | dad46c3a0acf55c9d13e39c3dc6d67364e8e9e81 /src | |
| parent | 3ac2a440419a52752a5e11eba8ab2722a1fe73bf (diff) | |
| download | openocd+libswd-b72bfabf0dc697e6445c4ed3dba632b164a006e1.tar.gz openocd+libswd-b72bfabf0dc697e6445c4ed3dba632b164a006e1.tar.bz2 openocd+libswd-b72bfabf0dc697e6445c4ed3dba632b164a006e1.tar.xz openocd+libswd-b72bfabf0dc697e6445c4ed3dba632b164a006e1.zip | |
cygwin build fixes
and shrink some too-long lines
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/flash/nand/at91sam9.c | 8 | ||||
| -rw-r--r-- | src/flash/nor/core.c | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/flash/nand/at91sam9.c b/src/flash/nand/at91sam9.c index 7cfd763a..5cfbb0a3 100644 --- a/src/flash/nand/at91sam9.c +++ b/src/flash/nand/at91sam9.c @@ -414,12 +414,16 @@ static int at91sam9_read_page(struct nand_device *nand, uint32_t page, // attempt recovery uint32_t parity; - target_read_u32(target, info->ecc + AT91C_ECCx_PR, &parity); + target_read_u32(target, + info->ecc + AT91C_ECCx_PR, + &parity); uint32_t word = (parity & 0x0000FFF0) >> 4; uint32_t bit = parity & 0x0F; data[word] ^= (0x1) << bit; - LOG_INFO("Data word %d, bit %d corrected.", word, bit); + LOG_INFO("Data word %d, bit %d corrected.", + (unsigned) word, + (unsigned) bit); } } diff --git a/src/flash/nor/core.c b/src/flash/nor/core.c index 1873deed..67fd78bf 100644 --- a/src/flash/nor/core.c +++ b/src/flash/nor/core.c @@ -281,7 +281,8 @@ int default_flash_blank_check(struct flash_bank *bank) } /* erase given flash region, selects proper bank according to target and address */ -static int flash_iterate_address_range(struct target *target, uint32_t addr, uint32_t length, +static int flash_iterate_address_range(struct target *target, + uint32_t addr, uint32_t length, int (*callback)(struct flash_bank *bank, int first, int last)) { struct flash_bank *c; @@ -344,8 +345,8 @@ static int flash_iterate_address_range(struct target *target, uint32_t addr, uin if (first == -1 || last == -1) { LOG_ERROR("address range 0x%8.8x .. 0x%8.8x " "is not sector-aligned", - (unsigned) c->base + addr, - (unsigned) last_addr - 1); + (unsigned) (c->base + addr), + (unsigned) (last_addr - 1)); return ERROR_FLASH_DST_BREAKS_ALIGNMENT; } @@ -357,7 +358,8 @@ static int flash_iterate_address_range(struct target *target, uint32_t addr, uin return callback(c, first, last); } -int flash_erase_address_range(struct target *target, uint32_t addr, uint32_t length) +int flash_erase_address_range(struct target *target, + uint32_t addr, uint32_t length) { return flash_iterate_address_range(target, addr, length, &flash_driver_erase); |