Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
card10
openocd
Commits
6c965a3d
Commit
6c965a3d
authored
Nov 13, 2009
by
Zachary T Welch
Browse files
mem_param_t -> struct mem_param
Remove misleading typedef and redundant suffix from struct mem_param.
parent
99661352
Changes
15
Hide whitespace changes
Inline
Side-by-side
src/flash/lpc2000.c
View file @
6c965a3d
...
...
@@ -239,7 +239,7 @@ static int lpc2000_iap_call(flash_bank_t *bank, int code, uint32_t param_table[5
int
retval
;
struct
lpc2000_flash_bank
*
lpc2000_info
=
bank
->
driver_priv
;
target_t
*
target
=
bank
->
target
;
mem_param
_t
mem_params
[
2
];
struct
mem_param
mem_params
[
2
];
reg_param_t
reg_params
[
5
];
armv4_5_algorithm_t
armv4_5_info
;
/* for LPC2000 */
armv7m_algorithm_t
armv7m_info
;
/* for LPC1700 */
...
...
src/target/algorithm.c
View file @
6c965a3d
...
...
@@ -25,7 +25,7 @@
#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
->
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
;
}
void
destroy_mem_param
(
mem_param
_t
*
param
)
void
destroy_mem_param
(
struct
mem_param
*
param
)
{
free
(
param
->
value
);
param
->
value
=
NULL
;
...
...
src/target/algorithm.h
View file @
6c965a3d
...
...
@@ -29,13 +29,13 @@ enum param_direction
PARAM_IN_OUT
};
typedef
struct
mem_param
_s
struct
mem_param
{
uint32_t
address
;
uint32_t
size
;
uint8_t
*
value
;
enum
param_direction
direction
;
}
mem_param_t
;
};
typedef
struct
reg_param_s
{
...
...
@@ -45,9 +45,9 @@ typedef struct reg_param_s
enum
param_direction
direction
;
}
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
);
void
destroy_mem_param
(
mem_param
_t
*
param
);
void
destroy_mem_param
(
struct
mem_param
*
param
);
void
init_reg_param
(
reg_param_t
*
param
,
char
*
reg_name
,
uint32_t
size
,
enum
param_direction
dir
);
...
...
src/target/arm11.c
View file @
6c965a3d
...
...
@@ -1614,7 +1614,7 @@ static int arm11_remove_watchpoint(struct target_s *target,
// HACKHACKHACK - FIXME mode/state
/* target algorithm support */
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
,
uint32_t
entry_point
,
uint32_t
exit_point
,
int
timeout_ms
,
void
*
arch_info
)
...
...
src/target/arm7_9_common.c
View file @
6c965a3d
...
...
@@ -2654,7 +2654,7 @@ static const uint32_t dcc_code[] =
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
)
{
...
...
src/target/arm7_9_common.h
View file @
6c965a3d
...
...
@@ -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_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_remove_breakpoint
(
struct
target_s
*
target
,
breakpoint_t
*
breakpoint
);
...
...
src/target/armv4_5.c
View file @
6c965a3d
...
...
@@ -543,7 +543,7 @@ static int armv4_5_run_algorithm_completion(struct target_s *target, uint32_t ex
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
);
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
;
}
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
);
}
...
...
src/target/armv4_5.h
View file @
6c965a3d
...
...
@@ -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_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
,
uint32_t
entry_point
,
uint32_t
exit_point
,
int
timeout_ms
,
void
*
arch_info
);
...
...
src/target/armv7m.c
View file @
6c965a3d
...
...
@@ -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. */
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
,
uint32_t
entry_point
,
uint32_t
exit_point
,
int
timeout_ms
,
void
*
arch_info
)
...
...
src/target/armv7m.h
View file @
6c965a3d
...
...
@@ -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_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
,
uint32_t
entry_point
,
uint32_t
exit_point
,
int
timeout_ms
,
void
*
arch_info
);
...
...
src/target/mips32.c
View file @
6c965a3d
...
...
@@ -336,7 +336,7 @@ int mips32_register_commands(struct command_context_s *cmd_ctx)
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*/
return
ERROR_OK
;
...
...
src/target/mips32.h
View file @
6c965a3d
...
...
@@ -135,7 +135,7 @@ int mips32_save_context(target_t *target);
reg_cache_t
*
mips32_build_reg_cache
(
target_t
*
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
,
uint32_t
entry_point
,
uint32_t
exit_point
,
int
timeout_ms
,
void
*
arch_info
);
...
...
src/target/target.c
View file @
6c965a3d
...
...
@@ -559,7 +559,7 @@ static int target_soft_reset_halt_imp(struct target_s *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
))
{
...
...
@@ -634,7 +634,7 @@ int target_step(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
,
uint32_t
entry_point
,
uint32_t
exit_point
,
int
timeout_ms
,
void
*
arch_info
)
...
...
src/target/target.h
View file @
6c965a3d
...
...
@@ -360,7 +360,7 @@ int target_step(struct target_s *target,
* This routine is a wrapper for target->type->run_algorithm.
*/
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
,
uint32_t
entry_point
,
uint32_t
exit_point
,
int
timeout_ms
,
void
*
arch_info
);
...
...
src/target/target_type.h
View file @
6c965a3d
...
...
@@ -144,12 +144,12 @@ struct target_type_s
int
(
*
remove_watchpoint
)(
struct
target_s
*
target
,
watchpoint_t
*
watchpoint
);
/* 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,
* 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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment