Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
flash/nor/efm32: fixed BG1x identification
[openocd.git] / src / flash / nor / at91sam7.c
diff --git a/src/flash/nor/at91sam7.c b/src/flash/nor/at91sam7.c
index 9de829327ac01cea07b4ae2f0016641d7b565079..f98d186fb4068b502994cb38d1da2dc87ec491b8 100644 (file)
--- a/src/flash/nor/at91sam7.c
+++ b/src/flash/nor/at91sam7.c
@@ -104,11 +104,11 @@ static void at91sam7_set_flash_mode(struct flash_bank *bank, int mode);
 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 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 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 const char *EPROC[8] = {
+static const char *eproc[8] = {
        "Unknown", "ARM946-E", "ARM7TDMI", "Unknown", "ARM920T", "ARM926EJ-S", "Unknown", "Unknown"
 };
 
@@ -179,7 +179,7 @@ static long SRAMSIZ[16] = {
 static uint32_t at91sam7_get_flash_status(struct target *target, int bank_number)
 {
        uint32_t fsr;
-       target_read_u32(target, MC_FSR[bank_number], &fsr);
+       target_read_u32(target, mc_fsr[bank_number], &fsr);
 
        return fsr;
 }
@@ -254,7 +254,7 @@ static void at91sam7_read_clock_info(struct flash_bank *bank)
                at91sam7_info->mck_freq = tmp;
 }
 
-/* Setup the timimg registers for nvbits or normal flash */
+/* Setup the timing registers for nvbits or normal flash */
 static void at91sam7_set_flash_mode(struct flash_bank *bank, int mode)
 {
        uint32_t fmr, fmcn = 0, fws = 0;
@@ -290,7 +290,7 @@ static void at91sam7_set_flash_mode(struct flash_bank *bank, int mode)
 
                LOG_DEBUG("fmcn[%i]: %i", bank->bank_number, (int)(fmcn));
                fmr = fmcn << 16 | fws << 8;
-               target_write_u32(target, MC_FMR[bank->bank_number], fmr);
+               target_write_u32(target, mc_fmr[bank->bank_number], fmr);
        }
 
        at91sam7_info->flashmode = mode;
@@ -329,7 +329,7 @@ static int at91sam7_flash_command(struct flash_bank *bank, uint8_t cmd, uint16_t
        struct target *target = bank->target;
 
        fcr = (0x5A << 24) | ((pagen&0x3FF) << 8) | cmd;
-       target_write_u32(target, MC_FCR[bank->bank_number], fcr);
+       target_write_u32(target, mc_fcr[bank->bank_number], fcr);
        LOG_DEBUG("Flash command: 0x%" PRIx32 ", flash bank: %i, page number: %u",
                fcr,
                bank->bank_number + 1,
@@ -377,7 +377,7 @@ static int at91sam7_read_part_info(struct flash_bank *bank)
                        /* re-calculate master clock frequency */
                        at91sam7_read_clock_info(t_bank);
 
-                       /* no timming */
+                       /* no timing */
                        at91sam7_set_flash_mode(t_bank, FMR_TIMING_NONE);
 
                        /* check protect state */
@@ -415,7 +415,7 @@ static int at91sam7_read_part_info(struct flash_bank *bank)
                        /* calculate master clock frequency */
                        at91sam7_read_clock_info(t_bank);
 
-                       /* no timming */
+                       /* no timing */
                        at91sam7_set_flash_mode(t_bank, FMR_TIMING_NONE);
 
                        /* check protect state */
@@ -623,7 +623,7 @@ static int at91sam7_read_part_info(struct flash_bank *bank)
                /* calculate master clock frequency */
                at91sam7_read_clock_info(t_bank);
 
-               /* no timming */
+               /* no timing */
                at91sam7_set_flash_mode(t_bank, FMR_TIMING_NONE);
 
                /* check protect state */
@@ -702,19 +702,15 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
        uint32_t bank_size;
        uint32_t ext_freq = 0;
 
-       int chip_width;
-       int bus_width;
-       int banks_num;
-       int num_sectors;
+       unsigned int chip_width;
+       unsigned int bus_width;
+       unsigned int banks_num;
+       unsigned int num_sectors;
 
        uint16_t pages_per_sector;
        uint16_t page_size;
        uint16_t num_nvmbits;
 
-       char *target_name_t;
-
-       int bnk, sec;
-
        at91sam7_info = malloc(sizeof(struct at91sam7_flash_bank));
        t_bank->driver_priv = at91sam7_info;
 
@@ -731,11 +727,11 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
 
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], base_address);
 
-       COMMAND_PARSE_NUMBER(int, CMD_ARGV[3], chip_width);
-       COMMAND_PARSE_NUMBER(int, CMD_ARGV[4], bus_width);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[3], chip_width);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[4], bus_width);
 
