diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-02-28 10:44:41 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-02-28 10:44:41 +0000 |
| commit | 86ca2270f40d650a849e778518e7aa9c2c713341 (patch) | |
| tree | 76d0f52c9637707506e8df254f733d32c5b9b269 /src/flash/stm32x.c | |
| parent | b008ff7ae1f5e646311b3901772be8c9ddaecd0c (diff) | |
| download | openocd+libswd-86ca2270f40d650a849e778518e7aa9c2c713341.tar.gz openocd+libswd-86ca2270f40d650a849e778518e7aa9c2c713341.tar.bz2 openocd+libswd-86ca2270f40d650a849e778518e7aa9c2c713341.tar.xz openocd+libswd-86ca2270f40d650a849e778518e7aa9c2c713341.zip | |
Pavel Chromy cleaned up checks for halted, error messages, etc.
git-svn-id: svn://svn.berlios.de/openocd/trunk@374 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash/stm32x.c')
| -rw-r--r-- | src/flash/stm32x.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c index f7dc1033..8a0a98dd 100644 --- a/src/flash/stm32x.c +++ b/src/flash/stm32x.c @@ -292,7 +292,7 @@ int stm32x_blank_check(struct flash_bank_s *bank, int first, int last) { return ERROR_TARGET_NOT_HALTED; } - + buffer = malloc(256); for (i = first; i <= last; i++) @@ -356,6 +356,11 @@ int stm32x_erase(struct flash_bank_s *bank, int first, int last) int i; u32 status; + if (bank->target->state != TARGET_HALTED) + { + return ERROR_TARGET_NOT_HALTED; + } + /* unlock flash registers */ target_write_u32(target, STM32_FLASH_KEYR, KEY1); target_write_u32(target, STM32_FLASH_KEYR, KEY2); @@ -547,6 +552,11 @@ int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) u8 status; u32 retval; + if (bank->target->state != TARGET_HALTED) + { + return ERROR_TARGET_NOT_HALTED; + } + if (offset & 0x1) { WARNING("offset 0x%x breaks required 2-byte alignment", offset); @@ -636,6 +646,11 @@ int stm32x_probe(struct flash_bank_s *bank) u16 num_sectors; u32 device_id; + if (bank->target->state != TARGET_HALTED) + { + return ERROR_TARGET_NOT_HALTED; + } + stm32x_info->probed = 0; /* read stm32 device id register */ |