imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cygwin build fixes

Browse Source 
and shrink some too-long lines

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-12-19 15:43:55 -08:00
parent 3ac2a44041
commit b72bfabf0d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/nand/at91sam9.c
View File

@ -414,12 +414,16 @@ static int at91sam9_read_page(struct nand_device *nand, uint32_t page,
// attempt recovery // attempt recovery
uint32_t parity; 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 word = (parity & 0x0000FFF0) >> 4;
uint32_t bit = parity & 0x0F; uint32_t bit = parity & 0x0F;
data[word] ^= (0x1) << bit; 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);
} }
} }

10
src/flash/nor/core.c
View File

@ -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 */ /* 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)) int (*callback)(struct flash_bank *bank, int first, int last))
{ {
struct flash_bank *c; 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) { if (first == -1 || last == -1) {
LOG_ERROR("address range 0x%8.8x .. 0x%8.8x " LOG_ERROR("address range 0x%8.8x .. 0x%8.8x "
"is not sector-aligned", "is not sector-aligned",
(unsigned) c->base + addr, (unsigned) (c->base + addr),
(unsigned) last_addr - 1); (unsigned) (last_addr - 1));
return ERROR_FLASH_DST_BREAKS_ALIGNMENT; 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); 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, return flash_iterate_address_range(target,
addr, length, &flash_driver_erase); addr, length, &flash_driver_erase);