-       COMMAND_PARSE_NUMBER(int, CMD_ARGV[8], banks_num);
-       COMMAND_PARSE_NUMBER(int, CMD_ARGV[9], num_sectors);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[8], banks_num);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[9], num_sectors);
        COMMAND_PARSE_NUMBER(u16, CMD_ARGV[10], pages_per_sector);
        COMMAND_PARSE_NUMBER(u16, CMD_ARGV[11], page_size);
        COMMAND_PARSE_NUMBER(u16, CMD_ARGV[12], num_nvmbits);
@@ -753,13 +749,10 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
                return ERROR_OK;
        }
 
-       target_name_t = calloc(strlen(CMD_ARGV[7]) + 1, sizeof(char));
-       strcpy(target_name_t, CMD_ARGV[7]);
-
        /* calculate bank size  */
        bank_size = num_sectors * pages_per_sector * page_size;
 
-       for (bnk = 0; bnk < banks_num; bnk++) {
+       for (unsigned int bnk = 0; bnk < banks_num; bnk++) {
                if (bnk > 0) {
                        if (!t_bank->next) {
                                /* create a new bank element */
@@ -785,7 +778,7 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
 
                /* allocate sectors */
                t_bank->sectors = malloc(num_sectors * sizeof(struct flash_sector));
-               for (sec = 0; sec < num_sectors; sec++) {
+               for (unsigned int sec = 0; sec < num_sectors; sec++) {
                        t_bank->sectors[sec].offset = sec * pages_per_sector * page_size;
                        t_bank->sectors[sec].size = pages_per_sector * page_size;
                        t_bank->sectors[sec].is_erased = -1;
@@ -794,7 +787,7 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
 
                at91sam7_info = t_bank->driver_priv;
 
-               at91sam7_info->target_name  = target_name_t;
+               at91sam7_info->target_name = strdup(CMD_ARGV[7]);
                at91sam7_info->flashmode = 0;
                at91sam7_info->ext_freq  = ext_freq;
                at91sam7_info->num_nvmbits = num_nvmbits;
@@ -806,10 +799,10 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
        return ERROR_OK;
 }
 
-static int at91sam7_erase(struct flash_bank *bank, int first, int last)
+static int at91sam7_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
-       int sec;
        uint32_t nbytes, pos;
        uint8_t *buffer;
        uint8_t erase_all;
@@ -822,7 +815,7 @@ static int at91sam7_erase(struct flash_bank *bank, int first, int last)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if ((first < 0) || (last < first) || (last >= bank->num_sectors))
+       if ((last < first) || (last >= bank->num_sectors))
                return ERROR_FLASH_SECTOR_INVALID;
 
        erase_all = 0;
@@ -852,16 +845,16 @@ static int at91sam7_erase(struct flash_bank *bank, int first, int last)
        }
 
        /* mark erased sectors */
-       for (sec = first; sec <= last; sec++)
+       for (unsigned int sec = first; sec <= last; sec++)
                bank->sectors[sec].is_erased = 1;
 
        return ERROR_OK;
 }
 
-static int at91sam7_protect(struct flash_bank *bank, int set, int first, int last)
+static int at91sam7_protect(struct flash_bank *bank, int set,
+               unsigned int first, unsigned int last)
 {
        uint32_t cmd;
-       int sector;
        uint32_t pagen;
 
        struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
@@ -874,14 +867,14 @@ static int at91sam7_protect(struct flash_bank *bank, int set, int first, int las
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if ((first < 0) || (last < first) || (last >= bank->num_sectors))
+       if ((last < first) || (last >= bank->num_sectors))
                return ERROR_FLASH_SECTOR_INVALID;
 
        /* Configure the flash controller timing */
        at91sam7_read_clock_info(bank);
        at91sam7_set_flash_mode(bank, FMR_TIMING_NVBITS);
 
-       for (sector = first; sector <= last; sector++) {
+       for (unsigned int sector = first; sector <= last; sector++) {
                if (set)
                        cmd = SLB;
                else
@@ -961,7 +954,7 @@ static int at91sam7_write(struct flash_bank *bank, const uint8_t *buffer, uint32
                /* Send Write Page command to Flash Controller */
                if (at91sam7_flash_command(bank, WP, pagen) != ERROR_OK)
                        return ERROR_FLASH_OPERATION_FAILED;
-               LOG_DEBUG("Write flash bank:%i page number:%" PRIi32 "", bank->bank_number, pagen);
+               LOG_DEBUG("Write flash bank:%u page number:%" PRIu32, bank->bank_number, pagen);
        }
 
        return ERROR_OK;
@@ -985,56 +978,39 @@ static int at91sam7_probe(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static int get_at91sam7_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_at91sam7_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
-       int printed;
        struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
 
        if (at91sam7_info->cidr == 0)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
-       printed = snprintf(buf, buf_size,
-                       "\n at91sam7 driver information: Chip is %s\n",
+       command_print_sameline(cmd, "\n at91sam7 driver information: Chip is %s\n",
                        at91sam7_info->target_name);
 
-       buf += printed;
-       buf_size -= printed;
-
-       printed = snprintf(buf,
-                       buf_size,
+       command_print_sameline(cmd,
                        " Cidr: 0x%8.8" PRIx32 " | Arch: 0x%4.4x | Eproc: %s | Version: 0x%3.3x | "
                        "Flashsize: 0x%8.8" PRIx32 "\n",
                        at91sam7_info->cidr,
                        at91sam7_info->cidr_arch,
-                       EPROC[at91sam7_info->cidr_eproc],
+                       eproc[at91sam7_info->cidr_eproc],
                        at91sam7_info->cidr_version,
                        bank->size);
 
-       buf += printed;
-       buf_size -= printed;
-
-       printed = snprintf(buf, buf_size,
-                       " Master clock (estimated): %u KHz | External clock: %u KHz\n",
+       command_print_sameline(cmd,
+                       " Master clock (estimated): %u kHz | External clock: %u kHz\n",
                        (unsigned)(at91sam7_info->mck_freq / 1000),
                        (unsigned)(at91sam7_info->ext_freq / 1000));
 
-       buf += printed;
-       buf_size -= printed;
-
-       printed = snprintf(buf,
-                       buf_size,
-                       " Pagesize: %i bytes | Lockbits(%i): %i 0x%4.4x | Pages in lock region: %i\n",
+       command_print_sameline(cmd,
+                       " Pagesize: %i bytes | Lockbits(%u): %i 0x%4.4x | Pages in lock region: %i\n",
                        at91sam7_info->pagesize,
                        bank->num_sectors,
                        at91sam7_info->num_lockbits_on,
                        at91sam7_info->lockbits,
-                       at91sam7_info->pages_per_sector*at91sam7_info->num_lockbits_on);
-
-       buf += printed;
-       buf_size -= printed;
+                       at91sam7_info->pages_per_sector * at91sam7_info->num_lockbits_on);
 
-       snprintf(buf, buf_size,
-               " Securitybit: %i | Nvmbits(%i): %i 0x%1.1x\n",
+       command_print_sameline(cmd, " Securitybit: %i | Nvmbits(%i): %i 0x%1.1x\n",
                at91sam7_info->securitybit, at91sam7_info->num_nvmbits,
                at91sam7_info->num_nvmbits_on, at91sam7_info->nvmbits);
 
@@ -1064,10 +1040,10 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        bank = get_flash_bank_by_num_noprobe(0);
-       if (bank ==  NULL)
+       if (!bank)
                return ERROR_FLASH_BANK_INVALID;
        if (strcmp(bank->driver->name, "at91sam7")) {
-               command_print(CMD_CTX, "not an at91sam7 flash bank '%s'", CMD_ARGV[0]);
+               command_print(CMD, "not an at91sam7 flash bank '%s'", CMD_ARGV[0]);
                return ERROR_FLASH_BANK_INVALID;
        }
        if (bank->target->state != TARGET_HALTED) {
@@ -1091,7 +1067,7 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
 
        COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], bit);
        if ((bit < 0) || (bit >= at91sam7_info->num_nvmbits)) {
-               command_print(CMD_CTX,
+               command_print(CMD,
                        "gpnvm bit '#%s' is out of bounds for target %s",
                        CMD_ARGV[0],
                        at91sam7_info->target_name);
@@ -1140,7 +1116,7 @@ static const struct command_registration at91sam7_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-struct flash_driver at91sam7_flash = {
+const struct flash_driver at91sam7_flash = {
        .name = "at91sam7",
        .usage = "gpnvm <bit> <set | clear>",
        .commands = at91sam7_command_handlers,
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)