[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-971-gb72bfab

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  b72bfabf0dc697e6445c4ed3dba632b164a006e1 (commit)
      from  3ac2a440419a52752a5e11eba8ab2722a1fe73bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b72bfabf0dc697e6445c4ed3dba632b164a006e1
Author: David Brownell <dbr...@us...>
Date:   Sat Dec 19 15:43:55 2009 -0800

    cygwin build fixes
    
    and shrink some too-long lines
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/flash/nand/at91sam9.c b/src/flash/nand/at91sam9.c
index 7cfd763..5cfbb0a 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 1873dee..67fd78b 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);

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nand/at91sam9.c |    8 ++++++--
 src/flash/nor/core.c      |   10 ++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository