* Copyright (C) 2008 by Gheorghe Guran (atlas) *
* *
* This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General public License as published by *
+ * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS for A PARTICULAR PURPOSE. See the *
- * GNU General public License for more details. *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * 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. *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
****************************************************************************/
/***************************************************************************
#define FLASH_SIZE_2048KB 14
static int at91sam7_protect_check(struct flash_bank *bank);
-static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
+static int at91sam7_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset,
uint32_t count);
static uint32_t at91sam7_get_flash_status(struct target *target, int bank_number);
static uint32_t at91sam7_wait_status_busy(struct flash_bank *bank, uint32_t waitbits, int timeout);
static int at91sam7_flash_command(struct flash_bank *bank, uint8_t cmd, uint16_t pagen);
-static uint32_t MC_FMR[4] = { 0xFFFFFF60, 0xFFFFFF70, 0xFFFFFF80, 0xFFFFFF90 };
-static uint32_t MC_FCR[4] = { 0xFFFFFF64, 0xFFFFFF74, 0xFFFFFF84, 0xFFFFFF94 };
-static uint32_t MC_FSR[4] = { 0xFFFFFF68, 0xFFFFFF78, 0xFFFFFF88, 0xFFFFFF98 };
+static const uint32_t MC_FMR[4] = { 0xFFFFFF60, 0xFFFFFF70, 0xFFFFFF80, 0xFFFFFF90 };
+static const uint32_t MC_FCR[4] = { 0xFFFFFF64, 0xFFFFFF74, 0xFFFFFF84, 0xFFFFFF94 };
+static const uint32_t MC_FSR[4] = { 0xFFFFFF68, 0xFFFFFF78, 0xFFFFFF88, 0xFFFFFF98 };
-static char *EPROC[8] = {
+static const char *EPROC[8] = {
"Unknown", "ARM946-E", "ARM7TDMI", "Unknown", "ARM920T", "ARM926EJ-S", "Unknown", "Unknown"
};
/* Read device id register, main clock frequency register and fill in driver info structure */
static int at91sam7_read_part_info(struct flash_bank *bank)
{
- struct flash_bank *t_bank = bank;
struct at91sam7_flash_bank *at91sam7_info;
- struct target *target = t_bank->target;
+ struct target *target = bank->target;
uint16_t bnk, sec;
uint16_t arch;
uint32_t base_address = 0;
char *target_name_t = "Unknown";
- at91sam7_info = t_bank->driver_priv;
+ at91sam7_info = bank->driver_priv;
if (at91sam7_info->cidr != 0) {
/* flash already configured, update clock and check for protected sectors */
- struct flash_bank *fb = bank;
- t_bank = fb;
-
- while (t_bank) {
+ for (struct flash_bank *t_bank = bank; t_bank; t_bank = t_bank->next) {
+ if (t_bank->target != target)
+ continue;
/* re-calculate master clock frequency */
at91sam7_read_clock_info(t_bank);
/* check protect state */
at91sam7_protect_check(t_bank);
-
- t_bank = fb->next;
- fb = t_bank;
}
return ERROR_OK;
if (at91sam7_info->flash_autodetection == 0) {
/* banks and sectors are already created, based on data from input file */
- struct flash_bank *fb = bank;
- t_bank = fb;
- while (t_bank) {
+ for (struct flash_bank *t_bank = bank; t_bank; t_bank = t_bank->next) {
+ if (t_bank->target != target)
+ continue;
+
at91sam7_info = t_bank->driver_priv;
at91sam7_info->cidr = cidr;
/* check protect state */
at91sam7_protect_check(t_bank);
-
- t_bank = fb->next;
- fb = t_bank;
}
return ERROR_OK;
bank_size = sectors_num * pages_per_sector * page_size;
for (bnk = 0; bnk < banks_num; bnk++) {
+ struct flash_bank *t_bank = bank;
if (bnk > 0) {
if (!t_bank->next) {
/* create a new flash bank element */
retval = target_blank_check_memory(target,
bank->base + bank->sectors[nSector].offset,
bank->sectors[nSector].size,
- &blank);
+ &blank, bank->erased_value);
if (retval != ERROR_OK) {
fast_check = 0;
break;
for (pos = 0; pos < nbytes; pos++)
buffer[pos] = 0xFF;
- if (at91sam7_write(bank, buffer, bank->sectors[first].offset, nbytes) != ERROR_OK)
+ if (at91sam7_write(bank, buffer, bank->sectors[first].offset, nbytes) != ERROR_OK) {
+ free(buffer);
return ERROR_FLASH_OPERATION_FAILED;
+ }
free(buffer);
}
return ERROR_OK;
}
-static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int at91sam7_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count)
{
int retval;
struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;