X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=44fe6bc9ae6f0f333e570aa950ce45f9c6163f78;hp=26c20cf389c16f77a9338043561d26b62a2646d6;hb=6c965a3da9cd6f5b2cf1b177d38723356c83d923;hpb=63a26b421b1731df5826a157ea633b9d2c02aaee

diff --git a/src/target/target.c b/src/target/target.c
index 26c20cf389..44fe6bc9ae 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, 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)
@@ -2046,7 +2046,7 @@ COMMAND_HANDLER(handle_wait_halt_command)
 		int retval = parse_uint(args[0], &ms);
 		if (ERROR_OK != retval)
 		{
-			command_print(cmd_ctx, "usage: %s [seconds]", cmd);
+			command_print(cmd_ctx, "usage: %s [seconds]", CMD_NAME);
 			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
 		// convert seconds (given) to milliseconds (needed)
@@ -2121,7 +2121,7 @@ COMMAND_HANDLER(handle_halt_command)
 			return ERROR_OK;
 	}
 
-	return handle_wait_halt_command(cmd_ctx, cmd, args, argc);
+	return CALL_COMMAND_HANDLER(handle_wait_halt_command);
 }
 
 COMMAND_HANDLER(handle_soft_reset_halt_command)
@@ -2256,7 +2256,7 @@ COMMAND_HANDLER(handle_md_command)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	unsigned size = 0;
-	switch (cmd[2]) {
+	switch (CMD_NAME[2]) {
 	case 'w': size = 4; break;
 	case 'h': size = 2; break;
 	case 'b': size = 1; break;
@@ -2333,7 +2333,7 @@ COMMAND_HANDLER(handle_mw_command)
 	target_t *target = get_current_target(cmd_ctx);
 	unsigned wordsize;
 	uint8_t value_buf[4];
-	switch (cmd[2])
+	switch (CMD_NAME[2])
 	{
 		case 'w':
 			wordsize = 4;
@@ -2410,7 +2410,7 @@ COMMAND_HANDLER(handle_load_image_command)
 	int i;
 	image_t image;
 
-	int retval = parse_load_image_command_args(cmd_ctx, cmd, args, argc,
+	int retval = CALL_COMMAND_HANDLER(parse_load_image_command_args,
 			&image, &min_address, &max_address);
 	if (ERROR_OK != retval)
 		return retval;
@@ -2493,7 +2493,7 @@ COMMAND_HANDLER(handle_load_image_command)
 
 COMMAND_HANDLER(handle_dump_image_command)
 {
-	fileio_t fileio;
+	struct fileio fileio;
 
 	uint8_t buffer[560];
 	int retvaltemp;
@@ -2701,12 +2701,12 @@ done:
 
 COMMAND_HANDLER(handle_verify_image_command)
 {
-	return handle_verify_image_command_internal(cmd_ctx, cmd, args, argc, 1);
+	return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, 1);
 }
 
 COMMAND_HANDLER(handle_test_image_command)
 {
-	return handle_verify_image_command_internal(cmd_ctx, cmd, args, argc, 0);
+	return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, 0);
 }
 
 static int handle_bp_command_list(struct command_context_s *cmd_ctx)
@@ -3785,7 +3785,7 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
 		case TCFG_CHAIN_POSITION:
 			if (goi->isconfigure) {
 				Jim_Obj *o;
-				jtag_tap_t *tap;
+				struct jtag_tap *tap;
 				target_free_all_working_areas(target);
 				e = Jim_GetOpt_Obj(goi, &o);
 				if (e != JIM_OK) {
@@ -4547,7 +4547,7 @@ COMMAND_HANDLER(handle_fast_load_image_command)
 
 	image_t image;
 
-	int retval = parse_load_image_command_args(cmd_ctx, cmd, args, argc,
+	int retval = CALL_COMMAND_HANDLER(parse_load_image_command_args,
 			&image, &min_address, &max_address);
 	if (ERROR_OK != retval)
 		return retval;