projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
coding style: fix print of hex values as decimal
[fw/openocd]
/
src
/
flash
/
nor
/
em357.c
diff --git
a/src/flash/nor/em357.c
b/src/flash/nor/em357.c
index 664306ca5f4017be94dbc18c0d49b8902bac2260..4e40e6b6b6cb935070d35bee1d9c79e9ec4a09ca 100644
(file)
--- a/
src/flash/nor/em357.c
+++ b/
src/flash/nor/em357.c
@@
-19,9
+19,7
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@
-89,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);
@@
-106,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;
}
@@
-345,10
+343,10
@@
static int em357_protect_check(struct flash_bank *bank)
return ERROR_OK;
}
return ERROR_OK;
}
-static int em357_erase(struct flash_bank *bank, int first, int last)
+static int em357_erase(struct flash_bank *bank, unsigned int first,
+ unsigned int last)
{
struct target *target = bank->target;
{
struct target *target = bank->target;
- int i;
if (bank->target->state != TARGET_HALTED) {
LOG_ERROR("Target not halted");
if (bank->target->state != TARGET_HALTED) {
LOG_ERROR("Target not halted");
@@
-369,7
+367,7
@@
static int em357_erase(struct flash_bank *bank, int first, int last)
if (retval != ERROR_OK)
return retval;
if (retval != ERROR_OK)
return retval;
- for (i = first; i <= last; i++) {
+ for (
unsigned int
i = first; i <= last; i++) {
retval = target_write_u32(target, EM357_FLASH_CR, FLASH_PER);
if (retval != ERROR_OK)
return retval;
retval = target_write_u32(target, EM357_FLASH_CR, FLASH_PER);
if (retval != ERROR_OK)
return retval;
@@
-395,12
+393,13
@@
static int em357_erase(struct flash_bank *bank, int first, int last)
return ERROR_OK;
}
return ERROR_OK;
}
-static int em357_protect(struct flash_bank *bank, int set, int first, int last)
+static int em357_protect(struct flash_bank *bank, int set, unsigned int first,
+ unsigned int last)
{
struct em357_flash_bank *em357_info = NULL;
struct target *target = bank->target;
uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
{
struct em357_flash_bank *em357_info = NULL;
struct target *target = bank->target;
uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
- int
i,
reg, bit;
+ int reg, bit;
int status;
uint32_t protection;
int status;
uint32_t protection;
@@
-433,7
+432,7
@@
static int em357_protect(struct flash_bank *bank, int set, int first, int last)
prot_reg[1] = (uint16_t)(protection >> 8);
prot_reg[2] = (uint16_t)(protection >> 16);
prot_reg[1] = (uint16_t)(protection >> 8);
prot_reg[2] = (uint16_t)(protection >> 16);
- for (i = first; i <= last; i++) {
+ for (
unsigned int
i = first; i <= last; i++) {
reg = (i / em357_info->ppage_size) / 8;
bit = (i / em357_info->ppage_size) - (reg * 8);
reg = (i / em357_info->ppage_size) / 8;
bit = (i / em357_info->ppage_size) - (reg * 8);
@@
-455,7
+454,7
@@
static int em357_protect(struct flash_bank *bank, int set, int first, int last)
return em357_write_options(bank);
}
return em357_write_options(bank);
}
-static int em357_write_block(struct flash_bank *bank, uint8_t *buffer,
+static int em357_write_block(struct flash_bank *bank,
const
uint8_t *buffer,
uint32_t offset, uint32_t count)
{
struct target *target = bank->target;
uint32_t offset, uint32_t count)
{
struct target *target = bank->target;
@@
-502,10
+501,9
@@
static int em357_write_block(struct flash_bank *bank, uint8_t *buffer,
LOG_WARNING("no working area available, can't do block memory writes");
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}
LOG_WARNING("no working area available, can't do block memory writes");
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}
- ;
retval = target_write_buffer(target, write_algorithm->address,
retval = target_write_buffer(target, write_algorithm->address,
- sizeof(em357_flash_write_code),
(uint8_t *)
em357_flash_write_code);
+ sizeof(em357_flash_write_code), em357_flash_write_code);
if (retval != ERROR_OK)
return retval;
if (retval != ERROR_OK)
return retval;
@@
-583,7
+581,7
@@
static int em357_write_block(struct flash_bank *bank, uint8_t *buffer,
return retval;
}
return retval;
}
-static int em357_write(struct flash_bank *bank, uint8_t *buffer,
+static int em357_write(struct flash_bank *bank,
const
uint8_t *buffer,
uint32_t offset, uint32_t count)
{
struct target *target = bank->target;
uint32_t offset, uint32_t count)
{
struct target *target = bank->target;
@@
-682,7
+680,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:
@@
-705,6
+703,11
@@
static int em357_probe(struct flash_bank *bank)
num_pages = 128;
page_size = 2048;
break;
num_pages = 128;
page_size = 2048;
break;
+ case 0x80000:
+ /* 512k -- 256 2k pages */
+ num_pages = 256;
+ page_size = 2048;
+ break;
default:
LOG_WARNING("No size specified for em357 flash driver, assuming 192k!");
num_pages = 96;
default:
LOG_WARNING("No size specified for em357 flash driver, assuming 192k!");
num_pages = 96;
@@
-738,7
+741,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;
}
@@
-751,13
+754,6
@@
static int em357_auto_probe(struct flash_bank *bank)
return em357_probe(bank);
}
return em357_probe(bank);
}
-
-static int get_em357_info(struct flash_bank *bank, char *buf, int buf_size)
-{
- snprintf(buf, buf_size, "em357\n");
- return ERROR_OK;
-}
-
COMMAND_HANDLER(em357_handle_lock_command)
{
struct target *target = NULL;
COMMAND_HANDLER(em357_handle_lock_command)
{
struct target *target = NULL;
@@
-781,7
+777,7
@@
COMMAND_HANDLER(em357_handle_lock_command)
}
if (em357_erase_options(bank) != ERROR_OK) {
}
if (em357_erase_options(bank) != ERROR_OK) {
- command_print(CMD
_CTX
, "em357 failed to erase options");
+ command_print(CMD, "em357 failed to erase options");
return ERROR_OK;
}
return ERROR_OK;
}
@@
-789,11
+785,11
@@
COMMAND_HANDLER(em357_handle_lock_command)
em357_info->option_bytes.RDP = 0;
if (em357_write_options(bank) != ERROR_OK) {
em357_info->option_bytes.RDP = 0;
if (em357_write_options(bank) != ERROR_OK) {
- command_print(CMD
_CTX
, "em357 failed to lock device");
+ command_print(CMD, "em357 failed to lock device");
return ERROR_OK;
}
return ERROR_OK;
}
- command_print(CMD
_CTX
, "em357 locked");
+ command_print(CMD, "em357 locked");
return ERROR_OK;
}
return ERROR_OK;
}
@@
-818,16
+814,16
@@
COMMAND_HANDLER(em357_handle_unlock_command)
}
if (em357_erase_options(bank) != ERROR_OK) {
}
if (em357_erase_options(bank) != ERROR_OK) {
- command_print(CMD
_CTX
, "em357 failed to unlock device");
+ command_print(CMD, "em357 failed to unlock device");
return ERROR_OK;
}
if (em357_write_options(bank) != ERROR_OK) {
return ERROR_OK;
}
if (em357_write_options(bank) != ERROR_OK) {
- command_print(CMD
_CTX
, "em357 failed to lock device");
+ command_print(CMD, "em357 failed to lock device");
return ERROR_OK;
}
return ERROR_OK;
}
- command_print(CMD
_CTX
, "em357 unlocked.\n"
+ command_print(CMD, "em357 unlocked.\n"
"INFO: a reset or power cycle is required "
"for the new settings to take effect.");
"INFO: a reset or power cycle is required "
"for the new settings to take effect.");
@@
-875,8
+871,6
@@
static int em357_mass_erase(struct flash_bank *bank)
COMMAND_HANDLER(em357_handle_mass_erase_command)
{
COMMAND_HANDLER(em357_handle_mass_erase_command)
{
- int i;
-
if (CMD_ARGC < 1)
return ERROR_COMMAND_SYNTAX_ERROR;
if (CMD_ARGC < 1)
return ERROR_COMMAND_SYNTAX_ERROR;
@@
-888,12
+882,12
@@
COMMAND_HANDLER(em357_handle_mass_erase_command)
retval = em357_mass_erase(bank);
if (retval == ERROR_OK) {
/* set all sectors as erased */
retval = em357_mass_erase(bank);
if (retval == ERROR_OK) {
/* set all sectors as erased */
- for (i = 0; i < bank->num_sectors; i++)
+ for (
unsigned int
i = 0; i < bank->num_sectors; i++)
bank->sectors[i].is_erased = 1;
bank->sectors[i].is_erased = 1;
- command_print(CMD
_CTX
, "em357 mass erase complete");
+ command_print(CMD, "em357 mass erase complete");
} else
} else
- command_print(CMD
_CTX
, "em357 mass erase failed");
+ command_print(CMD, "em357 mass erase failed");
return retval;
}
return retval;
}
@@
-934,7
+928,7
@@
static const struct command_registration em357_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
COMMAND_REGISTRATION_DONE
};
-struct flash_driver em357_flash = {
+
const
struct flash_driver em357_flash = {
.name = "em357",
.commands = em357_command_handlers,
.flash_bank_command = em357_flash_bank_command,
.name = "em357",
.commands = em357_command_handlers,
.flash_bank_command = em357_flash_bank_command,
@@
-946,5
+940,5
@@
struct flash_driver em357_flash = {
.auto_probe = em357_auto_probe,
.erase_check = default_flash_blank_check,
.protect_check = em357_protect_check,
.auto_probe = em357_auto_probe,
.erase_check = default_flash_blank_check,
.protect_check = em357_protect_check,
- .
info = get_em357_info
,
+ .
free_driver_priv = default_flash_free_driver_priv
,
};
};