Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
- Replace 'while(' with 'while ('.
[openocd.git] / src / flash / str7x.c
diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 09d3b81770af90c87b22c5c2ab40a55aec39ca13..13b22be54f1f222861bc70ec6086fc3f487bfe7e 100644 (file)
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -24,19 +24,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "str7x.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv4_5.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 str7x_mem_layout_t mem_layout_str7bank0[] = {
        {0x00000000, 0x02000, 0x01},
@@ -54,17 +45,17 @@ str7x_mem_layout_t mem_layout_str7bank1[] = {
        {0x00002000, 0x02000, 0x20000}
 };
 
-int str7x_register_commands(struct command_context_s *cmd_ctx);
-int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-int str7x_erase(struct flash_bank_s *bank, int first, int last);
-int str7x_protect(struct flash_bank_s *bank, int set, int first, int last);
-int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
-int str7x_probe(struct flash_bank_s *bank);
-int str7x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int str7x_protect_check(struct flash_bank_s *bank);
-int str7x_info(struct flash_bank_s *bank, char *buf, int buf_size);
+static int str7x_register_commands(struct command_context_s *cmd_ctx);
+static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
+static int str7x_erase(struct flash_bank_s *bank, int first, int last);
+static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last);
+static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
+static int str7x_probe(struct flash_bank_s *bank);
+//static int str7x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str7x_protect_check(struct flash_bank_s *bank);
+static int str7x_info(struct flash_bank_s *bank, char *buf, int buf_size);
 
-int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 flash_driver_t str7x_flash =
 {
@@ -81,7 +72,7 @@ flash_driver_t str7x_flash =
        .info = str7x_info
 };
 
