Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
working_area_t -> struct working_area
[openocd.git] / src / flash / cfi.c
diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index fe80c74e6f6bdbdb64ff8a71aa1a469217beb3bf..6a193e2d808607b6adc5792f1edd493d8fc4a594 100644 (file)
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -35,7 +35,7 @@
 /* defines internal maximum size for code fragment in cfi_intel_write_block() */
 #define CFI_MAX_INTEL_CODESIZE 256
 
-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 },
@@ -47,7 +47,7 @@ static void cfi_fixup_0002_unlock_addresses(flash_bank_t *flash, void *param);
 static void cfi_fixup_atmel_reversed_erase_regions(flash_bank_t *flash, void *param);
 
 /* fixup after reading cmdset 0002 primary query table */
-static const cfi_fixup_t cfi_0002_fixups[] = {
+static const struct cfi_fixup cfi_0002_fixups[] = {
        {CFI_MFR_SST, 0x00D4, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
        {CFI_MFR_SST, 0x00D5, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
        {CFI_MFR_SST, 0x00D6, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
@@ -63,14 +63,14 @@ static const cfi_fixup_t cfi_0002_fixups[] = {
 };
 
 /* fixup after reading cmdset 0001 primary query table */
-static const cfi_fixup_t cfi_0001_fixups[] = {
+static const struct cfi_fixup cfi_0001_fixups[] = {
        {0, 0, NULL, NULL}
 };
 
-static void cfi_fixup(flash_bank_t *bank, const cfi_fixup_t *fixups)
+static void cfi_fixup(flash_bank_t *bank, const struct cfi_fixup *fixups)
 {
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       const cfi_fixup_t *f;
+       const struct cfi_fixup *f;
 
        for (f = fixups; f->fixup; f++)
        {
@@ -382,7 +382,7 @@ static int cfi_read_spansion_pri_ext(flash_bank_t *bank)
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
+       struct cfi_spansion_pri_ext *pri_ext = malloc(sizeof(struct cfi_spansion_pri_ext));
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -448,7 +448,7 @@ static int cfi_read_atmel_pri_ext(flash_bank_t *bank)
        int retval;
        struct cfi_atmel_pri_ext atmel_pri_ext;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
+       struct cfi_spansion_pri_ext *pri_ext = malloc(sizeof(struct cfi_spansion_pri_ext));
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -457,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;
 
@@ -528,7 +528,7 @@ static int cfi_spansion_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
        int printed;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 
        printed = snprintf(buf, buf_size, "\nSpansion primary algorithm extend information:\n");
        buf += printed;
@@ -700,7 +700,7 @@ static int cfi_spansion_erase(struct flash_bank_s *bank, int first, int last)
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
        int i;
@@ -1020,9 +1020,9 @@ static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
 {
        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;
-       working_area_t *source;
+       struct reg_param reg_params[7];
+       struct armv4_5_algorithm armv4_5_info;
+       struct working_area *source;
        uint32_t buffer_size = 32768;
        uint32_t write_command_val, busy_pattern_val, error_pattern_val;
 
@@ -1263,11 +1263,11 @@ cleanup:
 static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t address, uint32_t count)
 {
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       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;
-       working_area_t *source;
+       struct reg_param reg_params[10];
+       struct armv4_5_algorithm armv4_5_info;
+       struct working_area *source;
        uint32_t buffer_size = 32768;
        uint32_t status;
        int retval, retvaltemp;
@@ -1690,7 +1690,7 @@ static int cfi_spansion_write_word(struct flash_bank_s *bank, uint8_t *word, uin
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -1738,7 +1738,7 @@ static int cfi_spansion_write_words(struct flash_bank_s *bank, uint8_t *word, ui
        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);
@@ -2079,7 +2079,7 @@ static void cfi_fixup_atmel_reversed_erase_regions(flash_bank_t *bank, void *par
 {
        (void) param;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 
        pri_ext->_reversed_geometry = 1;
 }
@@ -2088,7 +2088,7 @@ static void cfi_fixup_0002_erase_regions(flash_bank_t *bank, void *param)
 {
        int i;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        (void) param;
 
        if ((pri_ext->_reversed_geometry) || (pri_ext->TopBottom == 3))
@@ -2110,8 +2110,8 @@ 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)
 {
        struct cfi_flash_bank *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_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;
@@ -2391,7 +2391,7 @@ static int cfi_probe(struct flash_bank_s *bank)
        {
                /* a device might have only one erase block, spanning the whole device */
                bank->num_sectors = 1;
-               bank->sectors = malloc(sizeof(flash_sector_t));
+               bank->sectors = malloc(sizeof(struct flash_sector));
 
                bank->sectors[sector].offset = 0x0;
                bank->sectors[sector].size = bank->size;
@@ -2408,7 +2408,7 @@ static int cfi_probe(struct flash_bank_s *bank)
                }
 
                bank->num_sectors = num_sectors;
-               bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
+               bank->sectors = malloc(sizeof(struct flash_sector) * num_sectors);
 
                for (i = 0; i < cfi_info->num_erase_regions; i++)
                {
@@ -2481,7 +2481,7 @@ static int cfi_spansion_protect_check(struct flash_bank_s *bank)
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
        int i;
@@ -2626,7 +2626,7 @@ static int cfi_info(struct flash_bank_s *bank, char *buf, int buf_size)
        return ERROR_OK;
 }
 
-flash_driver_t cfi_flash = {
+struct flash_driver cfi_flash = {
                .name = "cfi",
                .register_commands = &cfi_register_commands,
                .flash_bank_command = &cfi_flash_bank_command,
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)