interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reg_param_t -> struct reg_param 

Remove misleading typedef and redundant suffix from struct reg_param.
This commit is contained in:
Zachary T Welch 2009-11-13 08:39:42 -08:00
parent 6c965a3da9
commit b1de5eb9a0
24 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/flash/aduc702x.c
View File

@ -163,7 +163,7 @@ static int aduc702x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint
uint32_t buffer_size = 7000; uint32_t buffer_size = 7000;
working_area_t *source; working_area_t *source;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
reg_param_t reg_params[6]; struct reg_param reg_params[6];
armv4_5_algorithm_t armv4_5_info; armv4_5_algorithm_t armv4_5_info;
int retval = ERROR_OK; int retval = ERROR_OK;

2
src/flash/arm_nandio.c
View File

@ -44,7 +44,7 @@ int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
target_t *target = nand->target; target_t *target = nand->target;
armv4_5_algorithm_t algo; armv4_5_algorithm_t algo;
armv4_5_common_t *armv4_5 = target->arch_info; armv4_5_common_t *armv4_5 = target->arch_info;
reg_param_t reg_params[3]; struct reg_param reg_params[3];
uint32_t target_buf; uint32_t target_buf;
uint32_t exit = 0; uint32_t exit = 0;
int retval; int retval;

4
src/flash/cfi.c
View File

