From ac927559c3ce5406adac34b9d4ca4ecb37a48181 Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Fri, 13 Nov 2009 09:52:20 -0800
Subject: [PATCH] target_type_t -> struct target_type

Remove misleading typedef and redundant suffix from struct target_type.
---
 src/ecosboard.c          |  2 +-
 src/target/arm11.c       |  2 +-
 src/target/arm720t.c     |  2 +-
 src/target/arm7tdmi.c    |  2 +-
 src/target/arm920t.c     |  2 +-
 src/target/arm926ejs.c   |  2 +-
 src/target/arm966e.c     |  2 +-
 src/target/arm9tdmi.c    |  2 +-
 src/target/avrt.c        |  2 +-
 src/target/cortex_a8.c   |  2 +-
 src/target/cortex_m3.c   |  2 +-
 src/target/fa526.c       |  2 +-
 src/target/feroceon.c    |  4 ++--
 src/target/mips_m4k.c    |  2 +-
 src/target/target.c      | 40 ++++++++++++++++++++--------------------
 src/target/target.h      |  7 ++-----
 src/target/target_type.h |  2 +-
 src/target/xscale.c      |  2 +-
 18 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 8d85fe61bc..455c93c05c 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -115,7 +115,7 @@ char hwaddr[512];
 
 
 extern struct flash_driver *flash_drivers[];
-extern target_type_t *target_types[];
+extern struct target_type *target_types[];
 
 #ifdef CYGPKG_PROFILE_GPROF
 #include <cyg/profile/profile.h>
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 42c33af78c..22925c8e86 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -2197,7 +2197,7 @@ COMMAND_HANDLER(arm11_handle_etmw)
 
 #define ARM11_HANDLER(x)	.x = arm11_##x
 
