]> git.sur5r.net Git - openocd/blobdiff - src/flash/cfi.c
projects / openocd / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
cfi_unlock_addresses_t -> struct cfi_unlock_addresses
[openocd] / src / flash / cfi.c
diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index 93e661c2f2eb5edc6286043c698f87672b7cbf3f..5cfac15f3712f91c2d93cbeacf5c6bdad84eea2d 100644 (file)
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -29,40 +29,13 @@
 #include "binarybuffer.h"
 
 
-static int cfi_register_commands(struct command_context_s *cmd_ctx);
-static int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-static int cfi_erase(struct flash_bank_s *bank, int first, int last);
-static int cfi_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int cfi_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
-static int cfi_probe(struct flash_bank_s *bank);
-static int cfi_auto_probe(struct flash_bank_s *bank);
-static int cfi_protect_check(struct flash_bank_s *bank);
-static int cfi_info(struct flash_bank_s *bank, char *buf, int buf_size);
-
-//static int cfi_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
 #define CFI_MAX_BUS_WIDTH      4
 #define CFI_MAX_CHIP_WIDTH     4
 
 /* defines internal maximum size for code fragment in cfi_intel_write_block() */
 #define CFI_MAX_INTEL_CODESIZE 256
 
-flash_driver_t cfi_flash =
-{
-       .name = "cfi",
-       .register_commands = cfi_register_commands,
-       .flash_bank_command = cfi_flash_bank_command,
-       .erase = cfi_erase,
-       .protect = cfi_protect,
-       .write = cfi_write,
-       .probe = cfi_probe,
-       .auto_probe = cfi_auto_probe,
-       .erase_check = default_flash_blank_check,
-       .protect_check = cfi_protect_check,
-       .info = cfi_info
-};
-
-static cfi_unlock_addresses_t cfi_unlock_addresses[] =
+static struct cfi_unlock_addresses cfi_unlock_addresses[] =
 {
        [CFI_UNLOCK_555_2AA] = { .unlock1 = 0x555, .unlock2 = 0x2aa },
        [CFI_UNLOCK_5555_2AAA] = { .unlock1 = 0x5555, .unlock2 = 0x2aaa },
@@ -96,7 +69,7 @@ static const cfi_fixup_t cfi_0001_fixups[] = {
 
 static void cfi_fixup(flash_bank_t *bank, const cfi_fixup_t *fixups)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        const cfi_fixup_t *f;
 
        for (f = fixups; f->fixup; f++)
@@ -112,7 +85,7 @@ static void cfi_fixup(flash_bank_t *bank, const cfi_fixup_t *fixups)
 /* inline uint32_t flash_address(flash_bank_t *bank, int sector, uint32_t offset) */
 static __inline__ uint32_t flash_address(flash_bank_t *bank, int sector, uint32_t offset)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
        if (cfi_info->x16_as_x8) offset *= 2;
 
@@ -206,7 +179,7 @@ static uint8_t cfi_get_u8(flash_bank_t *bank, int sector, uint32_t offset)
 static uint16_t cfi_query_u16(flash_bank_t *bank, int sector, uint32_t offset)
 {
        target_t *target = bank->target;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        uint8_t data[CFI_MAX_BUS_WIDTH * 2];
 
        if (cfi_info->x16_as_x8)
@@ -228,7 +201,7 @@ static uint16_t cfi_query_u16(flash_bank_t *bank, int sector, uint32_t offset)
 static uint32_t cfi_query_u32(flash_bank_t *bank, int sector, uint32_t offset)
 {
        target_t *target = bank->target;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        uint8_t data[CFI_MAX_BUS_WIDTH * 4];
 
        if (cfi_info->x16_as_x8)
@@ -307,7 +280,7 @@ uint8_t cfi_intel_wait_status_busy(flash_bank_t *bank, int timeout)
 int cfi_spansion_wait_status_busy(flash_bank_t *bank, int timeout)
 {
        uint8_t status, oldstatus;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
        oldstatus = cfi_get_u8(bank, 0, 0x0);
 
@@ -342,8 +315,8 @@ int cfi_spansion_wait_status_busy(flash_bank_t *bank, int timeout)
 static int cfi_read_intel_pri_ext(flash_bank_t *bank)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_intel_pri_ext_t *pri_ext = malloc(sizeof(cfi_intel_pri_ext_t));
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_intel_pri_ext *pri_ext = malloc(sizeof(struct cfi_intel_pri_ext));
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -408,8 +381,8 @@ static int cfi_read_intel_pri_ext(flash_bank_t *bank)
 static int cfi_read_spansion_pri_ext(flash_bank_t *bank)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_spansion_pri_ext *pri_ext = malloc(sizeof(struct cfi_spansion_pri_ext));
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -473,9 +446,9 @@ static int cfi_read_spansion_pri_ext(flash_bank_t *bank)
 static int cfi_read_atmel_pri_ext(flash_bank_t *bank)
 {
        int retval;
-       cfi_atmel_pri_ext_t atmel_pri_ext;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
+       struct cfi_atmel_pri_ext atmel_pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_spansion_pri_ext *pri_ext = malloc(sizeof(struct cfi_spansion_pri_ext));
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -484,7 +457,7 @@ static int cfi_read_atmel_pri_ext(flash_bank_t *bank)
         * We read the atmel table, and prepare a valid AMD/Spansion query table.
         */
 
-       memset(pri_ext, 0, sizeof(cfi_spansion_pri_ext_t));
+       memset(pri_ext, 0, sizeof(struct cfi_spansion_pri_ext));
 
        cfi_info->pri_ext = pri_ext;
 
@@ -539,7 +512,7 @@ static int cfi_read_atmel_pri_ext(flash_bank_t *bank)
 
 static int cfi_read_0002_pri_ext(flash_bank_t *bank)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
        if (cfi_info->manufacturer == CFI_MFR_ATMEL)
        {
@@ -554,8 +527,8 @@ static int cfi_read_0002_pri_ext(flash_bank_t *bank)
 static int cfi_spansion_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
        int printed;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 
        printed = snprintf(buf, buf_size, "\nSpansion primary algorithm extend information:\n");
        buf += printed;
@@ -589,8 +562,8 @@ static int cfi_spansion_info(struct flash_bank_s *bank, char *buf, int buf_size)
 static int cfi_intel_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
        int printed;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_intel_pri_ext *pri_ext = cfi_info->pri_ext;
 
        printed = snprintf(buf, buf_size, "\nintel primary algorithm extend information:\n");
        buf += printed;
@@ -628,12 +601,9 @@ static int cfi_register_commands(struct command_context_s *cmd_ctx)
 
 /* flash_bank cfi <base> <size> <chip_width> <bus_width> <target#> [options]
  */
-static int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
 {
-       cfi_flash_bank_t *cfi_info;
-       int i;
-       (void) cmd_ctx;
-       (void) cmd;
+       struct cfi_flash_bank *cfi_info;
 
        if (argc < 6)
        {
@@ -652,7 +622,7 @@ static int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd,
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       cfi_info = malloc(sizeof(cfi_flash_bank_t));
+       cfi_info = malloc(sizeof(struct cfi_flash_bank));
        cfi_info->probed = 0;
        bank->driver_priv = cfi_info;
 
@@ -662,7 +632,7 @@ static int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd,
        cfi_info->jedec_probe = 0;
        cfi_info->not_cfi = 0;
 
-       for (i = 6; i < argc; i++)
+       for (unsigned i = 6; i < argc; i++)
        {
                if (strcmp(args[i], "x16_as_x8") == 0)
                {
@@ -685,7 +655,7 @@ static int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd,
 static int cfi_intel_erase(struct flash_bank_s *bank, int first, int last)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        target_t *target = bank->target;
        uint8_t command[8];
        int i;
@@ -729,8 +699,8 @@ static int cfi_intel_erase(struct flash_bank_s *bank, int first, int last)
 static int cfi_spansion_erase(struct flash_bank_s *bank, int first, int last)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
        int i;
@@ -794,7 +764,7 @@ static int cfi_spansion_erase(struct flash_bank_s *bank, int first, int last)
 
 static int cfi_erase(struct flash_bank_s *bank, int first, int last)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -830,8 +800,8 @@ static int cfi_erase(struct flash_bank_s *bank, int first, int last)
 static int cfi_intel_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_intel_pri_ext *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
        int retry = 0;
@@ -946,7 +916,7 @@ static int cfi_intel_protect(struct flash_bank_s *bank, int set, int first, int
 
 static int cfi_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -1048,7 +1018,7 @@ static uint32_t cfi_command_val(flash_bank_t *bank, uint8_t cmd)
 
 static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t address, uint32_t count)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        target_t *target = bank->target;
        reg_param_t reg_params[7];
        armv4_5_algorithm_t armv4_5_info;
@@ -1292,8 +1262,8 @@ cleanup:
 
 static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t address, uint32_t count)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        reg_param_t reg_params[10];
        armv4_5_algorithm_t armv4_5_info;
@@ -1592,7 +1562,7 @@ static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer,
 static int cfi_intel_write_word(struct flash_bank_s *bank, uint8_t *word, uint32_t address)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -1626,7 +1596,7 @@ static int cfi_intel_write_word(struct flash_bank_s *bank, uint8_t *word, uint32
 static int cfi_intel_write_words(struct flash_bank_s *bank, uint8_t *word, uint32_t wordcount, uint32_t address)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -1719,8 +1689,8 @@ static int cfi_intel_write_words(struct flash_bank_s *bank, uint8_t *word, uint3
 static int cfi_spansion_write_word(struct flash_bank_s *bank, uint8_t *word, uint32_t address)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -1765,10 +1735,10 @@ static int cfi_spansion_write_word(struct flash_bank_s *bank, uint8_t *word, uin
 static int cfi_spansion_write_words(struct flash_bank_s *bank, uint8_t *word, uint32_t wordcount, uint32_t address)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        target_t *target = bank->target;
        uint8_t command[8];
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 
        /* Calculate buffer size and boundary mask */
        uint32_t buffersize = (1UL << cfi_info->max_buf_write_size) * (bank->bus_width / bank->chip_width);
@@ -1856,7 +1826,7 @@ static int cfi_spansion_write_words(struct flash_bank_s *bank, uint8_t *word, ui
 
 static int cfi_write_word(struct flash_bank_s *bank, uint8_t *word, uint32_t address)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
        switch (cfi_info->pri_id)
        {
@@ -1877,7 +1847,7 @@ static int cfi_write_word(struct flash_bank_s *bank, uint8_t *word, uint32_t add
 
 static int cfi_write_words(struct flash_bank_s *bank, uint8_t *word, uint32_t wordcount, uint32_t address)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
        switch (cfi_info->pri_id)
        {
@@ -1898,7 +1868,7 @@ static int cfi_write_words(struct flash_bank_s *bank, uint8_t *word, uint32_t wo
 
 int cfi_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        target_t *target = bank->target;
        uint32_t address = bank->base + offset; /* address of first byte to be programmed */
        uint32_t write_p, copy_p;
@@ -2108,8 +2078,8 @@ int cfi_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint3
 static void cfi_fixup_atmel_reversed_erase_regions(flash_bank_t *bank, void *param)
 {
        (void) param;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 
        pri_ext->_reversed_geometry = 1;
 }
@@ -2117,8 +2087,8 @@ static void cfi_fixup_atmel_reversed_erase_regions(flash_bank_t *bank, void *par
 static void cfi_fixup_0002_erase_regions(flash_bank_t *bank, void *param)
 {
        int i;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        (void) param;
 
        if ((pri_ext->_reversed_geometry) || (pri_ext->TopBottom == 3))
@@ -2139,9 +2109,9 @@ static void cfi_fixup_0002_erase_regions(flash_bank_t *bank, void *param)
 
 static void cfi_fixup_0002_unlock_addresses(flash_bank_t *bank, void *param)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
-       cfi_unlock_addresses_t *unlock_addresses = param;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
+       struct cfi_unlock_addresses *unlock_addresses = param;
 
        pri_ext->_unlock1 = unlock_addresses->unlock1;
        pri_ext->_unlock2 = unlock_addresses->unlock2;
@@ -2150,7 +2120,7 @@ static void cfi_fixup_0002_unlock_addresses(flash_bank_t *bank, void *param)
 
 static int cfi_query_string(struct flash_bank_s *bank, int address)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        target_t *target = bank->target;
        int retval;
        uint8_t command[8];
@@ -2188,7 +2158,7 @@ static int cfi_query_string(struct flash_bank_s *bank, int address)
 
 static int cfi_probe(struct flash_bank_s *bank)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        target_t *target = bank->target;
        uint8_t command[8];
        int num_sectors = 0;
@@ -2467,7 +2437,7 @@ static int cfi_probe(struct flash_bank_s *bank)
 
 static int cfi_auto_probe(struct flash_bank_s *bank)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        if (cfi_info->probed)
                return ERROR_OK;
        return cfi_probe(bank);
@@ -2477,8 +2447,8 @@ static int cfi_auto_probe(struct flash_bank_s *bank)
 static int cfi_intel_protect_check(struct flash_bank_s *bank)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_intel_pri_ext *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[CFI_MAX_BUS_WIDTH];
        int i;
@@ -2510,8 +2480,8 @@ static int cfi_intel_protect_check(struct flash_bank_s *bank)
 static int cfi_spansion_protect_check(struct flash_bank_s *bank)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
        int i;
@@ -2550,7 +2520,7 @@ static int cfi_spansion_protect_check(struct flash_bank_s *bank)
 
 static int cfi_protect_check(struct flash_bank_s *bank)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -2581,7 +2551,7 @@ static int cfi_protect_check(struct flash_bank_s *bank)
 static int cfi_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
        int printed;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
        if (cfi_info->qry[0] == (char)-1)
        {
@@ -2655,3 +2625,17 @@ static int cfi_info(struct flash_bank_s *bank, char *buf, int buf_size)
 
        return ERROR_OK;
 }
+
+flash_driver_t cfi_flash = {
+               .name = "cfi",
+               .register_commands = &cfi_register_commands,
+               .flash_bank_command = &cfi_flash_bank_command,
+               .erase = &cfi_erase,
+               .protect = &cfi_protect,
+               .write = &cfi_write,
+               .probe = &cfi_probe,
+               .auto_probe = &cfi_auto_probe,
+               .erase_check = &default_flash_blank_check,
+               .protect_check = &cfi_protect_check,
+               .info = &cfi_info,
+       };
Cloned from https://git.code.sf.net/p/openocd/code