From 46fc1d57ac9462fd788277609707a379c7a406cb Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 13 Nov 2009 08:44:30 -0800 Subject: [PATCH] working_area_t -> struct working_area Remove misleading typedef and redundant suffix from struct working_area. --- src/flash/aduc702x.c | 4 ++-- src/flash/arm_nandio.h | 2 +- src/flash/cfi.c | 4 ++-- src/flash/cfi.h | 2 +- src/flash/ecos.c | 4 ++-- src/flash/lpc2000.c | 2 +- src/flash/lpc2000.h | 2 +- src/flash/lpc2900.c | 2 +- src/flash/pic32mx.c | 2 +- src/flash/pic32mx.h | 2 +- src/flash/stellaris.c | 4 ++-- src/flash/stm32x.c | 2 +- src/flash/stm32x.h | 2 +- src/flash/str7x.c | 2 +- src/flash/str7x.h | 2 +- src/flash/str9x.c | 2 +- src/flash/str9x.h | 2 +- src/target/arm7_9_common.c | 4 ++-- src/target/arm7_9_common.h | 2 +- src/target/armv7m.c | 4 ++-- src/target/cortex_a8.c | 2 +- src/target/target.c | 18 +++++++++--------- src/target/target.h | 16 ++++++++-------- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/flash/aduc702x.c b/src/flash/aduc702x.c index ebda702af..8011e9334 100644 --- a/src/flash/aduc702x.c +++ b/src/flash/aduc702x.c @@ -44,7 +44,7 @@ static int aduc702x_set_write_enable(target_t *target, int enable); #define ADUC702x_FLASH_FEEHIDE (7*4) struct aduc702x_flash_bank { - working_area_t *write_algorithm; + struct working_area *write_algorithm; }; /* flash bank aduc702x 0 0 0 0 @@ -161,7 +161,7 @@ static int aduc702x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint struct aduc702x_flash_bank *aduc702x_info = bank->driver_priv; target_t *target = bank->target; uint32_t buffer_size = 7000; - working_area_t *source; + struct working_area *source; uint32_t address = bank->base + offset; struct reg_param reg_params[6]; struct armv4_5_algorithm armv4_5_info; diff --git a/src/flash/arm_nandio.h b/src/flash/arm_nandio.h index eedf5dcac..cb8df4283 100644 --- a/src/flash/arm_nandio.h +++ b/src/flash/arm_nandio.h @@ -9,7 +9,7 @@ struct arm_nand_data { struct target_s *target; /* copy_area holds write-to-NAND loop and data to write */ - struct working_area_s *copy_area; + struct working_area *copy_area; /* chunk_size == page or ECC unit */ unsigned chunk_size; diff --git a/src/flash/cfi.c b/src/flash/cfi.c index c0c2cb79d..6a193e2d8 100644 --- a/src/flash/cfi.c +++ b/src/flash/cfi.c @@ -1022,7 +1022,7 @@ static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin target_t *target = bank->target; struct reg_param reg_params[7]; struct armv4_5_algorithm armv4_5_info; - working_area_t *source; + struct working_area *source; uint32_t buffer_size = 32768; uint32_t write_command_val, busy_pattern_val, error_pattern_val; @@ -1267,7 +1267,7 @@ static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer, target_t *target = bank->target; struct reg_param reg_params[10]; struct armv4_5_algorithm armv4_5_info; - working_area_t *source; + struct working_area *source; uint32_t buffer_size = 32768; uint32_t status; int retval, retvaltemp; diff --git a/src/flash/cfi.h b/src/flash/cfi.h index 7763aff67..deca9163d 100644 --- a/src/flash/cfi.h +++ b/src/flash/cfi.h @@ -27,7 +27,7 @@ struct cfi_flash_bank { - working_area_t *write_algorithm; + struct working_area *write_algorithm; int x16_as_x8; int jedec_probe; diff --git a/src/flash/ecos.c b/src/flash/ecos.c index 0a97bda1c..450bd5b70 100644 --- a/src/flash/ecos.c +++ b/src/flash/ecos.c @@ -36,8 +36,8 @@ static int ecosflash_handle_gpnvm_command(struct command_context_s *cmd_ctx, cha struct ecosflash_flash_bank { struct target_s *target; - working_area_t *write_algorithm; - working_area_t *erase_check_algorithm; + struct working_area *write_algorithm; + struct working_area *erase_check_algorithm; char *driverPath; uint32_t start_address; }; diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c index 31e81b3bb..4ad3e0e54 100644 --- a/src/flash/lpc2000.c +++ b/src/flash/lpc2000.c @@ -548,7 +548,7 @@ static int lpc2000_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t of uint32_t result_table[4]; int status_code; int i; - working_area_t *download_area; + struct working_area *download_area; int retval = ERROR_OK; if (bank->target->state != TARGET_HALTED) diff --git a/src/flash/lpc2000.h b/src/flash/lpc2000.h index b93deb69a..08e278a35 100644 --- a/src/flash/lpc2000.h +++ b/src/flash/lpc2000.h @@ -35,7 +35,7 @@ typedef enum struct lpc2000_flash_bank { lpc2000_variant variant; - struct working_area_s *iap_working_area; + struct working_area *iap_working_area; uint32_t cclk; int cmd51_dst_boundary; int cmd51_can_256b; diff --git a/src/flash/lpc2900.c b/src/flash/lpc2900.c index f6b3bf6f1..08879077b 100644 --- a/src/flash/lpc2900.c +++ b/src/flash/lpc2900.c @@ -1294,7 +1294,7 @@ static int lpc2900_write(struct flash_bank_s *bank, uint8_t *buffer, /* Try working area allocation. Start with a large buffer, and try with reduced size if that fails. */ - working_area_t *warea; + struct working_area *warea; uint32_t buffer_size = lpc2900_info->max_ram_block - 1 * KiB; while( (retval = target_alloc_working_area(target, buffer_size + target_code_size, diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c index 262200c01..d29950ce1 100644 --- a/src/flash/pic32mx.c +++ b/src/flash/pic32mx.c @@ -302,7 +302,7 @@ static int pic32mx_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint3 { target_t *target = bank->target; uint32_t buffer_size = 512; - working_area_t *source; + struct working_area *source; uint32_t address = bank->base + offset; int retval = ERROR_OK; #if 0 diff --git a/src/flash/pic32mx.h b/src/flash/pic32mx.h index 3a3c9794f..92f40c2e5 100644 --- a/src/flash/pic32mx.h +++ b/src/flash/pic32mx.h @@ -30,7 +30,7 @@ struct pic32mx_flash_bank { - working_area_t *write_algorithm; + struct working_area *write_algorithm; int devid; int ppage_size; int probed; diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c index cdeccbe10..6ec036cc9 100644 --- a/src/flash/stellaris.c +++ b/src/flash/stellaris.c @@ -832,8 +832,8 @@ static int stellaris_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin { target_t *target = bank->target; uint32_t buffer_size = 8192; - working_area_t *source; - working_area_t *write_algorithm; + struct working_area *source; + struct working_area *write_algorithm; uint32_t address = bank->base + offset; struct reg_param reg_params[3]; struct armv7m_algorithm armv7m_info; diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c index a63ff60b4..35da209c5 100644 --- a/src/flash/stm32x.c +++ b/src/flash/stm32x.c @@ -435,7 +435,7 @@ static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32 struct stm32x_flash_bank *stm32x_info = bank->driver_priv; target_t *target = bank->target; uint32_t buffer_size = 16384; - working_area_t *source; + struct working_area *source; uint32_t address = bank->base + offset; struct reg_param reg_params[4]; struct armv7m_algorithm armv7m_info; diff --git a/src/flash/stm32x.h b/src/flash/stm32x.h index 9e1e5b1cc..6cd047e10 100644 --- a/src/flash/stm32x.h +++ b/src/flash/stm32x.h @@ -35,7 +35,7 @@ struct stm32x_options struct stm32x_flash_bank { struct stm32x_options option_bytes; - working_area_t *write_algorithm; + struct working_area *write_algorithm; int ppage_size; int probed; }; diff --git a/src/flash/str7x.c b/src/flash/str7x.c index 68ba26ebe..d5defe5f8 100644 --- a/src/flash/str7x.c +++ b/src/flash/str7x.c @@ -313,7 +313,7 @@ static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_ struct str7x_flash_bank *str7x_info = bank->driver_priv; target_t *target = bank->target; uint32_t buffer_size = 8192; - working_area_t *source; + struct working_area *source; uint32_t address = bank->base + offset; struct reg_param reg_params[6]; struct armv4_5_algorithm armv4_5_info; diff --git a/src/flash/str7x.h b/src/flash/str7x.h index ef2d2e339..81af0f1e7 100644 --- a/src/flash/str7x.h +++ b/src/flash/str7x.h @@ -31,7 +31,7 @@ struct str7x_flash_bank uint32_t disable_bit; uint32_t busy_bits; uint32_t register_base; - working_area_t *write_algorithm; + struct working_area *write_algorithm; }; enum str7x_status_codes diff --git a/src/flash/str9x.c b/src/flash/str9x.c index bae895d22..09e5a08fe 100644 --- a/src/flash/str9x.c +++ b/src/flash/str9x.c @@ -351,7 +351,7 @@ static int str9x_write_block(struct flash_bank_s *bank, struct str9x_flash_bank *str9x_info = bank->driver_priv; target_t *target = bank->target; uint32_t buffer_size = 8192; - working_area_t *source; + struct working_area *source; uint32_t address = bank->base + offset; struct reg_param reg_params[4]; struct armv4_5_algorithm armv4_5_info; diff --git a/src/flash/str9x.h b/src/flash/str9x.h index 693851487..c9d5152f2 100644 --- a/src/flash/str9x.h +++ b/src/flash/str9x.h @@ -30,7 +30,7 @@ struct str9x_flash_bank uint32_t *sector_bits; int variant; int bank1; - working_area_t *write_algorithm; + struct working_area *write_algorithm; }; enum str9x_status_codes diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index eb27bba0a..19244de32 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -2723,7 +2723,7 @@ int arm7_9_bulk_write_memory(target_t *target, uint32_t address, uint32_t count, int arm7_9_checksum_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* checksum) { - working_area_t *crc_algorithm; + struct working_area *crc_algorithm; struct armv4_5_algorithm armv4_5_info; struct reg_param reg_params[2]; int retval; @@ -2807,7 +2807,7 @@ int arm7_9_checksum_memory(struct target_s *target, uint32_t address, uint32_t c int arm7_9_blank_check_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* blank) { - working_area_t *erase_check_algorithm; + struct working_area *erase_check_algorithm; struct reg_param reg_params[3]; struct armv4_5_algorithm armv4_5_info; int retval; diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h index cebf6e3c9..0ef5eb646 100644 --- a/src/target/arm7_9_common.h +++ b/src/target/arm7_9_common.h @@ -69,7 +69,7 @@ struct arm7_9_common bool fast_memory_access; bool dcc_downloads; - struct working_area_s *dcc_working_area; + struct working_area *dcc_working_area; int (*examine_debug_reason)(target_t *target); /**< Function for determining why debug state was entered */ diff --git a/src/target/armv7m.c b/src/target/armv7m.c index 05668880e..4a6869fae 100644 --- a/src/target/armv7m.c +++ b/src/target/armv7m.c @@ -588,7 +588,7 @@ int armv7m_init_arch_info(target_t *target, struct armv7m_common *armv7m) int armv7m_checksum_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* checksum) { - working_area_t *crc_algorithm; + struct working_area *crc_algorithm; struct armv7m_algorithm armv7m_info; struct reg_param reg_params[2]; int retval; @@ -671,7 +671,7 @@ int armv7m_checksum_memory(struct target_s *target, int armv7m_blank_check_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* blank) { - working_area_t *erase_check_algorithm; + struct working_area *erase_check_algorithm; struct reg_param reg_params[3]; struct armv7m_algorithm armv7m_info; int retval; diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c index edf7f141e..983bef85b 100644 --- a/src/target/cortex_a8.c +++ b/src/target/cortex_a8.c @@ -564,7 +564,7 @@ static int cortex_a8_debug_entry(target_t *target) int i; uint32_t regfile[16], pc, cpsr, dscr; int retval = ERROR_OK; - working_area_t *regfile_working_area = NULL; + struct working_area *regfile_working_area = NULL; struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target); struct armv7a_common *armv7a = target_to_armv7a(target); struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common; diff --git a/src/target/target.c b/src/target/target.c index 8932266ab..3b3179c3e 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -1082,10 +1082,10 @@ int target_call_timer_callbacks_now(void) return target_call_timer_callbacks_check_time(0); } -int target_alloc_working_area(struct target_s *target, uint32_t size, working_area_t **area) +int target_alloc_working_area(struct target_s *target, uint32_t size, struct working_area **area) { - working_area_t *c = target->working_areas; - working_area_t *new_wa = NULL; + struct working_area *c = target->working_areas; + struct working_area *new_wa = NULL; /* Reevaluate working area address based on MMU state*/ if (target->working_areas == NULL) @@ -1145,7 +1145,7 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar /* if not, allocate a new one */ if (!new_wa) { - working_area_t **p = &target->working_areas; + struct working_area **p = &target->working_areas; uint32_t first_free = target->working_area; uint32_t free_size = target->working_area_size; @@ -1167,7 +1167,7 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar LOG_DEBUG("allocated new working area at address 0x%08x", (unsigned)first_free); - new_wa = malloc(sizeof(working_area_t)); + new_wa = malloc(sizeof(struct working_area)); new_wa->next = NULL; new_wa->size = size; new_wa->address = first_free; @@ -1202,7 +1202,7 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar return ERROR_OK; } -int target_free_working_area_restore(struct target_s *target, working_area_t *area, int restore) +int target_free_working_area_restore(struct target_s *target, struct working_area *area, int restore) { if (area->free) return ERROR_OK; @@ -1223,7 +1223,7 @@ int target_free_working_area_restore(struct target_s *target, working_area_t *ar return ERROR_OK; } -int target_free_working_area(struct target_s *target, working_area_t *area) +int target_free_working_area(struct target_s *target, struct working_area *area) { return target_free_working_area_restore(target, area, 1); } @@ -1233,11 +1233,11 @@ int target_free_working_area(struct target_s *target, working_area_t *area) */ void target_free_all_working_areas_restore(struct target_s *target, int restore) { - working_area_t *c = target->working_areas; + struct working_area *c = target->working_areas; while (c) { - working_area_t *next = c->next; + struct working_area *next = c->next; target_free_working_area_restore(target, c, restore); if (c->backup) diff --git a/src/target/target.h b/src/target/target.h index b7fa3eb91..14973550c 100644 --- a/src/target/target.h +++ b/src/target/target.h @@ -114,15 +114,15 @@ extern const Jim_Nvp nvp_target_endian[]; struct target_s; -typedef struct working_area_s +struct working_area { uint32_t address; uint32_t size; int free; uint8_t *backup; - struct working_area_s **user; - struct working_area_s *next; -} working_area_t; + struct working_area **user; + struct working_area *next; +}; // target_type.h contains the full definitionof struct target_type_s struct target_type_s; @@ -149,7 +149,7 @@ typedef struct target_s uint32_t working_area_phys; /* physical address */ uint32_t working_area_size; /* size in bytes */ uint32_t backup_working_area; /* whether the content of the working area has to be preserved */ - struct working_area_s *working_areas;/* list of allocated working areas */ + struct working_area *working_areas;/* list of allocated working areas */ enum target_debug_reason debug_reason;/* reason why the target entered debug state */ enum target_endianess endianness; /* target endianess */ // also see: target_state_name() @@ -441,10 +441,10 @@ const char *target_state_name( target_t *target ); * */ int target_alloc_working_area(struct target_s *target, - uint32_t size, working_area_t **area); -int target_free_working_area(struct target_s *target, working_area_t *area); + uint32_t size, struct working_area **area); +int target_free_working_area(struct target_s *target, struct working_area *area); int target_free_working_area_restore(struct target_s *target, - working_area_t *area, int restore); + struct working_area *area, int restore); void target_free_all_working_areas(struct target_s *target); void target_free_all_working_areas_restore(struct target_s *target, int restore);