X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=f7e2ad64881e49e731ad968737b65ef3a2882ee7;hb=9ac7cdec82c19481b79f2effcefb7106dd7ade41;hp=ca440a7dfec70bbce79f397888add7c078b7c74d;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;p=openocd.git

diff --git a/src/target/target.c b/src/target/target.c
index ca440a7dfe..f7e2ad6488 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -336,7 +336,7 @@ static struct target *get_target_by_num(int num)
 	return NULL;
 }
 
-struct target* get_current_target(command_context_t *cmd_ctx)
+struct target* get_current_target(struct command_context *cmd_ctx)
 {
 	struct target *target = get_target_by_num(cmd_ctx->current_target);
 
@@ -425,7 +425,7 @@ int target_resume(struct target *target, int current, uint32_t address, int hand
 	return retval;
 }
 
-int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mode reset_mode)
+int target_process_reset(struct command_context *cmd_ctx, enum target_reset_mode reset_mode)
 {
 	char buf[100];
 	int retval;
@@ -644,20 +644,13 @@ int target_run_algorithm(struct target *target,
 			entry_point, exit_point, timeout_ms, arch_info);
 }
 
-/// @returns @c true if the target has been examined.
-bool target_was_examined(struct target *target)
-{
-	return target->type->examined;
-}
-/// Sets the @c examined flag for the given target.
-void target_set_examined(struct target *target)
-{
-	target->type->examined = true;
-}
-// Reset the @c examined flag for the given target.
-void target_reset_examined(struct target *target)
+/**
+ * Reset the @c examined flag for the given target.
+ * Pure paranoia -- targets are zeroed on allocation.
+ */
+static void target_reset_examined(struct target *target)
 {
-	target->type->examined = false;
+	target->examined = false;
 }
 
 
@@ -754,7 +747,7 @@ err_write_phys_memory(struct target *target, uint32_t address,
 	return ERROR_FAIL;
 }
 
-int target_init(struct command_context_s *cmd_ctx)
+int target_init(struct command_context *cmd_ctx)
 {
 	struct target *target;
 	int retval;
@@ -2201,7 +2194,7 @@ COMMAND_HANDLER(handle_step_command)
 	return target->type->step(target, current_pc, addr, 1);
 }
 
-static void handle_md_output(struct command_context_s *cmd_ctx,
+static void handle_md_output(struct command_context *cmd_ctx,
 		struct target *target, uint32_t address, unsigned size,
 		unsigned count, const uint8_t *buffer)
 {
@@ -2256,7 +2249,8 @@ COMMAND_HANDLER(handle_md_command)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	unsigned size = 0;
-	switch (CMD_NAME[2]) {
+	const char *cmd_name = CMD_NAME;
+	switch (cmd_name[6]) {
 	case 'w': size = 4; break;
 	case 'h': size = 2; break;
 	case 'b': size = 1; break;
@@ -2308,6 +2302,7 @@ COMMAND_HANDLER(handle_mw_command)
 	bool physical=strcmp(args[0], "phys")==0;
 	int (*fn)(struct target *target,
 			uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+	const char *cmd_name = CMD_NAME;
 	if (physical)
 	{
 		argc--;
@@ -2333,7 +2328,7 @@ COMMAND_HANDLER(handle_mw_command)
 	struct target *target = get_current_target(cmd_ctx);
 	unsigned wordsize;
 	uint8_t value_buf[4];
-	switch (CMD_NAME[2])
+	switch (cmd_name[6])
 	{
 		case 'w':
 			wordsize = 4;
@@ -2709,7 +2704,7 @@ COMMAND_HANDLER(handle_test_image_command)
 	return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, 0);
 }
 
-static int handle_bp_command_list(struct command_context_s *cmd_ctx)
+static int handle_bp_command_list(struct command_context *cmd_ctx)
 {
 	struct target *target = get_current_target(cmd_ctx);
 	struct breakpoint *breakpoint = target->breakpoints;
@@ -2737,7 +2732,7 @@ static int handle_bp_command_list(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-static int handle_bp_command_set(struct command_context_s *cmd_ctx,
+static int handle_bp_command_set(struct command_context *cmd_ctx,
 		uint32_t addr, uint32_t length, int hw)
 {
 	struct target *target = get_current_target(cmd_ctx);
@@ -2801,13 +2796,15 @@ COMMAND_HANDLER(handle_wp_command)
 
 		while (watchpoint)
 		{
-			command_print(cmd_ctx,
-						  "address: 0x%8.8" PRIx32 ", len: 0x%8.8x, r/w/a: %i, value: 0x%8.8" PRIx32 ", mask: 0x%8.8" PRIx32 "",
-						  watchpoint->address,
-						  watchpoint->length,
-						  (int)(watchpoint->rw),
-						  watchpoint->value,
-						  watchpoint->mask);
+			command_print(cmd_ctx, "address: 0x%8.8" PRIx32
+					", len: 0x%8.8" PRIx32
+					", r/w/a: %i, value: 0x%8.8" PRIx32
+					", mask: 0x%8.8" PRIx32,
+					watchpoint->address,
+					watchpoint->length,
+					(int)watchpoint->rw,
+					watchpoint->value,
+					watchpoint->mask);
 			watchpoint = watchpoint->next;
 		}
 		return ERROR_OK;
@@ -3132,7 +3129,7 @@ static int new_int_array_element(Jim_Interp * interp, const char *varname, int i
 
 static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-	command_context_t *context;
+	struct command_context *context;
 	struct target *target;
 
 	context = Jim_GetAssocData(interp, "context");
@@ -3321,7 +3318,7 @@ static int get_int_array_element(Jim_Interp * interp, const char *varname, int i
 
 static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-	command_context_t *context;
+	struct command_context *context;
 	struct target *target;
 
 	context = Jim_GetAssocData(interp, "context");
@@ -3822,7 +3819,7 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	uint8_t  target_buf[32];
 	Jim_Nvp *n;
 	struct target *target;
-	struct command_context_s *cmd_ctx;
+	struct command_context *cmd_ctx;
 	int e;
 
 	enum {
@@ -4238,7 +4235,7 @@ static int target_create(Jim_GetOptInfo *goi)
 	int e;
 	int x;
 	struct target *target;
-	struct command_context_s *cmd_ctx;
+	struct command_context *cmd_ctx;
 
 	cmd_ctx = Jim_GetAssocData(goi->interp, "context");
 	if (goi->argc < 3) {
@@ -4390,7 +4387,7 @@ static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
 	int x,r,e;
 	jim_wide w;
-	struct command_context_s *cmd_ctx;
+	struct command_context *cmd_ctx;
 	struct target *target;
 	Jim_GetOptInfo goi;
 	enum tcmd {
@@ -4679,7 +4676,7 @@ COMMAND_HANDLER(handle_fast_load_command)
 
 static int jim_mcrmrc(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-	command_context_t *context;
+	struct command_context *context;
 	struct target *target;
 	int retval;
 
@@ -4763,7 +4760,7 @@ static int jim_mcrmrc(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	return JIM_OK;
 }
 
-int target_register_commands(struct command_context_s *cmd_ctx)
+int target_register_commands(struct command_context *cmd_ctx)
 {
 
 	register_command(cmd_ctx, NULL, "targets",
@@ -4776,7 +4773,7 @@ int target_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-int target_register_user_commands(struct command_context_s *cmd_ctx)
+int target_register_user_commands(struct command_context *cmd_ctx)
 {
 	int retval = ERROR_OK;
 	if ((retval = target_request_register_commands(cmd_ctx)) != ERROR_OK)