diff --git a/src/flash/aduc702x.c b/src/flash/aduc702x.c
index ea9e840012e67022b43caa472bc9474ec6b66180..931db5a75286bb035107b82613db236f7f53d216 100644
--- a/src/flash/aduc702x.c
+++ b/src/flash/aduc702x.c
@@ -163,7 +163,7 @@ static int aduc702x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint
uint32_t buffer_size = 7000;
working_area_t *source;
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;
int retval = ERROR_OK;
diff --git a/src/flash/arm_nandio.c b/src/flash/arm_nandio.c
index 8087221abded469e03a83b93632fa1bcc2889dbd..0453656eac112cd19e77f29a8eb4188e976fbdee 100644
--- a/src/flash/arm_nandio.c
+++ b/src/flash/arm_nandio.c
@@ -44,7 +44,7 @@ int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
target_t *target = nand->target;
armv4_5_algorithm_t algo;
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 exit = 0;
int retval;
diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index 3fa49170a8b73080cc3adcb2af4a6b6e8f003fbe..fd9c2a74f2269b38b6462a40da0e30e3eba61e15 100644
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -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;
target_t *target = bank->target;
- reg_param_t reg_params[7];
+ struct reg_param reg_params[7];
armv4_5_algorithm_t armv4_5_info;
working_area_t *source;
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_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
target_t *target = bank->target;
- reg_param_t reg_params[10];
+ struct reg_param reg_params[10];
armv4_5_algorithm_t armv4_5_info;
working_area_t *source;
uint32_t buffer_size = 32768;
diff --git a/src/flash/ecos.c b/src/flash/ecos.c
index 5a0d7ec923514dbcf6247e60c03c58766cb36073..97566d4a503b0a7ac1c1dfecf4b6daa6ddc87e5f 100644
--- a/src/flash/ecos.c
+++ b/src/flash/ecos.c
@@ -206,7 +206,7 @@ static int runCode(struct ecosflash_flash_bank *info,
{
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_info.common_magic = ARMV4_5_COMMON_MAGIC;
armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index ab2b1c8ef55f22dd93e21fc4393d8ea4763da603..05c08dd6e80aef02c283ef8fe7d14535c7b9d893 100644
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -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;
target_t *target = bank->target;
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 */
armv7m_algorithm_t armv7m_info; /* for LPC1700 */
uint32_t status_code;
diff --git a/src/flash/lpc2900.c b/src/flash/lpc2900.c
index 5255f56f5105334e7a9376391f05c2a93bd75911..8d1eeb8f4e099bea5d7bb438df23ecf051552853 100644
--- a/src/flash/lpc2900.c
+++ b/src/flash/lpc2900.c
@@ -1313,7 +1313,7 @@ static int lpc2900_write(struct flash_bank_s *bank, uint8_t *buffer,
if( warea )
{
- reg_param_t reg_params[5];
+ struct reg_param reg_params[5];
armv4_5_algorithm_t armv4_5_info;
/* We can use target mode. Download the algorithm. */
diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index 7799800659db024c32869297aef8090ed1a88d80..bc5d10a8e404f02eda39fab18f0ac60a860785a0 100644
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -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 *write_algorithm;
uint32_t address = bank->base + offset;
- reg_param_t reg_params[3];
+ struct reg_param reg_params[3];
armv7m_algorithm_t armv7m_info;
int retval = ERROR_OK;
diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index 1b2486dcadb91156045430546863b7f9029a3207..e69fb564af82f279d2368a219f15a34c1be9d2e1 100644
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -437,7 +437,7 @@ static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32
uint32_t buffer_size = 16384;
working_area_t *source;
uint32_t address = bank->base + offset;
- reg_param_t reg_params[4];
+ struct reg_param reg_params[4];
armv7m_algorithm_t armv7m_info;
int retval = ERROR_OK;
diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 84a246a454f0f62b2af46090b272df0160377e36..c594c9669852af9ab54f2ebcee37955ab656f90b 100644
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -315,7 +315,7 @@ static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_
uint32_t buffer_size = 8192;
working_area_t *source;
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;
int retval = ERROR_OK;
diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 77f9ddfd7742474a3e7ece22d639c33d0e58e225..c3649085262e25a3b9e87f254c750ff3632df7db 100644
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -353,7 +353,7 @@ static int str9x_write_block(struct flash_bank_s *bank,
uint32_t buffer_size = 8192;
working_area_t *source;
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;
int retval = ERROR_OK;
diff --git a/src/target/algorithm.c b/src/target/algorithm.c
index 6d213e0c5d10236a95f17bc166b9876af8611dcd..7643e3cb0391fd40f071c3a193bc1bc5e19b752b 100644
--- a/src/target/algorithm.c
+++ b/src/target/algorithm.c
@@ -39,7 +39,7 @@ void destroy_mem_param(struct mem_param *param)
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->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;
}
-void destroy_reg_param(reg_param_t *param)
+void destroy_reg_param(struct reg_param *param)
{
free(param->value);
param->value = NULL;
diff --git a/src/target/algorithm.h b/src/target/algorithm.h
index 963d1a55c0b888ad3bb66f0a973bfb4fed331777..80f081dbfa99b882ea21b5ac8de3c8d18b541c5f 100644
--- a/src/target/algorithm.h
+++ b/src/target/algorithm.h
@@ -37,20 +37,20 @@ struct mem_param
enum param_direction direction;
};
-typedef struct reg_param_s
+struct reg_param
{
char *reg_name;
uint32_t size;
uint8_t *value;
enum param_direction direction;
-} reg_param_t;
+};
void init_mem_param(struct mem_param *param,
uint32_t address, uint32_t size, enum param_direction dir);
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);
-void destroy_reg_param(reg_param_t *param);
+void destroy_reg_param(struct reg_param *param);
#endif /* ALGORITHM_H */
diff --git a/src/target/arm11.c b/src/target/arm11.c
index d7fca7d3a482a77775d08a0025b630b352ba47dc..2787eca9f074ae3065c8339d0d4f999e0c4c4987 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -1615,7 +1615,7 @@ static int arm11_remove_watchpoint(struct target_s *target,
/* target algorithm support */
static int arm11_run_algorithm(struct target_s *target,
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,
int timeout_ms, void *arch_info)
{
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 66b13df4f5e8fbb1fcbce7b0d8a5f9be39f9b889..0289d3cbf890e6fede288bd2817610b88368adc1 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -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, 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)
{
@@ -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;
- reg_param_t reg_params[1];
+ struct reg_param reg_params[1];
armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
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;
armv4_5_algorithm_t armv4_5_info;
- reg_param_t reg_params[2];
+ struct reg_param reg_params[2];
int retval;
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)
{
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;
int retval;
uint32_t i;
diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index 1a9e173c016be751a55a4c3856aad6e9fed6d566..8a6dce4f68b0061f9a4cd2dac546037f9fade507 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -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, 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_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 12509aa8ad02c8246c5ef3de75dc6371f0061aee..0dd047dd1168f0c8dfe69fb42e6b9e191d8dd17f 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -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, 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);
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;
}
-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);
}
diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h
index e908d54a8bdca5154f805b1dad264e506ee5dd56..c6686f1edf2098a7d37883858e82088e5eb3a53d 100644
--- a/src/target/armv4_5.h
+++ b/src/target/armv4_5.h
@@ -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 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,
int timeout_ms, void *arch_info);
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 36f828b7c2df8cf0e4d0e26eac81da5782595cda..0e3c8a9cbcbc92746887945b3e31c373e06e86d1 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -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. */
int armv7m_run_algorithm(struct target_s *target,
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,
int timeout_ms, void *arch_info)
{
@@ -590,7 +590,7 @@ int armv7m_checksum_memory(struct target_s *target,
{
working_area_t *crc_algorithm;
armv7m_algorithm_t armv7m_info;
- reg_param_t reg_params[2];
+ struct reg_param reg_params[2];
int retval;
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)
{
working_area_t *erase_check_algorithm;
- reg_param_t reg_params[3];
+ struct reg_param reg_params[3];
armv7m_algorithm_t armv7m_info;
int retval;
uint32_t i;
diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 6b51c477906b9302de2edf8ff5d322703149985b..75ba3d94ddca7d73b899181a168a55e2303fd92c 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -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 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,
int timeout_ms, void *arch_info);
diff --git a/src/target/mips32.c b/src/target/mips32.c
index 18bea79a852e968e494727082073c3c9273d669e..055d2788051c9c4f5b754ec8ba9e833bd8c8b1c6 100644
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -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, 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*/
return ERROR_OK;
diff --git a/src/target/mips32.h b/src/target/mips32.h
index 927c2f177fc93eb981655d0507eb22498a677a8e..476b76882fb3370717aa8cf330a883e38b311014 100644
--- a/src/target/mips32.h
+++ b/src/target/mips32.h
@@ -136,7 +136,7 @@ reg_cache_t *mips32_build_reg_cache(target_t *target);
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,
+ int num_reg_params, struct reg_param *reg_params,
uint32_t entry_point, uint32_t exit_point,
int timeout_ms, void *arch_info);
diff --git a/src/target/target.c b/src/target/target.c
index 44fe6bc9ae6f0f333e570aa950ce45f9c6163f78..f56fbc44e6eef69294fc896fd0cbca40c2257927 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -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, 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))
{
@@ -635,7 +635,7 @@ int target_step(struct target_s *target,
int target_run_algorithm(struct target_s *target,
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,
int timeout_ms, void *arch_info)
{
diff --git a/src/target/target.h b/src/target/target.h
index 691a00015a158707bc431f016128495030c0954f..1e5639d6b72a27f0b27282b95c0a3b3b3d35e9ce 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -361,7 +361,7 @@ int target_step(struct target_s *target,
*/
int target_run_algorithm(struct target_s *target,
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,
int timeout_ms, void *arch_info);
diff --git a/src/target/target_type.h b/src/target/target_type.h
index f8c78e20e514980e2a40dd46e938f460b1f0232d..ee76ff4ca1afa1226f4bfc9887ef83496f404fe7 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -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, 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,
* 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);