-int str7x_register_commands(struct command_context_s *cmd_ctx)
+static int str7x_register_commands(struct command_context_s *cmd_ctx)
 {
        command_t *str7x_cmd = register_command(cmd_ctx, NULL, "str7x", NULL, COMMAND_ANY, NULL);
        
@@ -91,13 +82,13 @@ int str7x_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-int str7x_get_flash_adr(struct flash_bank_s *bank, u32 reg)
+static int str7x_get_flash_adr(struct flash_bank_s *bank, uint32_t reg)
 {
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
        return (str7x_info->register_base | reg);
 }
 
-int str7x_build_block_list(struct flash_bank_s *bank)
+static int str7x_build_block_list(struct flash_bank_s *bank)
 {
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
 
@@ -128,7 +119,7 @@ int str7x_build_block_list(struct flash_bank_s *bank)
        
        bank->num_sectors = num_sectors;
        bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
-       str7x_info->sector_bits = malloc(sizeof(u32) * num_sectors);
+       str7x_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors);
        
        num_sectors = 0;
        
@@ -155,7 +146,7 @@ int str7x_build_block_list(struct flash_bank_s *bank)
 
 /* flash bank str7x <base> <size> 0 0 <target#> <str71_variant>
  */
-int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
 {
        str7x_flash_bank_t *str7x_info;
        
@@ -200,33 +191,33 @@ int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char
        return ERROR_OK;
 }
 
-u32 str7x_status(struct flash_bank_s *bank)
+static uint32_t str7x_status(struct flash_bank_s *bank)
 {
        target_t *target = bank->target;
-       u32 retval;
+       uint32_t retval;
 
        target_read_u32(target, str7x_get_flash_adr(bank, FLASH_CR0), &retval);
 
        return retval;
 }
 
-u32 str7x_result(struct flash_bank_s *bank)
+static uint32_t str7x_result(struct flash_bank_s *bank)
 {
        target_t *target = bank->target;
-       u32 retval;
+       uint32_t retval;
 
        target_read_u32(target, str7x_get_flash_adr(bank, FLASH_ER), &retval);
        
        return retval;
 }
 
-int str7x_protect_check(struct flash_bank_s *bank)
+static int str7x_protect_check(struct flash_bank_s *bank)
 {
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
        target_t *target = bank->target;
        
        int i;
-       u32 retval;
+       uint32_t retval;
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -247,15 +238,15 @@ int str7x_protect_check(struct flash_bank_s *bank)
        return ERROR_OK;
 }
 
-int str7x_erase(struct flash_bank_s *bank, int first, int last)
+static int str7x_erase(struct flash_bank_s *bank, int first, int last)
 {
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
        target_t *target = bank->target;
        
        int i;
-       u32 cmd;
-       u32 retval;
-       u32 sectors = 0;
+       uint32_t cmd;
+       uint32_t retval;
+       uint32_t sectors = 0;
        
        if (bank->target->state != TARGET_HALTED)
        {
@@ -268,7 +259,7 @@ int str7x_erase(struct flash_bank_s *bank, int first, int last)
                sectors |= str7x_info->sector_bits[i];
        }
        
-       LOG_DEBUG("sectors: 0x%x", sectors);
+       LOG_DEBUG("sectors: 0x%" PRIx32 "", sectors);
        
        /* clear FLASH_ER register */   
        target_write_u32(target, str7x_get_flash_adr(bank, FLASH_ER), 0x0);
@@ -290,7 +281,7 @@ int str7x_erase(struct flash_bank_s *bank, int first, int last)
        
        if (retval)
        {
-               LOG_ERROR("error erasing flash bank, FLASH_ER: 0x%x", retval);
+               LOG_ERROR("error erasing flash bank, FLASH_ER: 0x%" PRIx32 "", retval);
                return ERROR_FLASH_OPERATION_FAILED;
        }
        
@@ -300,14 +291,14 @@ int str7x_erase(struct flash_bank_s *bank, int first, int last)
        return ERROR_OK;
 }
 
-int str7x_protect(struct flash_bank_s *bank, int set, int first, int last)
+static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
        target_t *target = bank->target;
        int i;
-       u32 cmd;
-       u32 retval;
-       u32 protect_blocks;
+       uint32_t cmd;
+       uint32_t retval;
+       uint32_t protect_blocks;
        
        if (bank->target->state != TARGET_HALTED)
        {
@@ -344,7 +335,7 @@ int str7x_protect(struct flash_bank_s *bank, int set, int first, int last)
        
        retval = str7x_result(bank);
        
-       LOG_DEBUG("retval: 0x%8.8x", retval);
+       LOG_DEBUG("retval: 0x%8.8" PRIx32 "", retval);
        
        if (retval & FLASH_ERER)
                return ERROR_FLASH_SECTOR_NOT_ERASED;
@@ -354,18 +345,18 @@ int str7x_protect(struct flash_bank_s *bank, int set, int first, int last)
        return ERROR_OK;
 }
 
-int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
+static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
        target_t *target = bank->target;
-       u32 buffer_size = 8192;
+       uint32_t buffer_size = 8192;
        working_area_t *source;
-       u32 address = bank->base + offset;
+       uint32_t address = bank->base + offset;
        reg_param_t reg_params[6];
        armv4_5_algorithm_t armv4_5_info;
        int retval = ERROR_OK;
        
-       u32 str7x_flash_write_code[] = {
+       uint32_t str7x_flash_write_code[] = {
                                        /* write:                               */
                0xe3a04201, /*  mov r4, #0x10000000     */
                0xe5824000, /*  str r4, [r2, #0x0]      */
@@ -398,7 +389,7 @@ int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        };
        
-       target_write_buffer(target, str7x_info->write_algorithm->address, 20 * 4, (u8*)str7x_flash_write_code);
+       target_write_buffer(target, str7x_info->write_algorithm->address, 20 * 4, (uint8_t*)str7x_flash_write_code);
 
        /* memory buffer */
        while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK)
@@ -428,7 +419,7 @@ int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou
        
        while (count > 0)
        {
-               u32 thisrun_count = (count > (buffer_size / 8)) ? (buffer_size / 8) : count;
+               uint32_t thisrun_count = (count > (buffer_size / 8)) ? (buffer_size / 8) : count;
                
                target_write_buffer(target, source->address, thisrun_count * 8, buffer);
                
@@ -438,7 +429,7 @@ int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou
                buf_set_u32(reg_params[3].value, 0, 32, thisrun_count);
                buf_set_u32(reg_params[5].value, 0, 32, str7x_info->busy_bits);
        
-               if ((retval = target->type->run_algorithm(target, 0, NULL, 6, reg_params, str7x_info->write_algorithm->address, str7x_info->write_algorithm->address + (19 * 4), 10000, &armv4_5_info)) != ERROR_OK)
+               if ((retval = target_run_algorithm(target, 0, NULL, 6, reg_params, str7x_info->write_algorithm->address, str7x_info->write_algorithm->address + (19 * 4), 10000, &armv4_5_info)) != ERROR_OK)
                {
                        LOG_ERROR("error executing str7x flash write algorithm");
                        retval = ERROR_FLASH_OPERATION_FAILED;
@@ -469,17 +460,17 @@ int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou
        return retval;
 }
 
-int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
+static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        target_t *target = bank->target;
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
-       u32 dwords_remaining = (count / 8);
-       u32 bytes_remaining = (count & 0x00000007);
-       u32 address = bank->base + offset;
-       u32 bytes_written = 0;
-       u32 cmd;
-       u32 retval;
-       u32 check_address = offset;
+       uint32_t dwords_remaining = (count / 8);
+       uint32_t bytes_remaining = (count & 0x00000007);
+       uint32_t address = bank->base + offset;
+       uint32_t bytes_written = 0;
+       uint32_t cmd;
+       int retval;
+       uint32_t check_address = offset;
        int i;
        
        if (bank->target->state != TARGET_HALTED)
@@ -490,14 +481,14 @@ int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 
        if (offset & 0x7)
        {
-               LOG_WARNING("offset 0x%x breaks required 8-byte alignment", offset);
+               LOG_WARNING("offset 0x%" PRIx32 " breaks required 8-byte alignment", offset);
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
        
        for (i = 0; i < bank->num_sectors; i++)
        {
-               u32 sec_start = bank->sectors[i].offset;
-               u32 sec_end = sec_start + bank->sectors[i].size;
+               uint32_t sec_start = bank->sectors[i].offset;
+               uint32_t sec_end = sec_start + bank->sectors[i].size;
                
                /* check if destination falls within the current sector */
                if ((check_address >= sec_start) && (check_address < sec_end))
@@ -555,11 +546,11 @@ int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                target_write_u32(target, str7x_get_flash_adr(bank, FLASH_AR), address);
                
                /* data word 1 */
-               target->type->write_memory(target, str7x_get_flash_adr(bank, FLASH_DR0), 4, 1, buffer + bytes_written);
+               target_write_memory(target, str7x_get_flash_adr(bank, FLASH_DR0), 4, 1, buffer + bytes_written);
                bytes_written += 4;
                
                /* data word 2 */
-               target->type->write_memory(target, str7x_get_flash_adr(bank, FLASH_DR1), 4, 1, buffer + bytes_written);
+               target_write_memory(target, str7x_get_flash_adr(bank, FLASH_DR1), 4, 1, buffer + bytes_written);
                bytes_written += 4;
                
                /* start programming cycle */
@@ -584,10 +575,10 @@ int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        
        if (bytes_remaining)
        {
-               u8 last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+               uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
                int i = 0;
                                
-               while(bytes_remaining > 0)
+               while (bytes_remaining > 0)
                {
                        last_dword[i++] = *(buffer + bytes_written); 
                        bytes_remaining--;
@@ -602,11 +593,11 @@ int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                target_write_u32(target, str7x_get_flash_adr(bank, FLASH_AR), address);
                
                /* data word 1 */
-               target->type->write_memory(target, str7x_get_flash_adr(bank, FLASH_DR0), 4, 1, last_dword);
+               target_write_memory(target, str7x_get_flash_adr(bank, FLASH_DR0), 4, 1, last_dword);
                bytes_written += 4;
                
                /* data word 2 */
-               target->type->write_memory(target, str7x_get_flash_adr(bank, FLASH_DR1), 4, 1, last_dword + 4);
+               target_write_memory(target, str7x_get_flash_adr(bank, FLASH_DR1), 4, 1, last_dword + 4);
                bytes_written += 4;
                
                /* start programming cycle */
@@ -629,32 +620,34 @@ int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        return ERROR_OK;
 }
 
-int str7x_probe(struct flash_bank_s *bank)
+static int str7x_probe(struct flash_bank_s *bank)
 {
        return ERROR_OK;
 }
 
-int str7x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+#if 0
+static int str7x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        return ERROR_OK;
 }
+#endif
 
-int str7x_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int str7x_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
        snprintf(buf, buf_size, "str7x flash driver info" );
        return ERROR_OK;
 }
 
-int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        flash_bank_t *bank;
        target_t *target = NULL;
        str7x_flash_bank_t *str7x_info = NULL;
        
-       u32 flash_cmd;
-       u32 retval;
-       u16 ProtectionLevel = 0;
-       u16 ProtectionRegs;
+       uint32_t flash_cmd;
+       uint32_t retval;
+       uint16_t ProtectionLevel = 0;
+       uint16_t ProtectionRegs;
        
        if (argc < 1)
        {
@@ -717,4 +710,3 @@ int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx, char *c
        
        return ERROR_OK;
 }
-
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)