diff options
| author | Eric Wetzel <thewetzel@gmail.com> | 2011-01-05 14:24:54 -0500 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-01-05 21:46:12 +0100 |
| commit | a665ef716a9a90c30fb15e1f979845b3438a7251 (patch) | |
| tree | 9f5b7f916393d21b2644541bc5e755f0233f96b1 /src/flash/nor | |
| parent | 0cd84000daab056dea61eb9d60cca538a3716acd (diff) | |
| download | openocd+libswd-a665ef716a9a90c30fb15e1f979845b3438a7251.tar.gz openocd+libswd-a665ef716a9a90c30fb15e1f979845b3438a7251.tar.bz2 openocd+libswd-a665ef716a9a90c30fb15e1f979845b3438a7251.tar.xz openocd+libswd-a665ef716a9a90c30fb15e1f979845b3438a7251.zip | |
nit: do not add \n at end of LOG_ERROR
Fixed in many other places, and submitted in response to Øyvind's invitation.
Diffstat (limited to 'src/flash/nor')
| -rw-r--r-- | src/flash/nor/aduc702x.c | 6 | ||||
| -rw-r--r-- | src/flash/nor/at91sam3.c | 8 | ||||
| -rw-r--r-- | src/flash/nor/ecos.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c index 40ee3212..2005b78f 100644 --- a/src/flash/nor/aduc702x.c +++ b/src/flash/nor/aduc702x.c @@ -112,7 +112,7 @@ static int aduc702x_erase(struct flash_bank *bank, int first, int last) if (aduc702x_check_flash_completion(target, 3500) != ERROR_OK) { - LOG_ERROR("mass erase failed\n"); + LOG_ERROR("mass erase failed"); aduc702x_set_write_enable(target, 0); return ERROR_FLASH_OPERATION_FAILED; } @@ -132,7 +132,7 @@ static int aduc702x_erase(struct flash_bank *bank, int first, int last) if (aduc702x_check_flash_completion(target, 50) != ERROR_OK) { - LOG_ERROR("failed to erase sector at address 0x%08lX\n", adr); + LOG_ERROR("failed to erase sector at address 0x%08lX", adr); aduc702x_set_write_enable(target, 0); return ERROR_FLASH_SECTOR_NOT_ERASED; } @@ -330,7 +330,7 @@ static int aduc702x_write_single(struct flash_bank *bank, uint8_t *buffer, uint3 if (aduc702x_check_flash_completion(target, 1) != ERROR_OK) { - LOG_ERROR("single write failed for address 0x%08lX\n", (unsigned long)(offset + x)); + LOG_ERROR("single write failed for address 0x%08lX", (unsigned long)(offset + x)); aduc702x_set_write_enable(target, 0); return ERROR_FLASH_OPERATION_FAILED; } diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c index b8789a3c..94b37243 100644 --- a/src/flash/nor/at91sam3.c +++ b/src/flash/nor/at91sam3.c @@ -1787,7 +1787,7 @@ sam3_ReadThisReg(struct sam3_chip *pChip, uint32_t *goes_here) r = target_read_u32(pChip->target, pReg->address, goes_here); if (r != ERROR_OK) { - LOG_ERROR("Cannot read SAM3 register: %s @ 0x%08x, Err: %d\n", + LOG_ERROR("Cannot read SAM3 register: %s @ 0x%08x, Err: %d", pReg->name, (unsigned)(pReg->address), r); } return r; @@ -1806,7 +1806,7 @@ sam3_ReadAllRegs(struct sam3_chip *pChip) r = sam3_ReadThisReg(pChip, sam3_get_reg_ptr(&(pChip->cfg), pReg)); if (r != ERROR_OK) { - LOG_ERROR("Cannot read SAM3 registere: %s @ 0x%08x, Error: %d\n", + LOG_ERROR("Cannot read SAM3 registere: %s @ 0x%08x, Error: %d", pReg->name, ((unsigned)(pReg->address)), r); return r; } @@ -1869,7 +1869,7 @@ sam3_erase_check(struct flash_bank *bank) return ERROR_TARGET_NOT_HALTED; } if (0 == bank->num_sectors) { - LOG_ERROR("Target: not supported/not probed\n"); + LOG_ERROR("Target: not supported/not probed"); return ERROR_FAIL; } @@ -2066,7 +2066,7 @@ _sam3_probe(struct flash_bank *bank, int noise) pPrivate = get_sam3_bank_private(bank); if (!pPrivate) { - LOG_ERROR("Invalid/unknown bank number\n"); + LOG_ERROR("Invalid/unknown bank number"); return ERROR_FAIL; } diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c index 945852dd..c850f4f9 100644 --- a/src/flash/nor/ecos.c +++ b/src/flash/nor/ecos.c @@ -264,7 +264,7 @@ static int eCosBoard_erase(struct ecosflash_flash_bank *info, uint32_t address, if (flashErr != 0x0) { - LOG_ERROR("Flash erase failed with %d (%s)\n", (int)flashErr, flash_errmsg(flashErr)); + LOG_ERROR("Flash erase failed with %d (%s)", (int)flashErr, flash_errmsg(flashErr)); return ERROR_FAIL; } @@ -322,7 +322,7 @@ static int eCosBoard_flash(struct ecosflash_flash_bank *info, void *data, uint32 if (flashErr != 0x0) { - LOG_ERROR("Flash prog failed with %d (%s)\n", (int)flashErr, flash_errmsg(flashErr)); + LOG_ERROR("Flash prog failed with %d (%s)", (int)flashErr, flash_errmsg(flashErr)); return ERROR_FAIL; } } |