projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tcl/target/stm32l4x: set default WORKAREASIZE to smallest device
[fw/openocd]
/
src
/
flash
/
nor
/
em357.c
diff --git
a/src/flash/nor/em357.c
b/src/flash/nor/em357.c
index a93c81e2992bee81ed92c3c3b0cbb8d93aee8207..705c1b3399d93a4fdc04620f701ee58164ee315a 100644
(file)
--- a/
src/flash/nor/em357.c
+++ b/
src/flash/nor/em357.c
@@
-87,7
+87,7
@@
struct em357_options {
struct em357_flash_bank {
struct em357_options option_bytes;
int ppage_size;
struct em357_flash_bank {
struct em357_options option_bytes;
int ppage_size;
-
int
probed;
+
bool
probed;
};
static int em357_mass_erase(struct flash_bank *bank);
};
static int em357_mass_erase(struct flash_bank *bank);
@@
-104,7
+104,7
@@
FLASH_BANK_COMMAND_HANDLER(em357_flash_bank_command)
em357_info = malloc(sizeof(struct em357_flash_bank));
bank->driver_priv = em357_info;
em357_info = malloc(sizeof(struct em357_flash_bank));
bank->driver_priv = em357_info;
- em357_info->probed =
0
;
+ em357_info->probed =
false
;
return ERROR_OK;
}
return ERROR_OK;
}
@@
-382,8
+382,6
@@
static int em357_erase(struct flash_bank *bank, unsigned int first,
retval = em357_wait_status_busy(bank, 100);
if (retval != ERROR_OK)
return retval;
retval = em357_wait_status_busy(bank, 100);
if (retval != ERROR_OK)
return retval;
-
- bank->sectors[i].is_erased = 1;
}
retval = target_write_u32(target, EM357_FLASH_CR, FLASH_LOCK);
}
retval = target_write_u32(target, EM357_FLASH_CR, FLASH_LOCK);
@@
-466,7
+464,7
@@
static int em357_write_block(struct flash_bank *bank, const uint8_t *buffer,
struct armv7m_algorithm armv7m_info;
int retval = ERROR_OK;
struct armv7m_algorithm armv7m_info;
int retval = ERROR_OK;
- /* see contib/loaders/flash/stm32x.s for src, the same is used here except for
+ /* see cont
r
ib/loaders/flash/stm32x.s for src, the same is used here except for
* a modified *_FLASH_BASE */
static const uint8_t em357_flash_write_code[] = {
* a modified *_FLASH_BASE */
static const uint8_t em357_flash_write_code[] = {
@@
-680,7
+678,7
@@
static int em357_probe(struct flash_bank *bank)
int page_size;
uint32_t base_address = 0x08000000;
int page_size;
uint32_t base_address = 0x08000000;
- em357_info->probed =
0
;
+ em357_info->probed =
false
;
switch (bank->size) {
case 0x10000:
switch (bank->size) {
case 0x10000:
@@
-724,10
+722,7
@@
static int em357_probe(struct flash_bank *bank)
LOG_INFO("flash size = %dkbytes", num_pages*page_size/1024);
LOG_INFO("flash size = %dkbytes", num_pages*page_size/1024);
- if (bank->sectors) {
- free(bank->sectors);
- bank->sectors = NULL;
- }
+ free(bank->sectors);
bank->base = base_address;
bank->size = (num_pages * page_size);
bank->base = base_address;
bank->size = (num_pages * page_size);
@@
-741,7
+736,7
@@
static int em357_probe(struct flash_bank *bank)
bank->sectors[i].is_protected = 1;
}
bank->sectors[i].is_protected = 1;
}
- em357_info->probed =
1
;
+ em357_info->probed =
true
;
return ERROR_OK;
}
return ERROR_OK;
}
@@
-764,7
+759,7
@@
COMMAND_HANDLER(em357_handle_lock_command)
struct flash_bank *bank;
int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
struct flash_bank *bank;
int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
- if (
ERROR_OK != retval
)
+ if (
retval != ERROR_OK
)
return retval;
em357_info = bank->driver_priv;
return retval;
em357_info = bank->driver_priv;
@@
-803,7
+798,7
@@
COMMAND_HANDLER(em357_handle_unlock_command)
struct flash_bank *bank;
int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
struct flash_bank *bank;
int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
- if (
ERROR_OK != retval
)
+ if (
retval != ERROR_OK
)
return retval;
target = bank->target;
return retval;
target = bank->target;
@@
-876,17
+871,13
@@
COMMAND_HANDLER(em357_handle_mass_erase_command)
struct flash_bank *bank;
int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
struct flash_bank *bank;
int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
- if (
ERROR_OK != retval
)
+ if (
retval != ERROR_OK
)
return retval;
retval = em357_mass_erase(bank);
return retval;
retval = em357_mass_erase(bank);
- if (retval == ERROR_OK) {
- /* set all sectors as erased */
- for (unsigned int i = 0; i < bank->num_sectors; i++)
- bank->sectors[i].is_erased = 1;
-
+ if (retval == ERROR_OK)
command_print(CMD, "em357 mass erase complete");
command_print(CMD, "em357 mass erase complete");
-
}
else
+ else
command_print(CMD, "em357 mass erase failed");
return retval;
command_print(CMD, "em357 mass erase failed");
return retval;