@ -1020,7 +1020,7 @@ static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
{ {
struct cfi_flash_bank *cfi_info = bank->driver_priv; struct cfi_flash_bank *cfi_info = bank->driver_priv;
target_t *target = bank->target; target_t *target = bank->target;
reg_param_t reg_params[7]; struct reg_param reg_params[7];
armv4_5_algorithm_t armv4_5_info; armv4_5_algorithm_t armv4_5_info;
working_area_t *source; working_area_t *source;
uint32_t buffer_size = 32768; uint32_t buffer_size = 32768;
@ -1265,7 +1265,7 @@ static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer,
struct cfi_flash_bank *cfi_info = bank->driver_priv; struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext; struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
target_t *target = bank->target; target_t *target = bank->target;
reg_param_t reg_params[10]; struct reg_param reg_params[10];
armv4_5_algorithm_t armv4_5_info; armv4_5_algorithm_t armv4_5_info;
working_area_t *source; working_area_t *source;
uint32_t buffer_size = 32768; uint32_t buffer_size = 32768;

2
src/flash/ecos.c
View File

@ -206,7 +206,7 @@ static int runCode(struct ecosflash_flash_bank *info,
{ {
target_t *target = info->target; target_t *target = info->target;
reg_param_t reg_params[3]; struct reg_param reg_params[3];
armv4_5_algorithm_t armv4_5_info; armv4_5_algorithm_t armv4_5_info;
armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
armv4_5_info.core_mode = ARMV4_5_MODE_SVC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC;

2
src/flash/lpc2000.c
View File

@ -240,7 +240,7 @@ static int lpc2000_iap_call(flash_bank_t *bank, int code, uint32_t param_table[5
struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv;
target_t *target = bank->target; target_t *target = bank->target;
struct mem_param mem_params[2]; struct mem_param mem_params[2];
reg_param_t reg_params[5]; struct reg_param reg_params[5];
armv4_5_algorithm_t armv4_5_info; /* for LPC2000 */ armv4_5_algorithm_t armv4_5_info; /* for LPC2000 */
armv7m_algorithm_t armv7m_info; /* for LPC1700 */ armv7m_algorithm_t armv7m_info; /* for LPC1700 */
uint32_t status_code; uint32_t status_code;

2
src/flash/lpc2900.c
View File

@ -1313,7 +1313,7 @@ static int lpc2900_write(struct flash_bank_s *bank, uint8_t *buffer,
if( warea ) if( warea )
{ {
reg_param_t reg_params[5]; struct reg_param reg_params[5];
armv4_5_algorithm_t armv4_5_info; armv4_5_algorithm_t armv4_5_info;
/* We can use target mode. Download the algorithm. */ /* We can use target mode. Download the algorithm. */

2
src/flash/stellaris.c
View File

@ -835,7 +835,7 @@ static int stellaris_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
working_area_t *source; working_area_t *source;
working_area_t *write_algorithm; working_area_t *write_algorithm;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
reg_param_t reg_params[3]; struct reg_param reg_params[3];
armv7m_algorithm_t armv7m_info; armv7m_algorithm_t armv7m_info;
int retval = ERROR_OK; int retval = ERROR_OK;

2
src/flash/stm32x.c
View File

@ -437,7 +437,7 @@ static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32
uint32_t buffer_size = 16384; uint32_t buffer_size = 16384;
working_area_t *source; working_area_t *source;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
reg_param_t reg_params[4]; struct reg_param reg_params[4];
armv7m_algorithm_t armv7m_info; armv7m_algorithm_t armv7m_info;
int retval = ERROR_OK; int retval = ERROR_OK;

2
src/flash/str7x.c
View File

@ -315,7 +315,7 @@ static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_
uint32_t buffer_size = 8192; uint32_t buffer_size = 8192;
working_area_t *source; working_area_t *source;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
reg_param_t reg_params[6]; struct reg_param reg_params[6];
armv4_5_algorithm_t armv4_5_info; armv4_5_algorithm_t armv4_5_info;
int retval = ERROR_OK; int retval = ERROR_OK;

2
src/flash/str9x.c
View File

@ -353,7 +353,7 @@ static int str9x_write_block(struct flash_bank_s *bank,
uint32_t buffer_size = 8192; uint32_t buffer_size = 8192;
working_area_t *source; working_area_t *source;
uint32_t address = bank->base + offset; uint32_t address = bank->base + offset;
reg_param_t reg_params[4]; struct reg_param reg_params[4];
armv4_5_algorithm_t armv4_5_info; armv4_5_algorithm_t armv4_5_info;
int retval = ERROR_OK; int retval = ERROR_OK;

4
src/target/algorithm.c
View File

@ -39,7 +39,7 @@ void destroy_mem_param(struct mem_param *param)
param->value = NULL; param->value = NULL;
} }
void init_reg_param(reg_param_t *param, char *reg_name, uint32_t size, enum param_direction direction) void init_reg_param(struct reg_param *param, char *reg_name, uint32_t size, enum param_direction direction)
{ {
param->reg_name = reg_name; param->reg_name = reg_name;
param->size = size; param->size = size;
@ -47,7 +47,7 @@ void init_reg_param(reg_param_t *param, char *reg_name, uint32_t size, enum para
param->direction = direction; param->direction = direction;
} }
void destroy_reg_param(reg_param_t *param) void destroy_reg_param(struct reg_param *param)
{ {
free(param->value); free(param->value);
param->value = NULL; param->value = NULL;

8
src/target/algorithm.h
View File

@ -37,20 +37,20 @@ struct mem_param
enum param_direction direction; enum param_direction direction;
}; };
typedef struct reg_param_s struct reg_param
{ {
char *reg_name; char *reg_name;
uint32_t size; uint32_t size;
uint8_t *value; uint8_t *value;
enum param_direction direction; enum param_direction direction;
} reg_param_t; };
void init_mem_param(struct mem_param *param, void init_mem_param(struct mem_param *param,
uint32_t address, uint32_t size, enum param_direction dir); uint32_t address, uint32_t size, enum param_direction dir);
void destroy_mem_param(struct mem_param *param); void destroy_mem_param(struct mem_param *param);
void init_reg_param(reg_param_t *param, void init_reg_param(struct reg_param *param,
char *reg_name, uint32_t size, enum param_direction dir); char *reg_name, uint32_t size, enum param_direction dir);
void destroy_reg_param(reg_param_t *param); void destroy_reg_param(struct reg_param *param);
#endif /* ALGORITHM_H */ #endif /* ALGORITHM_H */

2
src/target/arm11.c
View File

@ -1615,7 +1615,7 @@ static int arm11_remove_watchpoint(struct target_s *target,
/* target algorithm support */ /* target algorithm support */
static int arm11_run_algorithm(struct target_s *target, static int arm11_run_algorithm(struct target_s *target,
int num_mem_params, struct mem_param *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_params, int num_reg_params, struct reg_param *reg_params,
uint32_t entry_point, uint32_t exit_point, uint32_t entry_point, uint32_t exit_point,
int timeout_ms, void *arch_info) int timeout_ms, void *arch_info)
{ {

8
src/target/arm7_9_common.c
View File

@ -2654,7 +2654,7 @@ static const uint32_t dcc_code[] =
0xeafffff9 /* b w */ 0xeafffff9 /* b w */
}; };
int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, reg_param_t *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info, int (*run_it)(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info)); int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info, int (*run_it)(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info));
int arm7_9_bulk_write_memory(target_t *target, uint32_t address, uint32_t count, uint8_t *buffer) int arm7_9_bulk_write_memory(target_t *target, uint32_t address, uint32_t count, uint8_t *buffer)
{ {
@ -2691,7 +2691,7 @@ int arm7_9_bulk_write_memory(target_t *target, uint32_t address, uint32_t count,
} }
armv4_5_algorithm_t armv4_5_info; armv4_5_algorithm_t armv4_5_info;
reg_param_t reg_params[1]; struct reg_param reg_params[1];
armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
armv4_5_info.core_mode = ARMV4_5_MODE_SVC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
@ -2725,7 +2725,7 @@ int arm7_9_checksum_memory(struct target_s *target, uint32_t address, uint32_t c
{ {
working_area_t *crc_algorithm; working_area_t *crc_algorithm;
armv4_5_algorithm_t armv4_5_info; armv4_5_algorithm_t armv4_5_info;
reg_param_t reg_params[2]; struct reg_param reg_params[2];
int retval; int retval;
static const uint32_t arm7_9_crc_code[] = { static const uint32_t arm7_9_crc_code[] = {
@ -2808,7 +2808,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; working_area_t *erase_check_algorithm;
reg_param_t reg_params[3]; struct reg_param reg_params[3];
armv4_5_algorithm_t armv4_5_info; armv4_5_algorithm_t armv4_5_info;
int retval; int retval;
uint32_t i; uint32_t i;

2
src/target/arm7_9_common.h
View File

@ -141,7 +141,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);
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);
int arm7_9_run_algorithm(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_prams, reg_param_t *reg_param, uint32_t entry_point, void *arch_info); int arm7_9_run_algorithm(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_prams, struct reg_param *reg_param, uint32_t entry_point, void *arch_info);
int arm7_9_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint); int arm7_9_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint); int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint);

4
src/target/armv4_5.c
View File

@ -543,7 +543,7 @@ static int armv4_5_run_algorithm_completion(struct target_s *target, uint32_t ex
return ERROR_OK; return ERROR_OK;
} }
int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, reg_param_t *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info, int (*run_it)(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info)) int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info, int (*run_it)(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info))
{ {
struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target); struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
armv4_5_algorithm_t *armv4_5_algorithm_info = arch_info; armv4_5_algorithm_t *armv4_5_algorithm_info = arch_info;
@ -708,7 +708,7 @@ int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, str
return retval; return retval;
} }
int armv4_5_run_algorithm(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, reg_param_t *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info) int armv4_5_run_algorithm(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info)
{ {
return armv4_5_run_algorithm_inner(target, num_mem_params, mem_params, num_reg_params, reg_params, entry_point, exit_point, timeout_ms, arch_info, armv4_5_run_algorithm_completion); return armv4_5_run_algorithm_inner(target, num_mem_params, mem_params, num_reg_params, reg_params, entry_point, exit_point, timeout_ms, arch_info, armv4_5_run_algorithm_completion);
} }

2
src/target/armv4_5.h
View File

@ -184,7 +184,7 @@ int armv4_5_init_arch_info(target_t *target, armv4_5_common_t *armv4_5);
int armv4_5_run_algorithm(struct target_s *target, int armv4_5_run_algorithm(struct target_s *target,
int num_mem_params, struct mem_param *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_params, int num_reg_params, struct reg_param *reg_params,
uint32_t entry_point, uint32_t exit_point, uint32_t entry_point, uint32_t exit_point,
int timeout_ms, void *arch_info); int timeout_ms, void *arch_info);

6
src/target/armv7m.c
View File

@ -358,7 +358,7 @@ static int armv7m_run_and_wait(struct target_s *target, uint32_t entry_point, in
/** Runs a Thumb algorithm in the target. */ /** Runs a Thumb algorithm in the target. */
int armv7m_run_algorithm(struct target_s *target, int armv7m_run_algorithm(struct target_s *target,
int num_mem_params, struct mem_param *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_params, int num_reg_params, struct reg_param *reg_params,
uint32_t entry_point, uint32_t exit_point, uint32_t entry_point, uint32_t exit_point,
int timeout_ms, void *arch_info) int timeout_ms, void *arch_info)
{ {
@ -590,7 +590,7 @@ int armv7m_checksum_memory(struct target_s *target,
{ {
working_area_t *crc_algorithm; working_area_t *crc_algorithm;
armv7m_algorithm_t armv7m_info; armv7m_algorithm_t armv7m_info;
reg_param_t reg_params[2]; struct reg_param reg_params[2];
int retval; int retval;
static const uint16_t cortex_m3_crc_code[] = { static const uint16_t cortex_m3_crc_code[] = {
@ -672,7 +672,7 @@ 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; working_area_t *erase_check_algorithm;
reg_param_t reg_params[3]; struct reg_param reg_params[3];
armv7m_algorithm_t armv7m_info; armv7m_algorithm_t armv7m_info;
int retval; int retval;
uint32_t i; uint32_t i;

2
src/target/armv7m.h
View File

@ -147,7 +147,7 @@ int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m);
int armv7m_run_algorithm(struct target_s *target, int armv7m_run_algorithm(struct target_s *target,
int num_mem_params, struct mem_param *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_params, int num_reg_params, struct reg_param *reg_params,
uint32_t entry_point, uint32_t exit_point, uint32_t entry_point, uint32_t exit_point,
int timeout_ms, void *arch_info); int timeout_ms, void *arch_info);

2
src/target/mips32.c
View File

@ -336,7 +336,7 @@ int mips32_register_commands(struct command_context_s *cmd_ctx)
return ERROR_OK; return ERROR_OK;
} }
int mips32_run_algorithm(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, reg_param_t *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info) int mips32_run_algorithm(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info)
{ {
/*TODO*/ /*TODO*/
return ERROR_OK; return ERROR_OK;

2
src/target/mips32.h
View File

@ -136,7 +136,7 @@ reg_cache_t *mips32_build_reg_cache(target_t *target);
int mips32_run_algorithm(struct target_s *target, int mips32_run_algorithm(struct target_s *target,
int num_mem_params, struct mem_param *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_params, int num_reg_params, struct reg_param *reg_params,
uint32_t entry_point, uint32_t exit_point, uint32_t entry_point, uint32_t exit_point,
int timeout_ms, void *arch_info); int timeout_ms, void *arch_info);

4
src/target/target.c
View File

@ -559,7 +559,7 @@ static int target_soft_reset_halt_imp(struct target_s *target)
return target->type->soft_reset_halt_imp(target); return target->type->soft_reset_halt_imp(target);
} }
static int target_run_algorithm_imp(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, reg_param_t *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info) static int target_run_algorithm_imp(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info)
{ {
if (!target_was_examined(target)) if (!target_was_examined(target))
{ {
@ -635,7 +635,7 @@ int target_step(struct target_s *target,
int target_run_algorithm(struct target_s *target, int target_run_algorithm(struct target_s *target,
int num_mem_params, struct mem_param *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_param, int num_reg_params, struct reg_param *reg_param,
uint32_t entry_point, uint32_t exit_point, uint32_t entry_point, uint32_t exit_point,
int timeout_ms, void *arch_info) int timeout_ms, void *arch_info)
{ {

2
src/target/target.h
View File

@ -361,7 +361,7 @@ int target_step(struct target_s *target,
*/ */
int target_run_algorithm(struct target_s *target, int target_run_algorithm(struct target_s *target,
int num_mem_params, struct mem_param *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_param, int num_reg_params, struct reg_param *reg_param,
uint32_t entry_point, uint32_t exit_point, uint32_t entry_point, uint32_t exit_point,
int timeout_ms, void *arch_info); int timeout_ms, void *arch_info);

4
src/target/target_type.h
View File

@ -144,12 +144,12 @@ struct target_type_s
int (*remove_watchpoint)(struct target_s *target, watchpoint_t *watchpoint); int (*remove_watchpoint)(struct target_s *target, watchpoint_t *watchpoint);
/* target algorithm support */ /* target algorithm support */
int (*run_algorithm_imp)(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, reg_param_t *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info); int (*run_algorithm_imp)(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info);
/** /**
* Target algorithm support. Do @b not call this method directly, * Target algorithm support. Do @b not call this method directly,
* use target_run_algorithm() instead. * use target_run_algorithm() instead.
*/ */
int (*run_algorithm)(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, reg_param_t *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info); int (*run_algorithm)(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info);
int (*register_commands)(struct command_context_s *cmd_ctx); int (*register_commands)(struct command_context_s *cmd_ctx);