interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

working_area_t -> struct working_area 

Remove misleading typedef and redundant suffix from struct working_area.
This commit is contained in:
Zachary T Welch 2009-11-13 08:44:30 -08:00
parent c2b5d8a6fa
commit 46fc1d57ac
23 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/flash/aduc702x.c
View File

@ -44,7 +44,7 @@ static int aduc702x_set_write_enable(target_t *target, int enable);
#define ADUC702x_FLASH_FEEHIDE (7*4) #define ADUC702x_FLASH_FEEHIDE (7*4)
struct aduc702x_flash_bank { struct aduc702x_flash_bank {
working_area_t *write_algorithm; struct working_area *write_algorithm;
}; };
/* flash bank aduc702x 0 0 0 0 <target#> /* flash bank aduc702x 0 0 0 0 <target#>
@ -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; struct aduc702x_flash_bank *aduc702x_info = bank->driver_priv;
target_t *target = bank->target; target_t *target = bank->target;
uint32_t buffer_size = 7000; uint32_t buffer_size = 7000;
working_area_t *source; struct working_area *source;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
struct reg_param reg_params[6]; struct reg_param reg_params[6];
struct armv4_5_algorithm armv4_5_info; struct armv4_5_algorithm armv4_5_info;

2
src/flash/arm_nandio.h
View File

@ -9,7 +9,7 @@ struct arm_nand_data {
struct target_s *target; struct target_s *target;
/* copy_area holds write-to-NAND loop and data to write */ /* 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 */ /* chunk_size == page or ECC unit */
unsigned chunk_size; unsigned chunk_size;

4
src/flash/cfi.c
View File

@ -1022,7 +1022,7 @@ static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
target_t *target = bank->target; target_t *target = bank->target;
struct reg_param reg_params[7]; struct reg_param reg_params[7];
struct armv4_5_algorithm armv4_5_info; struct armv4_5_algorithm armv4_5_info;
working_area_t *source; struct working_area *source;
uint32_t buffer_size = 32768; uint32_t buffer_size = 32768;
uint32_t write_command_val, busy_pattern_val, error_pattern_val; 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; target_t *target = bank->target;
struct reg_param reg_params[10]; struct reg_param reg_params[10];
struct armv4_5_algorithm armv4_5_info; struct armv4_5_algorithm armv4_5_info;
working_area_t *source; struct working_area *source;
uint32_t buffer_size = 32768; uint32_t buffer_size = 32768;
uint32_t status; uint32_t status;
int retval, retvaltemp; int retval, retvaltemp;

2
src/flash/cfi.h
View File

