auracaster/sw_openocd
3
0
Fork 0
forked from auracaster/openocd
Code Pull Requests Activity

flash/nor: Use proper data types in driver API

Browse Source 
Use 'unsigned int' and 'bool' instead of 'int' where appropriate.
While at it, fix some coding style issues.

No new Clang analyzer warnings.

Change-Id: I700802c9ee81c3c7ae73108f0f8f06b15a4345f8
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/4929
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Marc Schink
2020-06-07 17:00:13 +02:00
committed by Tomas Vanek
parent a2e6982a18
commit ef14384b68
70 changed files with 773 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/flash/nor/at91sam4l.c
View File

@@ -125,7 +125,7 @@ struct sam4l_info {
uint32_t page_size;
int num_pages;
int sector_size;
int pages_per_sector;
unsigned int pages_per_sector;
bool probed;
struct target *target;
@@ -335,7 +335,7 @@ static int sam4l_probe(struct flash_bank *bank)
/* Fill out the sector information: all SAM4L sectors are the same size and
* there is always a fixed number of them. */
for (int i = 0; i < bank->num_sectors; i++) {
for (unsigned int i = 0; i < bank->num_sectors; i++) {
bank->sectors[i].size = chip->sector_size;
bank->sectors[i].offset = i * chip->sector_size;
/* mark as unknown */
@@ -375,13 +375,14 @@ static int sam4l_protect_check(struct flash_bank *bank)
return res;
st >>= 16; /* There are 16 lock region bits in the upper half word */
for (int i = 0; i < bank->num_sectors; i++)
bank->sectors[i].is_protected = !!(st & (1<<i));
for (unsigned int i = 0; i < bank->num_sectors; i++)
bank->sectors[i].is_protected = !!(st & (1<<i));
return ERROR_OK;
}
static int sam4l_protect(struct flash_bank *bank, int set, int first, int last)
static int sam4l_protect(struct flash_bank *bank, int set, unsigned int first,
unsigned int last)
{
struct sam4l_info *chip = (struct sam4l_info *)bank->driver_priv;
@@ -398,7 +399,7 @@ static int sam4l_protect(struct flash_bank *bank, int set, int first, int last)
/* Make sure the pages make sense. */
if (first >= bank->num_sectors || last >= bank->num_sectors) {
LOG_ERROR("Protect range %d - %d not valid (%d sectors total)", first, last,
LOG_ERROR("Protect range %u - %u not valid (%u sectors total)", first, last,
bank->num_sectors);
return ERROR_FAIL;
}
@@ -406,7 +407,7 @@ static int sam4l_protect(struct flash_bank *bank, int set, int first, int last)
/* Try to lock or unlock each sector in the range. This is done by locking
* a region containing one page in that sector, we arbitrarily choose the 0th
* page in the sector. */
for (int i = first; i <= last; i++) {
for (unsigned int i = first; i <= last; i++) {
int res;
res = sam4l_flash_command(bank->target,
@@ -420,7 +421,8 @@ static int sam4l_protect(struct flash_bank *bank, int set, int first, int last)
return ERROR_OK;
}
static int sam4l_erase(struct flash_bank *bank, int first, int last)
static int sam4l_erase(struct flash_bank *bank, unsigned int first,
unsigned int last)
{
int ret;
struct sam4l_info *chip = (struct sam4l_info *)bank->driver_priv;
@@ -438,7 +440,7 @@ static int sam4l_erase(struct flash_bank *bank, int first, int last)
/* Make sure the pages make sense. */
if (first >= bank->num_sectors || last >= bank->num_sectors) {
LOG_ERROR("Erase range %d - %d not valid (%d sectors total)", first, last,
LOG_ERROR("Erase range %u - %u not valid (%u sectors total)", first, last,
bank->num_sectors);
return ERROR_FAIL;
}
@@ -453,19 +455,19 @@ static int sam4l_erase(struct flash_bank *bank, int first, int last)
return ret;
}
} else {
LOG_DEBUG("Erasing sectors %d through %d...\n", first, last);
LOG_DEBUG("Erasing sectors %u through %u...\n", first, last);
/* For each sector... */
for (int i = first; i <= last; i++) {
for (unsigned int i = first; i <= last; i++) {
/* For each page in that sector... */
for (int j = 0; j < chip->pages_per_sector; j++) {
int pn = i * chip->pages_per_sector + j;
for (unsigned int j = 0; j < chip->pages_per_sector; j++) {
unsigned int pn = i * chip->pages_per_sector + j;
bool is_erased = false;
/* Issue the page erase */
ret = sam4l_flash_command(bank->target, SAM4L_FCMD_EP, pn);
if (ret != ERROR_OK) {
LOG_ERROR("Erasing page %d failed", pn);
LOG_ERROR("Erasing page %u failed", pn);
return ret;
}
@@ -474,7 +476,7 @@ static int sam4l_erase(struct flash_bank *bank, int first, int last)
return ret;
if (!is_erased) {
LOG_DEBUG("Page %d was not erased.", pn);
LOG_DEBUG("Page %u was not erased.", pn);
return ERROR_FAIL;
}
}