diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-23 22:39:47 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-23 22:39:47 +0000 |
| commit | 128a73342856217e98a5da64b2805e062fd4e00d (patch) | |
| tree | 3cd1656b9f3eb2e9be261b003283dce596362d7a /src/flash | |
| parent | 319fdecb76318ec982855f298b1a4a3a60375748 (diff) | |
| download | openocd_libswd-128a73342856217e98a5da64b2805e062fd4e00d.tar.gz openocd_libswd-128a73342856217e98a5da64b2805e062fd4e00d.tar.bz2 openocd_libswd-128a73342856217e98a5da64b2805e062fd4e00d.tar.xz openocd_libswd-128a73342856217e98a5da64b2805e062fd4e00d.zip | |
- Fixes '&&' whitespace
- Replace ')\(&&\)(' with ') \1 ('.
- Replace '\(\w\)\(&&\)(' with '\1 \2 ('.
- Replace '\(\w\)\(&&\)\(\w\)' with '\1 \2 \3'.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2366 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/at91sam7.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/flash/at91sam7.c b/src/flash/at91sam7.c index ca6e2c47..259f0121 100644 --- a/src/flash/at91sam7.c +++ b/src/flash/at91sam7.c @@ -284,7 +284,7 @@ static int at91sam7_flash_command(struct flash_bank_s *bank, uint8_t cmd, uint16 target_write_u32(target, MC_FCR[bank->bank_number], fcr); LOG_DEBUG("Flash command: 0x%" PRIx32 ", flash bank: %i, page number: %u", fcr, bank->bank_number+1, pagen); - if ((at91sam7_info->cidr_arch == 0x60)&&((cmd==SLB)|(cmd==CLB))) + if ((at91sam7_info->cidr_arch == 0x60) && ((cmd==SLB)|(cmd==CLB))) { /* Lock bit manipulation on AT91SAM7A3 waits for FC_FSR bit 1, EOL */ if (at91sam7_wait_status_busy(bank, MC_FSR_EOL, 10)&0x0C) |