@ -27,7 +27,7 @@
struct cfi_flash_bank struct cfi_flash_bank
{ {
working_area_t *write_algorithm; struct working_area *write_algorithm;
int x16_as_x8; int x16_as_x8;
int jedec_probe; int jedec_probe;

4
src/flash/ecos.c
View File

@ -36,8 +36,8 @@ static int ecosflash_handle_gpnvm_command(struct command_context_s *cmd_ctx, cha
struct ecosflash_flash_bank struct ecosflash_flash_bank
{ {
struct target_s *target; struct target_s *target;
working_area_t *write_algorithm; struct working_area *write_algorithm;
working_area_t *erase_check_algorithm; struct working_area *erase_check_algorithm;
char *driverPath; char *driverPath;
uint32_t start_address; uint32_t start_address;
}; };

2
src/flash/lpc2000.c
View File

@ -548,7 +548,7 @@ static int lpc2000_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t of
uint32_t result_table[4]; uint32_t result_table[4];
int status_code; int status_code;
int i; int i;
working_area_t *download_area; struct working_area *download_area;
int retval = ERROR_OK; int retval = ERROR_OK;
if (bank->target->state != TARGET_HALTED) if (bank->target->state != TARGET_HALTED)

2
src/flash/lpc2000.h
View File

@ -35,7 +35,7 @@ typedef enum
struct lpc2000_flash_bank struct lpc2000_flash_bank
{ {
lpc2000_variant variant; lpc2000_variant variant;
struct working_area_s *iap_working_area; struct working_area *iap_working_area;
uint32_t cclk; uint32_t cclk;
int cmd51_dst_boundary; int cmd51_dst_boundary;
int cmd51_can_256b; int cmd51_can_256b;

2
src/flash/lpc2900.c
View File

@ -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 /* Try working area allocation. Start with a large buffer, and try with
reduced size if that fails. */ reduced size if that fails. */
working_area_t *warea; struct working_area *warea;
uint32_t buffer_size = lpc2900_info->max_ram_block - 1 * KiB; uint32_t buffer_size = lpc2900_info->max_ram_block - 1 * KiB;
while( (retval = target_alloc_working_area(target, while( (retval = target_alloc_working_area(target,
buffer_size + target_code_size, buffer_size + target_code_size,

2
src/flash/pic32mx.c
View File

@ -302,7 +302,7 @@ static int pic32mx_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint3
{ {
target_t *target = bank->target; target_t *target = bank->target;
uint32_t buffer_size = 512; uint32_t buffer_size = 512;
working_area_t *source; struct working_area *source;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
int retval = ERROR_OK; int retval = ERROR_OK;
#if 0 #if 0

2
src/flash/pic32mx.h
View File

@ -30,7 +30,7 @@
struct pic32mx_flash_bank struct pic32mx_flash_bank
{ {
working_area_t *write_algorithm; struct working_area *write_algorithm;
int devid; int devid;
int ppage_size; int ppage_size;
int probed; int probed;

4
src/flash/stellaris.c
View File

@ -832,8 +832,8 @@ static int stellaris_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
{ {
target_t *target = bank->target; target_t *target = bank->target;
uint32_t buffer_size = 8192; uint32_t buffer_size = 8192;
working_area_t *source; struct working_area *source;
working_area_t *write_algorithm; struct working_area *write_algorithm;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
struct reg_param reg_params[3]; struct reg_param reg_params[3];
struct armv7m_algorithm armv7m_info; struct armv7m_algorithm armv7m_info;

2
src/flash/stm32x.c
View File

@ -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; struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
target_t *target = bank->target; target_t *target = bank->target;
uint32_t buffer_size = 16384; uint32_t buffer_size = 16384;
working_area_t *source; struct working_area *source;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
struct reg_param reg_params[4]; struct reg_param reg_params[4];
struct armv7m_algorithm armv7m_info; struct armv7m_algorithm armv7m_info;

2
src/flash/stm32x.h
View File

@ -35,7 +35,7 @@ struct stm32x_options
struct stm32x_flash_bank struct stm32x_flash_bank
{ {
struct stm32x_options option_bytes; struct stm32x_options option_bytes;
working_area_t *write_algorithm; struct working_area *write_algorithm;
int ppage_size; int ppage_size;
int probed; int probed;
}; };

2
src/flash/str7x.c
View File

@ -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; struct str7x_flash_bank *str7x_info = bank->driver_priv;
target_t *target = bank->target; target_t *target = bank->target;
uint32_t buffer_size = 8192; uint32_t buffer_size = 8192;
working_area_t *source; struct working_area *source;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
struct reg_param reg_params[6]; struct reg_param reg_params[6];
struct armv4_5_algorithm armv4_5_info; struct armv4_5_algorithm armv4_5_info;

2
src/flash/str7x.h
View File

@ -31,7 +31,7 @@ struct str7x_flash_bank
uint32_t disable_bit; uint32_t disable_bit;
uint32_t busy_bits; uint32_t busy_bits;
uint32_t register_base; uint32_t register_base;
working_area_t *write_algorithm; struct working_area *write_algorithm;
}; };
enum str7x_status_codes enum str7x_status_codes

2
src/flash/str9x.c
View File

@ -351,7 +351,7 @@ static int str9x_write_block(struct flash_bank_s *bank,
struct str9x_flash_bank *str9x_info = bank->driver_priv; struct str9x_flash_bank *str9x_info = bank->driver_priv;
target_t *target = bank->target; target_t *target = bank->target;
uint32_t buffer_size = 8192; uint32_t buffer_size = 8192;
working_area_t *source; struct working_area *source;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
struct reg_param reg_params[4]; struct reg_param reg_params[4];
struct armv4_5_algorithm armv4_5_info; struct armv4_5_algorithm armv4_5_info;

2
src/flash/str9x.h
View File

@ -30,7 +30,7 @@ struct str9x_flash_bank
uint32_t *sector_bits; uint32_t *sector_bits;
int variant; int variant;
int bank1; int bank1;
working_area_t *write_algorithm; struct working_area *write_algorithm;
}; };
enum str9x_status_codes enum str9x_status_codes

4
src/target/arm7_9_common.c
View File

@ -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) 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 armv4_5_algorithm armv4_5_info;
struct reg_param reg_params[2]; struct reg_param reg_params[2];
int retval; 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) 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 reg_param reg_params[3];
struct armv4_5_algorithm armv4_5_info; struct armv4_5_algorithm armv4_5_info;
int retval; int retval;

2
src/target/arm7_9_common.h
View File

@ -69,7 +69,7 @@ struct arm7_9_common
bool fast_memory_access; bool fast_memory_access;
bool dcc_downloads; 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 */ int (*examine_debug_reason)(target_t *target); /**< Function for determining why debug state was entered */

4
src/target/armv7m.c
View File

@ -588,7 +588,7 @@ int armv7m_init_arch_info(target_t *target, struct armv7m_common *armv7m)
int armv7m_checksum_memory(struct target_s *target, int armv7m_checksum_memory(struct target_s *target,
uint32_t address, uint32_t count, uint32_t* checksum) 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 armv7m_algorithm armv7m_info;
struct reg_param reg_params[2]; struct reg_param reg_params[2];
int retval; int retval;
@ -671,7 +671,7 @@ int armv7m_checksum_memory(struct target_s *target,
int armv7m_blank_check_memory(struct target_s *target, int armv7m_blank_check_memory(struct target_s *target,
uint32_t address, uint32_t count, uint32_t* blank) 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 reg_param reg_params[3];
struct armv7m_algorithm armv7m_info; struct armv7m_algorithm armv7m_info;
int retval; int retval;

2
src/target/cortex_a8.c
View File

@ -564,7 +564,7 @@ static int cortex_a8_debug_entry(target_t *target)
int i; int i;
uint32_t regfile[16], pc, cpsr, dscr; uint32_t regfile[16], pc, cpsr, dscr;
int retval = ERROR_OK; 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 cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
struct armv7a_common *armv7a = target_to_armv7a(target); struct armv7a_common *armv7a = target_to_armv7a(target);
struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common; struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common;

18
src/target/target.c
View File

@ -1082,10 +1082,10 @@ int target_call_timer_callbacks_now(void)
return target_call_timer_callbacks_check_time(0); 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; struct working_area *c = target->working_areas;
working_area_t *new_wa = NULL; struct working_area *new_wa = NULL;
/* Reevaluate working area address based on MMU state*/ /* Reevaluate working area address based on MMU state*/
if (target->working_areas == NULL) 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 not, allocate a new one */
if (!new_wa) 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 first_free = target->working_area;
uint32_t free_size = target->working_area_size; 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); 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->next = NULL;
new_wa->size = size; new_wa->size = size;
new_wa->address = first_free; 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; 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) if (area->free)
return ERROR_OK; return ERROR_OK;
@ -1223,7 +1223,7 @@ int target_free_working_area_restore(struct target_s *target, working_area_t *ar
return ERROR_OK; 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); 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) 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) while (c)
{ {
working_area_t *next = c->next; struct working_area *next = c->next;
target_free_working_area_restore(target, c, restore); target_free_working_area_restore(target, c, restore);
if (c->backup) if (c->backup)

16
src/target/target.h
View File

@ -114,15 +114,15 @@ extern const Jim_Nvp nvp_target_endian[];
struct target_s; struct target_s;
typedef struct working_area_s struct working_area
{ {
uint32_t address; uint32_t address;
uint32_t size; uint32_t size;
int free; int free;
uint8_t *backup; uint8_t *backup;
struct working_area_s **user; struct working_area **user;
struct working_area_s *next; struct working_area *next;
} working_area_t; };
// target_type.h contains the full definitionof struct target_type_s // target_type.h contains the full definitionof struct target_type_s
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_phys; /* physical address */
uint32_t working_area_size; /* size in bytes */ uint32_t working_area_size; /* size in bytes */
uint32_t backup_working_area; /* whether the content of the working area has to be preserved */ 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_debug_reason debug_reason;/* reason why the target entered debug state */
enum target_endianess endianness; /* target endianess */ enum target_endianess endianness; /* target endianess */
// also see: target_state_name() // 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, int target_alloc_working_area(struct target_s *target,
uint32_t size, working_area_t **area); uint32_t size, struct working_area **area);
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);
int target_free_working_area_restore(struct target_s *target, 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(struct target_s *target);
void target_free_all_working_areas_restore(struct target_s *target, int restore); void target_free_all_working_areas_restore(struct target_s *target, int restore);