cygwin build fixes

and shrink some too-long lines

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/src/flash/nand/at91sam9.c b/src/flash/nand/at91sam9.c
index 7cfd763a8b157d350fbe047b8d55c56e2a1f48a6..5cfbb0a38611b9fc20ead51711c3e384f61ad0d8 100644 (file)
--- 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 1873deede567e56ef93caf230040cabded7fb40a..67fd78bf74fe45016e596334b3c07ed1fa2ebecd 100644 (file)
--- 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);