-target_type_t arm11_target = {
+struct target_type arm11_target = {
 		.name = "arm11",
 
 		ARM11_HANDLER(poll),
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 8ef7114e63..b258e2f9ce 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -510,7 +510,7 @@ static int arm720t_register_commands(struct command_context_s *cmd_ctx)
 }
 
 /** Holds methods for ARM720 targets. */
-target_type_t arm720t_target =
+struct target_type arm720t_target =
 {
 	.name = "arm720t",
 
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index d1509cbb68..aea012dc07 100644
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -753,7 +753,7 @@ static int arm7tdmi_target_create(struct target_s *target, Jim_Interp *interp)
 }
 
 /** Holds methods for ARM7TDMI targets. */
-target_type_t arm7tdmi_target =
+struct target_type arm7tdmi_target =
 {
 	.name = "arm7tdmi",
 
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 2fe50a132f..32f4a2fff0 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -1380,7 +1380,7 @@ int arm920t_register_commands(struct command_context_s *cmd_ctx)
 }
 
 /** Holds methods for ARM920 targets. */
-target_type_t arm920t_target =
+struct target_type arm920t_target =
 {
 	.name = "arm920t",
 
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 9ae19a878e..fd8e0b6a33 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -842,7 +842,7 @@ int arm926ejs_register_commands(struct command_context_s *cmd_ctx)
 }
 
 /** Holds methods for ARM926 targets. */
-target_type_t arm926ejs_target =
+struct target_type arm926ejs_target =
 {
 	.name = "arm926ejs",
 
diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index dee9f612ad..7c46f0fd57 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -233,7 +233,7 @@ int arm966e_register_commands(struct command_context_s *cmd_ctx)
 }
 
 /** Holds methods for ARM966 targets. */
-target_type_t arm966e_target =
+struct target_type arm966e_target =
 {
 	.name = "arm966e",
 
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index c670c454e0..1edb6264c0 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -953,7 +953,7 @@ int arm9tdmi_register_commands(struct command_context_s *cmd_ctx)
 }
 
 /** Holds methods for ARM9TDMI targets. */
-target_type_t arm9tdmi_target =
+struct target_type arm9tdmi_target =
 {
 	.name = "arm9tdmi",
 
diff --git a/src/target/avrt.c b/src/target/avrt.c
index d7c7623d84..ad22c99d11 100644
--- a/src/target/avrt.c
+++ b/src/target/avrt.c
@@ -59,7 +59,7 @@ int mcu_write_ir_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int
 int mcu_write_dr_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int dr_len, int rti);
 int mcu_execute_queue(void);
 
-target_type_t avr_target =
+struct target_type avr_target =
 {
 	.name = "avr",
 
diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index e1bd2e3241..f92531152b 100644
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -1569,7 +1569,7 @@ static int cortex_a8_register_commands(struct command_context_s *cmd_ctx)
 	return retval;
 }
 
-target_type_t cortexa8_target = {
+struct target_type cortexa8_target = {
 	.name = "cortex_a8",
 
 	.poll = cortex_a8_poll,
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index bbdc85a24a..9f9016d2ca 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -1951,7 +1951,7 @@ static int cortex_m3_register_commands(struct command_context_s *cmd_ctx)
 	return retval;
 }
 
-target_type_t cortexm3_target =
+struct target_type cortexm3_target =
 {
 	.name = "cortex_m3",
 
diff --git a/src/target/fa526.c b/src/target/fa526.c
index 3b884c69d7..d9b89f2a4c 100644
--- a/src/target/fa526.c
+++ b/src/target/fa526.c
@@ -358,7 +358,7 @@ static int fa526_target_create(struct target_s *target, Jim_Interp *interp)
 }
 
 /** Holds methods for FA526 targets. */
-target_type_t fa526_target =
+struct target_type fa526_target =
 {
 	.name = "fa526",
 
diff --git a/src/target/feroceon.c b/src/target/feroceon.c
index cf034c4289..73292e1077 100644
--- a/src/target/feroceon.c
+++ b/src/target/feroceon.c
@@ -674,7 +674,7 @@ int feroceon_examine(struct target_s *target)
 	return ERROR_OK;
 }
 
-target_type_t feroceon_target =
+struct target_type feroceon_target =
 {
 	.name = "feroceon",
 
@@ -712,7 +712,7 @@ target_type_t feroceon_target =
 	.examine = feroceon_examine,
 };
 
-target_type_t dragonite_target =
+struct target_type dragonite_target =
 {
 	.name = "dragonite",
 
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 095260c3db..9213ae0c62 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -48,7 +48,7 @@ int mips_m4k_assert_reset(target_t *target);
 int mips_m4k_deassert_reset(target_t *target);
 int mips_m4k_checksum_memory(target_t *target, uint32_t address, uint32_t size, uint32_t *checksum);
 
-target_type_t mips_m4k_target =
+struct target_type mips_m4k_target =
 {
 	.name = "mips_m4k",
 
diff --git a/src/target/target.c b/src/target/target.c
index df8496f576..16497b4527 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -49,23 +49,23 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
 static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv);
 
 /* targets */
-extern target_type_t arm7tdmi_target;
-extern target_type_t arm720t_target;
-extern target_type_t arm9tdmi_target;
-extern target_type_t arm920t_target;
-extern target_type_t arm966e_target;
-extern target_type_t arm926ejs_target;
-extern target_type_t fa526_target;
-extern target_type_t feroceon_target;
-extern target_type_t dragonite_target;
-extern target_type_t xscale_target;
-extern target_type_t cortexm3_target;
-extern target_type_t cortexa8_target;
-extern target_type_t arm11_target;
-extern target_type_t mips_m4k_target;
-extern target_type_t avr_target;
-
-target_type_t *target_types[] =
+extern struct target_type arm7tdmi_target;
+extern struct target_type arm720t_target;
+extern struct target_type arm9tdmi_target;
+extern struct target_type arm920t_target;
+extern struct target_type arm966e_target;
+extern struct target_type arm926ejs_target;
+extern struct target_type fa526_target;
+extern struct target_type feroceon_target;
+extern struct target_type dragonite_target;
+extern struct target_type xscale_target;
+extern struct target_type cortexm3_target;
+extern struct target_type cortexa8_target;
+extern struct target_type arm11_target;
+extern struct target_type mips_m4k_target;
+extern struct target_type avr_target;
+
+struct target_type *target_types[] =
 {
 	&arm7tdmi_target,
 	&arm9tdmi_target,
@@ -760,7 +760,7 @@ int target_init(struct command_context_s *cmd_ctx)
 	int retval;
 
 	for (target = all_targets; target; target = target->next) {
-		struct target_type_s *type = target->type;
+		struct target_type *type = target->type;
 
 		target_reset_examined(target);
 		if (target->type->examine == NULL)
@@ -4290,9 +4290,9 @@ static int target_create(Jim_GetOptInfo *goi)
 	target->target_number = new_target_number();
 
 	/* allocate memory for each unique target type */
-	target->type = (target_type_t*)calloc(1,sizeof(target_type_t));
+	target->type = (struct target_type*)calloc(1,sizeof(struct target_type));
 
-	memcpy(target->type, target_types[x], sizeof(target_type_t));
+	memcpy(target->type, target_types[x], sizeof(struct target_type));
 
 	/* will be set by "-endian" */
 	target->endianness = TARGET_ENDIAN_UNKNOWN;
diff --git a/src/target/target.h b/src/target/target.h
index 3eafc18a30..50e8c624eb 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -124,13 +124,10 @@ struct working_area
 	struct working_area *next;
 };
 
-// target_type.h contains the full definitionof struct target_type_s
-struct target_type_s;
-typedef struct target_type_s target_type_t;
-
+// target_type.h contains the full definitionof struct target_type
 typedef struct target_s
 {
-	target_type_t *type;				/* target type definition (name, access functions) */
+	struct target_type *type;				/* target type definition (name, access functions) */
 	const char *cmd_name;				/* tcl Name of target */
 	int target_number;					/* DO NOT USE!  field to be removed in 2010 */
 	struct jtag_tap *tap;					/* where on the jtag chain is this */
diff --git a/src/target/target_type.h b/src/target/target_type.h
index 3328879762..98d8665e4f 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -30,7 +30,7 @@
 
 struct target_s;
 
-struct target_type_s
+struct target_type
 {
 	/**
 	 * Name of the target.  Do @b not access this field directly, use
diff --git a/src/target/xscale.c b/src/target/xscale.c
index fb265eaf69..33dd356418 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -3606,7 +3606,7 @@ static int xscale_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-target_type_t xscale_target =
+struct target_type xscale_target =
 {
 	.name = "xscale",
 
-- 
2.30.2