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

mem_param_t -> struct mem_param 

Remove misleading typedef and redundant suffix from struct mem_param.
This commit is contained in:
Zachary T Welch 2009-11-13 08:39:30 -08:00
parent 996613522d
commit 6c965a3da9
15 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/flash/lpc2000.c
View File

@ -239,7 +239,7 @@ static int lpc2000_iap_call(flash_bank_t *bank, int code, uint32_t param_table[5
int retval; int retval;
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;
mem_param_t mem_params[2]; struct mem_param mem_params[2];
reg_param_t reg_params[5]; reg_param_t 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 */

4
src/target/algorithm.c
View File

@ -25,7 +25,7 @@
#include "binarybuffer.h" #include "binarybuffer.h"
void init_mem_param(mem_param_t *param, uint32_t address, uint32_t size, enum param_direction direction) void init_mem_param(struct mem_param *param, uint32_t address, uint32_t size, enum param_direction direction)
{ {
param->address = address; param->address = address;
param->size = size; param->size = size;
@ -33,7 +33,7 @@ void init_mem_param(mem_param_t *param, uint32_t address, uint32_t size, enum pa
param->direction = direction; param->direction = direction;
} }
void destroy_mem_param(mem_param_t *param) void destroy_mem_param(struct mem_param *param)
{ {
free(param->value); free(param->value);
param->value = NULL; param->value = NULL;

8
src/target/algorithm.h
View File

@ -29,13 +29,13 @@ enum param_direction
PARAM_IN_OUT PARAM_IN_OUT
}; };
typedef struct mem_param_s struct mem_param
{ {
uint32_t address; uint32_t address;
uint32_t size; uint32_t size;
uint8_t *value; uint8_t *value;
enum param_direction direction; enum param_direction direction;
} mem_param_t; };
typedef struct reg_param_s typedef struct reg_param_s
{ {
@ -45,9 +45,9 @@ typedef struct reg_param_s
enum param_direction direction; enum param_direction direction;
} reg_param_t; } reg_param_t;
void init_mem_param(mem_param_t *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(mem_param_t *param); void destroy_mem_param(struct mem_param *param);
void init_reg_param(reg_param_t *param, void init_reg_param(reg_param_t *param,
char *reg_name, uint32_t size, enum param_direction dir); char *reg_name, uint32_t size, enum param_direction dir);

2
src/target/arm11.c
View File

@ -1614,7 +1614,7 @@ static int arm11_remove_watchpoint(struct target_s *target,
// HACKHACKHACK - FIXME mode/state // HACKHACKHACK - FIXME mode/state
/* 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, mem_param_t *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_params, int num_reg_params, reg_param_t *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/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, mem_param_t *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, 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 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)
{ {

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, mem_param_t *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, reg_param_t *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, mem_param_t *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, 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))
{ {
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, mem
return retval; return retval;
} }
int armv4_5_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t *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, reg_param_t *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

@ -183,7 +183,7 @@ int armv4_5_register_commands(struct command_context_s *cmd_ctx);
int armv4_5_init_arch_info(target_t *target, armv4_5_common_t *armv4_5); 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, mem_param_t *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_params, int num_reg_params, reg_param_t *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/armv7m.c
View File

@ -357,7 +357,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, mem_param_t *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_params, int num_reg_params, reg_param_t *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/armv7m.h
View File

@ -146,7 +146,7 @@ int armv7m_register_commands(struct command_context_s *cmd_ctx);
int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m); 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, mem_param_t *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_params, int num_reg_params, reg_param_t *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, mem_param_t *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, reg_param_t *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

@ -135,7 +135,7 @@ int mips32_save_context(target_t *target);
reg_cache_t *mips32_build_reg_cache(target_t *target); 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, mem_param_t *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_params, int num_reg_params, reg_param_t *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, mem_param_t *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, reg_param_t *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))
{ {
@ -634,7 +634,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, mem_param_t *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_param, int num_reg_params, reg_param_t *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

@ -360,7 +360,7 @@ int target_step(struct target_s *target,
* This routine is a wrapper for target->type->run_algorithm. * This routine is a wrapper for target->type->run_algorithm.
*/ */
int target_run_algorithm(struct target_s *target, int target_run_algorithm(struct target_s *target,
int num_mem_params, mem_param_t *mem_params, int num_mem_params, struct mem_param *mem_params,
int num_reg_params, reg_param_t *reg_param, int num_reg_params, reg_param_t *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, mem_param_t *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, reg_param_t *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, mem_param_t *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, reg_param_t *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);