Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: a7a8a1c)
cfi_flash_bank_t -> struct cfi_flash_bank
authorZachary T Welch <zw@superlucidity.net>
Fri, 13 Nov 2009 15:31:42 +0000 (07:31 -0800)
committerZachary T Welch <zw@superlucidity.net>
Fri, 13 Nov 2009 19:58:06 +0000 (11:58 -0800)
Remove misleading typedef and redundant suffix from struct cfi_flash_bank.

src/flash/cfi.c patch | blob | history
src/flash/cfi.h patch | blob | history
src/flash/non_cfi.c patch | blob | history

diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index 88f57df27746ef2ae676836ac6f5e5e57da9a856..a50a34991a2335dbf319cb947c661c0ba3b9cc75 100644 (file)
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -69,7 +69,7 @@ static const cfi_fixup_t cfi_0001_fixups[] = {
 
 static void cfi_fixup(flash_bank_t *bank, const cfi_fixup_t *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++)
        const cfi_fixup_t *f;
 
        for (f = fixups; f->fixup; f++)
@@ -85,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)
 {
 /* 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;
 
 
        if (cfi_info->x16_as_x8) offset *= 2;
 
@@ -179,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;
 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)
        uint8_t data[CFI_MAX_BUS_WIDTH * 2];
 
        if (cfi_info->x16_as_x8)
@@ -201,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;
 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)
        uint8_t data[CFI_MAX_BUS_WIDTH * 4];
 
        if (cfi_info->x16_as_x8)
@@ -280,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;
 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);
 
 
        oldstatus = cfi_get_u8(bank, 0, 0x0);
 
@@ -315,7 +315,7 @@ 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;
 static int cfi_read_intel_pri_ext(flash_bank_t *bank)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_intel_pri_ext_t *pri_ext = malloc(sizeof(cfi_intel_pri_ext_t));
        target_t *target = bank->target;
        uint8_t command[8];
        cfi_intel_pri_ext_t *pri_ext = malloc(sizeof(cfi_intel_pri_ext_t));
        target_t *target = bank->target;
        uint8_t command[8];
@@ -381,7 +381,7 @@ static int cfi_read_intel_pri_ext(flash_bank_t *bank)
 static int cfi_read_spansion_pri_ext(flash_bank_t *bank)
 {
        int retval;
 static int cfi_read_spansion_pri_ext(flash_bank_t *bank)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
        target_t *target = bank->target;
        uint8_t command[8];
        cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
        target_t *target = bank->target;
        uint8_t command[8];
@@ -447,7 +447,7 @@ static int cfi_read_atmel_pri_ext(flash_bank_t *bank)
 {
        int retval;
        cfi_atmel_pri_ext_t atmel_pri_ext;
 {
        int retval;
        cfi_atmel_pri_ext_t atmel_pri_ext;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
        target_t *target = bank->target;
        uint8_t command[8];
        cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
        target_t *target = bank->target;
        uint8_t command[8];
@@ -512,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)
 {
 
 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)
        {
 
        if (cfi_info->manufacturer == CFI_MFR_ATMEL)
        {
@@ -527,7 +527,7 @@ 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;
 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;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
 
        printed = snprintf(buf, buf_size, "\nSpansion primary algorithm extend information:\n");
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
 
        printed = snprintf(buf, buf_size, "\nSpansion primary algorithm extend information:\n");
@@ -562,7 +562,7 @@ 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;
 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;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
 
        printed = snprintf(buf, buf_size, "\nintel primary algorithm extend information:\n");
        cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
 
        printed = snprintf(buf, buf_size, "\nintel primary algorithm extend information:\n");
@@ -603,7 +603,7 @@ static int cfi_register_commands(struct command_context_s *cmd_ctx)
  */
 FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
 {
  */
 FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
 {
-       cfi_flash_bank_t *cfi_info;
+       struct cfi_flash_bank *cfi_info;
 
        if (argc < 6)
        {
 
        if (argc < 6)
        {
@@ -622,7 +622,7 @@ FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
                return ERROR_FLASH_BANK_INVALID;
        }
 
                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;
 
        cfi_info->probed = 0;
        bank->driver_priv = cfi_info;
 
@@ -655,7 +655,7 @@ FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
 static int cfi_intel_erase(struct flash_bank_s *bank, int first, int last)
 {
        int retval;
 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;
        target_t *target = bank->target;
        uint8_t command[8];
        int i;
@@ -699,7 +699,7 @@ 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;
 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;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
@@ -764,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)
 {
 
 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)
        {
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -800,7 +800,7 @@ 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;
 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;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
        cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
@@ -916,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)
 {
 
 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)
        {
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -1018,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)
 {
 
 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;
        target_t *target = bank->target;
        reg_param_t reg_params[7];
        armv4_5_algorithm_t armv4_5_info;
@@ -1262,7 +1262,7 @@ cleanup:
 
 static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t address, uint32_t count)
 {
 
 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;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        reg_param_t reg_params[10];
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        reg_param_t reg_params[10];
@@ -1562,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;
 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];
 
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -1596,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;
 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];
 
        target_t *target = bank->target;
        uint8_t command[8];
 
@@ -1689,7 +1689,7 @@ 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;
 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;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
@@ -1735,7 +1735,7 @@ 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;
 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;
        target_t *target = bank->target;
        uint8_t command[8];
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
@@ -1826,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)
 {
 
 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)
        {
 
        switch (cfi_info->pri_id)
        {
@@ -1847,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)
 {
 
 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)
        {
 
        switch (cfi_info->pri_id)
        {
@@ -1868,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)
 {
 
 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;
        target_t *target = bank->target;
        uint32_t address = bank->base + offset; /* address of first byte to be programmed */
        uint32_t write_p, copy_p;
@@ -2078,7 +2078,7 @@ 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;
 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;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
 
        pri_ext->_reversed_geometry = 1;
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
 
        pri_ext->_reversed_geometry = 1;
@@ -2087,7 +2087,7 @@ 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;
 static void cfi_fixup_0002_erase_regions(flash_bank_t *bank, void *param)
 {
        int i;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        (void) param;
 
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        (void) param;
 
@@ -2109,7 +2109,7 @@ 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)
 {
 
 static void cfi_fixup_0002_unlock_addresses(flash_bank_t *bank, void *param)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       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;
 
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        cfi_unlock_addresses_t *unlock_addresses = param;
 
@@ -2120,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)
 {
 
 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];
        target_t *target = bank->target;
        int retval;
        uint8_t command[8];
@@ -2158,7 +2158,7 @@ static int cfi_query_string(struct flash_bank_s *bank, int address)
 
 static int cfi_probe(struct flash_bank_s *bank)
 {
 
 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;
        target_t *target = bank->target;
        uint8_t command[8];
        int num_sectors = 0;
@@ -2437,7 +2437,7 @@ static int cfi_probe(struct flash_bank_s *bank)
 
 static int cfi_auto_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);
        if (cfi_info->probed)
                return ERROR_OK;
        return cfi_probe(bank);
@@ -2447,7 +2447,7 @@ static int cfi_auto_probe(struct flash_bank_s *bank)
 static int cfi_intel_protect_check(struct flash_bank_s *bank)
 {
        int retval;
 static int cfi_intel_protect_check(struct flash_bank_s *bank)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[CFI_MAX_BUS_WIDTH];
        cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[CFI_MAX_BUS_WIDTH];
@@ -2480,7 +2480,7 @@ static int cfi_intel_protect_check(struct flash_bank_s *bank)
 static int cfi_spansion_protect_check(struct flash_bank_s *bank)
 {
        int retval;
 static int cfi_spansion_protect_check(struct flash_bank_s *bank)
 {
        int retval;
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
        cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
        target_t *target = bank->target;
        uint8_t command[8];
@@ -2520,7 +2520,7 @@ static int cfi_spansion_protect_check(struct flash_bank_s *bank)
 
 static int cfi_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)
        {
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -2551,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;
 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)
        {
 
        if (cfi_info->qry[0] == (char)-1)
        {
diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index eab2dcdcb9a469aef0806d4925e80dfbfbf9d5a9..9cf7d58237e5db48241b0626b0998ca3961ff0e1 100644 (file)
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -25,7 +25,7 @@
 #define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
 #define CFI_STATUS_POLL_MASK_DQ6_DQ7     0xC0 /* DQ6..DQ7 */
 
 #define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
 #define CFI_STATUS_POLL_MASK_DQ6_DQ7     0xC0 /* DQ6..DQ7 */
 
-typedef struct cfi_flash_bank_s
+struct cfi_flash_bank
 {
        working_area_t *write_algorithm;
 
 {
        working_area_t *write_algorithm;
 
@@ -70,7 +70,7 @@ typedef struct cfi_flash_bank_s
 
        void *pri_ext;
        void *alt_ext;
 
        void *pri_ext;
        void *alt_ext;
-} cfi_flash_bank_t;
+};
 
 /* Intel primary extended query table
  * as defined for the Advanced+ Boot Block Flash Memory (C3)
 
 /* Intel primary extended query table
  * as defined for the Advanced+ Boot Block Flash Memory (C3)
diff --git a/src/flash/non_cfi.c b/src/flash/non_cfi.c
index 34acd2a40ccf74fcfe21a483ffd11b9319030729..515b0bea0ae766dcd09a52d95b72b4b9fac07edf 100644 (file)
--- a/src/flash/non_cfi.c
+++ b/src/flash/non_cfi.c
@@ -405,7 +405,7 @@ static non_cfi_t non_cfi_flashes[] = {
 
 void cfi_fixup_non_cfi(flash_bank_t *bank)
 {
 
 void cfi_fixup_non_cfi(flash_bank_t *bank)
 {
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
+       struct cfi_flash_bank *cfi_info = bank->driver_priv;
        non_cfi_t *non_cfi = non_cfi_flashes;
 
        for (non_cfi = non_cfi_flashes; non_cfi->mfr; non_cfi++)
        non_cfi_t *non_cfi = non_cfi_flashes;
 
        for (non_cfi = non_cfi_flashes; non_cfi->mfr; non_cfi++)
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)