Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
flash/nor: Factor out CFI memory read/write functions
[openocd.git] / src / flash / nor / cfi.c
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 34f200b4a5993d437459856acdcb94123aeae185..c22bcdecb3c844f731ad4832c7b3bc9453619d61 100644 (file)
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -131,6 +131,20 @@ static inline uint32_t flash_address(struct flash_bank *bank, int sector, uint32
        }
 }
 
+static int cfi_target_write_memory(struct target *target, target_addr_t addr,
+                                  uint32_t size, uint32_t count,
+                                  const uint8_t *buffer)
+{
+       return target_write_memory(target, addr, size, count, buffer);
+}
+
+static int cfi_target_read_memory(struct target *target, target_addr_t addr,
+                                 uint32_t size, uint32_t count,
+                                 uint8_t *buffer)
+{
+       return target_read_memory(target, addr, size, count, buffer);
+}
+
 static void cfi_command(struct flash_bank *bank, uint8_t cmd, uint8_t *cmd_buf)
 {
        int i;
@@ -156,7 +170,7 @@ static int cfi_send_command(struct flash_bank *bank, uint8_t cmd, uint32_t addre
        uint8_t command[CFI_MAX_BUS_WIDTH];
 
        cfi_command(bank, cmd, command);
-       return target_write_memory(bank->target, address, bank->bus_width, 1, command);
+       return cfi_target_write_memory(bank->target, address, bank->bus_width, 1, command);
 }
 
 /* read unsigned 8-bit value from the bank
@@ -170,7 +184,7 @@ static int cfi_query_u8(struct flash_bank *bank, int sector, uint32_t offset, ui
        uint8_t data[CFI_MAX_BUS_WIDTH];
 
        int retval;
-       retval = target_read_memory(target, flash_address(bank, sector, offset),
+       retval = cfi_target_read_memory(target, flash_address(bank, sector, offset),
                        bank->bus_width, 1, data);
        if (retval != ERROR_OK)
                return retval;
@@ -195,7 +209,7 @@ static int cfi_get_u8(struct flash_bank *bank, int sector, uint32_t offset, uint
        int i;
 
        int retval;
-       retval = target_read_memory(target, flash_address(bank, sector, offset),
+       retval = cfi_target_read_memory(target, flash_address(bank, sector, offset),
                        bank->bus_width, 1, data);
        if (retval != ERROR_OK)
                return retval;
@@ -225,13 +239,13 @@ static int cfi_query_u16(struct flash_bank *bank, int sector, uint32_t offset, u
        if (cfi_info->x16_as_x8) {
                uint8_t i;
                for (i = 0; i < 2; i++) {
-                       retval = target_read_memory(target, flash_address(bank, sector, offset + i),
+                       retval = cfi_target_read_memory(target, flash_address(bank, sector, offset + i),
                                        bank->bus_width, 1, &data[i * bank->bus_width]);
                        if (retval != ERROR_OK)
                                return retval;
                }
        } else {
-               retval = target_read_memory(target, flash_address(bank, sector, offset),
+               retval = cfi_target_read_memory(target, flash_address(bank, sector, offset),
                                bank->bus_width, 2, data);
                if (retval != ERROR_OK)
                        return retval;
@@ -255,13 +269,13 @@ static int cfi_query_u32(struct flash_bank *bank, int sector, uint32_t offset, u
        if (cfi_info->x16_as_x8) {
                uint8_t i;
                for (i = 0; i < 4; i++) {
-                       retval = target_read_memory(target, flash_address(bank, sector, offset + i),
+                       retval = cfi_target_read_memory(target, flash_address(bank, sector, offset + i),
                                        bank->bus_width, 1, &data[i * bank->bus_width]);
                        if (retval != ERROR_OK)
                                return retval;
                }
        } else {
-               retval = target_read_memory(target, flash_address(bank, sector, offset),
+               retval = cfi_target_read_memory(target, flash_address(bank, sector, offset),
                                bank->bus_width, 4, data);
                if (retval != ERROR_OK)
                        return retval;
@@ -1997,7 +2011,7 @@ static int cfi_intel_write_word(struct flash_bank *bank, uint8_t *word, uint32_t
        if (retval != ERROR_OK)
                return retval;
 
-       retval = target_write_memory(target, address, bank->bus_width, 1, word);
+       retval = cfi_target_write_memory(target, address, bank->bus_width, 1, word);
        if (retval != ERROR_OK)
                return retval;
 
@@ -2078,7 +2092,7 @@ static int cfi_intel_write_words(struct flash_bank *bank, const uint8_t *word,
        if (retval != ERROR_OK)
                return retval;
 
-       retval = target_write_memory(target, address, bank->bus_width, bufferwsize, word);
+       retval = cfi_target_write_memory(target, address, bank->bus_width, bufferwsize, word);
        if (retval != ERROR_OK)
                return retval;
 
@@ -2119,7 +2133,7 @@ static int cfi_spansion_write_word(struct flash_bank *bank, uint8_t *word, uint3
        if (retval != ERROR_OK)
                return retval;
 
-       retval = target_write_memory(target, address, bank->bus_width, 1, word);
+       retval = cfi_target_write_memory(target, address, bank->bus_width, 1, word);
        if (retval != ERROR_OK)
                return retval;
 
@@ -2181,7 +2195,7 @@ static int cfi_spansion_write_words(struct flash_bank *bank, const uint8_t *word
        if (retval != ERROR_OK)
                return retval;
 
-       retval = target_write_memory(target, address, bank->bus_width, bufferwsize, word);
+       retval = cfi_target_write_memory(target, address, bank->bus_width, bufferwsize, word);
        if (retval != ERROR_OK)
                return retval;
 
@@ -2283,7 +2297,7 @@ static int cfi_read(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, u
                LOG_INFO("Fixup %d unaligned read head bytes", align);
 
                /* read a complete word from flash */
-               retval = target_read_memory(target, read_p, bank->bus_width, 1, current_word);
+               retval = cfi_target_read_memory(target, read_p, bank->bus_width, 1, current_word);
                if (retval != ERROR_OK)
                        return retval;
 
@@ -2296,7 +2310,7 @@ static int cfi_read(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, u
 
        align = count / bank->bus_width;
        if (align) {
-               retval = target_read_memory(target, read_p, bank->bus_width, align, buffer);
+               retval = cfi_target_read_memory(target, read_p, bank->bus_width, align, buffer);
                if (retval != ERROR_OK)
                        return retval;
 
@@ -2309,7 +2323,7 @@ static int cfi_read(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, u
                LOG_INFO("Fixup %" PRIu32 " unaligned read tail bytes", count);
 
                /* read a complete word from flash */
-               retval = target_read_memory(target, read_p, bank->bus_width, 1, current_word);
+               retval = cfi_target_read_memory(target, read_p, bank->bus_width, 1, current_word);
                if (retval != ERROR_OK)
                        return retval;
 
@@ -2354,7 +2368,7 @@ static int cfi_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t of
                LOG_INFO("Fixup %d unaligned head bytes", align);
 
                /* read a complete word from flash */
-               retval = target_read_memory(target, write_p, bank->bus_width, 1, current_word);
+               retval = cfi_target_read_memory(target, write_p, bank->bus_width, 1, current_word);
                if (retval != ERROR_OK)
                        return retval;
 
@@ -2474,7 +2488,7 @@ static int cfi_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t of
                LOG_INFO("Fixup %" PRId32 " unaligned tail bytes", count);
 
                /* read a complete word from flash */
-               retval = target_read_memory(target, write_p, bank->bus_width, 1, current_word);
+               retval = cfi_target_read_memory(target, write_p, bank->bus_width, 1, current_word);
                if (retval != ERROR_OK)
                        return retval;
 
@@ -2624,11 +2638,11 @@ static int cfi_probe(struct flash_bank *bank)
        if (retval != ERROR_OK)
                return retval;
 
-       retval = target_read_memory(target, flash_address(bank, 0, 0x00),
+       retval = cfi_target_read_memory(target, flash_address(bank, 0, 0x00),
                        bank->bus_width, 1, value_buf0);
        if (retval != ERROR_OK)
                return retval;
-       retval = target_read_memory(target, flash_address(bank, 0, 0x01),
+       retval = cfi_target_read_memory(target, flash_address(bank, 0, 0x01),
                        bank->bus_width, 1, value_buf1);
        if (retval != ERROR_OK)
                return retval;
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)