From b72bfabf0dc697e6445c4ed3dba632b164a006e1 Mon Sep 17 00:00:00 2001
From: David Brownell <dbrownell@users.sourceforge.net>
Date: Sat, 19 Dec 2009 15:43:55 -0800
Subject: cygwin build fixes
and shrink some too-long lines
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---
src/flash/nand/at91sam9.c | 8 ++++++--
src/flash/nor/core.c | 10 ++++++----
2 files changed, 12 insertions(+), 6 deletions(-)
(limited to 'src')
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);
--
cgit v1.2.3