From 42ef503d37b18d907da16d26e99167566d5aabd1 Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Fri, 13 Nov 2009 03:19:35 -0800
Subject: jtag_tap_t -> struct jtag_tap

Search and destroy the jtag_tap_t typedef.  This also cleans up a
layering violation, removing the declaration from types.h.
---
 src/target/arm11.c         |  2 +-
 src/target/arm11_dbgtap.c  |  2 +-
 src/target/arm720t.c       |  2 +-
 src/target/arm7_9_common.c |  2 +-
 src/target/arm7tdmi.c      |  2 +-
 src/target/arm7tdmi.h      |  2 +-
 src/target/arm920t.c       |  2 +-
 src/target/arm926ejs.c     |  2 +-
 src/target/arm926ejs.h     |  2 +-
 src/target/arm966e.c       |  2 +-
 src/target/arm966e.h       |  2 +-
 src/target/arm9tdmi.c      |  2 +-
 src/target/arm9tdmi.h      |  2 +-
 src/target/arm_jtag.c      |  2 +-
 src/target/arm_jtag.h      |  2 +-
 src/target/avrt.c          | 42 +++++++++++++++++++++---------------------
 src/target/avrt.h          |  2 +-
 src/target/cortex_a8.c     |  2 +-
 src/target/cortex_a8.h     |  2 +-
 src/target/cortex_m3.c     |  2 +-
 src/target/embeddedice.c   |  2 +-
 src/target/embeddedice.h   |  4 ++--
 src/target/etb.c           |  4 ++--
 src/target/etb.h           |  2 +-
 src/target/fa526.c         |  4 ++--
 src/target/mips32.c        |  2 +-
 src/target/mips32.h        |  2 +-
 src/target/mips_ejtag.c    |  4 ++--
 src/target/mips_ejtag.h    |  2 +-
 src/target/mips_m4k.c      |  2 +-
 src/target/target.c        |  2 +-
 src/target/target.h        |  2 +-
 src/target/xscale.c        |  4 ++--
 33 files changed, 58 insertions(+), 58 deletions(-)

(limited to 'src/target')

diff --git a/src/target/arm11.c b/src/target/arm11.c
index 5b11f8e0..1dc1834b 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -2066,7 +2066,7 @@ static const uint32_t arm11_coproc_instruction_limits[] =
 
 static arm11_common_t * arm11_find_target(const char * arg)
 {
-	jtag_tap_t *	tap;
+	struct jtag_tap *	tap;
 	target_t *		t;
 
 	tap = jtag_tap_by_string(arg);
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index fc7a55c5..369576c5 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -100,7 +100,7 @@ void arm11_setup_field(arm11_common_t * arm11, int num_bits, void * out_data, vo
  */
 void arm11_add_IR(arm11_common_t * arm11, uint8_t instr, tap_state_t state)
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	tap = arm11->target->tap;
 
 	if (buf_get_u32(tap->cur_instr, 0, 5) == instr)
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index af326bf4..4e09228b 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -377,7 +377,7 @@ static int arm720t_init_target(struct command_context_s *cmd_ctx, struct target_
 }
 
 static int arm720t_init_arch_info(target_t *target,
-		arm720t_common_t *arm720t, jtag_tap_t *tap)
+		arm720t_common_t *arm720t, struct jtag_tap *tap)
 {
 	arm7tdmi_common_t *arm7tdmi = &arm720t->arm7tdmi_common;
 	arm7_9_common_t *arm7_9 = &arm7tdmi->arm7_9_common;
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 6a56417e..96575d57 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -2611,7 +2611,7 @@ static int arm7_9_dcc_completion(struct target_s *target, uint32_t exit_point, i
 
 		embeddedice_reg_t *ice_reg = arm7_9->eice_cache->reg_list[EICE_COMMS_DATA].arch_info;
 		uint8_t reg_addr = ice_reg->addr & 0x1f;
-		jtag_tap_t *tap;
+		struct jtag_tap *tap;
 		tap = ice_reg->jtag_info->tap;
 
 		embeddedice_write_dcc(tap, reg_addr, buffer, little, count-2);
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index f58ffe28..8bf46807 100644
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -691,7 +691,7 @@ int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
 	return ERROR_OK;
 }
 
-int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, jtag_tap_t *tap)
+int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, struct jtag_tap *tap)
 {
 	struct arm7_9_common_s *arm7_9 = &arm7tdmi->arm7_9_common;
 
diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h
index f69ba49e..da0f7722 100644
--- a/src/target/arm7tdmi.h
+++ b/src/target/arm7tdmi.h
@@ -33,7 +33,7 @@ typedef struct arm7tdmi_common_s
 	arm7_9_common_t arm7_9_common;
 } arm7tdmi_common_t;
 
-int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, jtag_tap_t *tap);
+int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, struct jtag_tap *tap);
 int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int arm7tdmi_examine(struct target_s *target);
 
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 81f5c6af..9fe8fc4f 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -620,7 +620,7 @@ int arm920t_soft_reset_halt(struct target_s *target)
 	return ERROR_OK;
 }
 
-int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, jtag_tap_t *tap)
+int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, struct jtag_tap *tap)
 {
 	arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common;
 	arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 77405a87..c8120b67 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -667,7 +667,7 @@ static int arm926ejs_read_phys_memory(struct target_s *target,
 }
 
 int arm926ejs_init_arch_info(target_t *target, arm926ejs_common_t *arm926ejs,
-		jtag_tap_t *tap)
+		struct jtag_tap *tap)
 {
 	arm9tdmi_common_t *arm9tdmi = &arm926ejs->arm9tdmi_common;
 	arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 0712c535..f0df0913 100644
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -47,7 +47,7 @@ target_to_arm926(struct target_s *target)
 
 
 int arm926ejs_init_arch_info(target_t *target,
-		arm926ejs_common_t *arm926ejs, jtag_tap_t *tap);
+		arm926ejs_common_t *arm926ejs, struct jtag_tap *tap);
 int arm926ejs_register_commands(struct command_context_s *cmd_ctx);
 int arm926ejs_arch_state(struct target_s *target);
 int arm926ejs_write_memory(struct target_s *target,
diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 62ccaa80..b1fea08e 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -32,7 +32,7 @@
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif
 
-int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap_t *tap)
+int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, struct jtag_tap *tap)
 {
 	arm9tdmi_common_t *arm9tdmi = &arm966e->arm9tdmi_common;
 	arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index 8d0ee501..e311659f 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -42,7 +42,7 @@ target_to_arm966(struct target_s *target)
 }
 
 int arm966e_init_arch_info(target_t *target,
-		arm966e_common_t *arm966e, jtag_tap_t *tap);
+		arm966e_common_t *arm966e, struct jtag_tap *tap);
 int arm966e_register_commands(struct command_context_s *cmd_ctx);
 int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);
 
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 416fe794..56ce3652 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -786,7 +786,7 @@ int arm9tdmi_init_target(struct command_context_s *cmd_ctx,
 	return ERROR_OK;
 }
 
-int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap)
+int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap)
 {
 	armv4_5_common_t *armv4_5;
 	arm7_9_common_t *arm7_9;
diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h
index c098d822..775d4758 100644
--- a/src/target/arm9tdmi.h
+++ b/src/target/arm9tdmi.h
@@ -55,7 +55,7 @@ int arm9tdmi_init_target(struct command_context_s *cmd_ctx,
 		struct target_s *target);
 int arm9tdmi_examine(struct target_s *target);
 int arm9tdmi_init_arch_info(target_t *target,
-		arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap);
+		arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap);
 int arm9tdmi_register_commands(struct command_context_s *cmd_ctx);
 
 int arm9tdmi_clock_out(arm_jtag_t *jtag_info,
diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index d975d9d0..bcd4faab 100644
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -33,7 +33,7 @@
 
 int arm_jtag_set_instr(arm_jtag_t *jtag_info, uint32_t new_instr,  void *no_verify_capture)
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	tap = jtag_info->tap;
 	if (tap == NULL)
 		return ERROR_FAIL;
diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index c7d12cba..5b882c68 100644
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -27,7 +27,7 @@
 
 typedef struct arm_jtag_s
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 
 	uint32_t scann_size;
 	uint32_t scann_instr;
diff --git a/src/target/avrt.c b/src/target/avrt.c
index 98433cf7..bff2418c 100644
--- a/src/target/avrt.c
+++ b/src/target/avrt.c
@@ -46,17 +46,17 @@ int avr_deassert_reset(target_t *target);
 int avr_soft_reset_halt(struct target_s *target);
 
 /* IR and DR functions */
-int avr_jtag_sendinstr(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out);
-int avr_jtag_senddat(jtag_tap_t *tap, uint32_t *dr_in, uint32_t dr_out, int len);
-
-int mcu_write_ir(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti);
-int mcu_write_dr(jtag_tap_t *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti);
-int mcu_write_ir_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti);
-int mcu_write_dr_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int dr_len, int rti);
-int mcu_write_ir_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti);
-int mcu_write_dr_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int dr_len, int rti);
-int mcu_write_ir_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti);
-int mcu_write_dr_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int dr_len, int rti);
+int avr_jtag_sendinstr(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out);
+int avr_jtag_senddat(struct jtag_tap *tap, uint32_t *dr_in, uint32_t dr_out, int len);
+
+int mcu_write_ir(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti);
+int mcu_write_dr(struct jtag_tap *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti);
+int mcu_write_ir_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti);
+int mcu_write_dr_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int dr_len, int rti);
+int mcu_write_ir_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti);
+int mcu_write_dr_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int dr_len, int rti);
+int mcu_write_ir_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti);
+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 =
@@ -175,18 +175,18 @@ int avr_soft_reset_halt(struct target_s *target)
 	return ERROR_OK;
 }
 
-int avr_jtag_senddat(jtag_tap_t *tap, uint32_t* dr_in, uint32_t dr_out, int len)
+int avr_jtag_senddat(struct jtag_tap *tap, uint32_t* dr_in, uint32_t dr_out, int len)
 {
 	return mcu_write_dr_u32(tap, dr_in, dr_out, len, 1);
 }
 
-int avr_jtag_sendinstr(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out)
+int avr_jtag_sendinstr(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out)
 {
 	return mcu_write_ir_u8(tap, ir_in, ir_out, AVR_JTAG_INS_LEN, 1);
 }
 
 /* IR and DR functions */
-int mcu_write_ir(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti)
+int mcu_write_ir(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti)
 {
 	if (NULL == tap)
 	{
@@ -212,7 +212,7 @@ int mcu_write_ir(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, i
 	return ERROR_OK;
 }
 
-int mcu_write_dr(jtag_tap_t *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti)
+int mcu_write_dr(struct jtag_tap *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti)
 {
 	if (NULL == tap)
 	{
@@ -233,7 +233,7 @@ int mcu_write_dr(jtag_tap_t *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, i
 	return ERROR_OK;
 }
 
-int mcu_write_ir_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti)
+int mcu_write_ir_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti)
 {
 	if (ir_len > 8)
 	{
@@ -246,7 +246,7 @@ int mcu_write_ir_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len,
 	return ERROR_OK;
 }
 
-int mcu_write_dr_u8(jtag_tap_t *tap, uint8_t *dr_in, uint8_t dr_out, int dr_len, int rti)
+int mcu_write_dr_u8(struct jtag_tap *tap, uint8_t *dr_in, uint8_t dr_out, int dr_len, int rti)
 {
 	if (dr_len > 8)
 	{
@@ -259,7 +259,7 @@ int mcu_write_dr_u8(jtag_tap_t *tap, uint8_t *dr_in, uint8_t dr_out, int dr_len,
 	return ERROR_OK;
 }
 
-int mcu_write_ir_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti)
+int mcu_write_ir_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti)
 {
 	if (ir_len > 16)
 	{
@@ -272,7 +272,7 @@ int mcu_write_ir_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int ir_l
 	return ERROR_OK;
 }
 
-int mcu_write_dr_u16(jtag_tap_t *tap, uint16_t *dr_in, uint16_t dr_out, int dr_len, int rti)
+int mcu_write_dr_u16(struct jtag_tap *tap, uint16_t *dr_in, uint16_t dr_out, int dr_len, int rti)
 {
 	if (dr_len > 16)
 	{
@@ -285,7 +285,7 @@ int mcu_write_dr_u16(jtag_tap_t *tap, uint16_t *dr_in, uint16_t dr_out, int dr_l
 	return ERROR_OK;
 }
 
-int mcu_write_ir_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti)
+int mcu_write_ir_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti)
 {
 	if (ir_len > 32)
 	{
@@ -298,7 +298,7 @@ int mcu_write_ir_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int ir_l
 	return ERROR_OK;
 }
 
-int mcu_write_dr_u32(jtag_tap_t *tap, uint32_t *dr_in, uint32_t dr_out, int dr_len, int rti)
+int mcu_write_dr_u32(struct jtag_tap *tap, uint32_t *dr_in, uint32_t dr_out, int dr_len, int rti)
 {
 	if (dr_len > 32)
 	{
diff --git a/src/target/avrt.h b/src/target/avrt.h
index 02bb0054..37ea8e3d 100644
--- a/src/target/avrt.h
+++ b/src/target/avrt.h
@@ -24,7 +24,7 @@
 
 typedef struct mcu_jtag_s
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 } mcu_jtag_t;
 
 typedef struct avr_common_s
diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index 3ce861c4..2a3cbadd 100644
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -1451,7 +1451,7 @@ static int cortex_a8_init_target(struct command_context_s *cmd_ctx,
 }
 
 int cortex_a8_init_arch_info(target_t *target,
-		cortex_a8_common_t *cortex_a8, jtag_tap_t *tap)
+		cortex_a8_common_t *cortex_a8, struct jtag_tap *tap)
 {
 	armv4_5_common_t *armv4_5;
 	armv7a_common_t *armv7a;
diff --git a/src/target/cortex_a8.h b/src/target/cortex_a8.h
index 869a6f5a..39d4e77a 100644
--- a/src/target/cortex_a8.h
+++ b/src/target/cortex_a8.h
@@ -144,6 +144,6 @@ target_to_cortex_a8(struct target_s *target)
 }
 
 int cortex_a8_init_arch_info(target_t *target,
-		cortex_a8_common_t *cortex_a8, jtag_tap_t *tap);
+		cortex_a8_common_t *cortex_a8, struct jtag_tap *tap);
 
 #endif /* CORTEX_A8_H */
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index 86469c4e..d617817d 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -1708,7 +1708,7 @@ static int cortex_m3_handle_target_request(void *priv)
 }
 
 static int cortex_m3_init_arch_info(target_t *target,
-		cortex_m3_common_t *cortex_m3, jtag_tap_t *tap)
+		cortex_m3_common_t *cortex_m3, struct jtag_tap *tap)
 {
 	int retval;
 	struct armv7m_common_s *armv7m = &cortex_m3->armv7m;
diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index 4801cf70..7b20e12c 100644
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -622,7 +622,7 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, uint32_t timeout)
 /**
  * This is an inner loop of the open loop DCC write of data to target
  */
-void embeddedice_write_dcc(jtag_tap_t *tap,
+void embeddedice_write_dcc(struct jtag_tap *tap,
 		int reg_addr, uint8_t *buffer, int little, int count)
 {
 	int i;
diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index b1ba9895..c27a1b5d 100644
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -116,7 +116,7 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, uint32_t timeout);
 /* If many embeddedice_write_reg() follow eachother, then the >1 invocations can be this faster version of
  * embeddedice_write_reg
  */
-static __inline__ void embeddedice_write_reg_inner(jtag_tap_t *tap, int reg_addr, uint32_t value)
+static __inline__ void embeddedice_write_reg_inner(struct jtag_tap *tap, int reg_addr, uint32_t value)
 {
 	static const int embeddedice_num_bits[]={32,5,1};
 	uint32_t values[3];
@@ -132,6 +132,6 @@ static __inline__ void embeddedice_write_reg_inner(jtag_tap_t *tap, int reg_addr
 			jtag_get_end_state());
 }
 
-void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int little, int count);
+void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer, int little, int count);
 
 #endif /* EMBEDDED_ICE_H */
diff --git a/src/target/etb.c b/src/target/etb.c
index c0c485fe..3ad73977 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -44,7 +44,7 @@ static int etb_get_reg(reg_t *reg);
 
 static int etb_set_instr(etb_t *etb, uint32_t new_instr)
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 
 	tap = etb->tap;
 	if (tap == NULL)
@@ -352,7 +352,7 @@ static int etb_write_reg(reg_t *reg, uint32_t value)
 COMMAND_HANDLER(handle_etb_config_command)
 {
 	target_t *target;
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	struct arm *arm;
 
 	if (argc != 2)
diff --git a/src/target/etb.h b/src/target/etb.h
index da9c9b3b..6700ecbb 100644
--- a/src/target/etb.h
+++ b/src/target/etb.h
@@ -37,7 +37,7 @@ enum
 typedef struct etb_s
 {
 	etm_context_t *etm_ctx;
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	uint32_t cur_scan_chain;
 	reg_cache_t *reg_cache;
 
diff --git a/src/target/fa526.c b/src/target/fa526.c
index 1a204b11..45929342 100644
--- a/src/target/fa526.c
+++ b/src/target/fa526.c
@@ -256,7 +256,7 @@ static void fa526_branch_resume_thumb(target_t *target)
 }
 
 static int fa526_init_arch_info_2(target_t *target,
-		arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap)
+		arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap)
 {
 	arm7_9_common_t *arm7_9;
 
@@ -315,7 +315,7 @@ static int fa526_init_arch_info_2(target_t *target,
 }
 
 static int fa526_init_arch_info(target_t *target,
-		arm920t_common_t *arm920t, jtag_tap_t *tap)
+		arm920t_common_t *arm920t, struct jtag_tap *tap)
 {
 	arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common;
 	arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
diff --git a/src/target/mips32.c b/src/target/mips32.c
index ac26e64a..d1722c1a 100644
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -315,7 +315,7 @@ reg_cache_t *mips32_build_reg_cache(target_t *target)
 	return cache;
 }
 
-int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, jtag_tap_t *tap)
+int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, struct jtag_tap *tap)
 {
 	target->arch_info = mips32;
 	mips32->common_magic = MIPS32_COMMON_MAGIC;
diff --git a/src/target/mips32.h b/src/target/mips32.h
index 005798d5..64328e35 100644
--- a/src/target/mips32.h
+++ b/src/target/mips32.h
@@ -127,7 +127,7 @@ typedef struct mips32_core_reg_s
 int mips32_arch_state(struct target_s *target);
 
 int mips32_init_arch_info(target_t *target,
-		mips32_common_t *mips32, jtag_tap_t *tap);
+		mips32_common_t *mips32, struct jtag_tap *tap);
 
 int mips32_restore_context(target_t *target);
 int mips32_save_context(target_t *target);
diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index ef7f63e3..021e3ab4 100644
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -29,7 +29,7 @@
 
 int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_me_and_submit_patch)
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 
 	tap = ejtag_info->tap;
 	if (tap == NULL)
@@ -100,7 +100,7 @@ int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, uint32_t *impcode)
 
 int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, uint32_t *data)
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	tap  = ejtag_info->tap;
 
 	if (tap == NULL)
diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h
index 69ede527..74cb21df 100644
--- a/src/target/mips_ejtag.h
+++ b/src/target/mips_ejtag.h
@@ -104,7 +104,7 @@
 
 typedef struct mips_ejtag_s
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	uint32_t impcode;
 	uint32_t idcode;
 	/*int use_dma;*/
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 07731a0a..909745aa 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -917,7 +917,7 @@ int mips_m4k_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
 	return ERROR_OK;
 }
 
-int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, jtag_tap_t *tap)
+int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, struct jtag_tap *tap)
 {
 	mips32_common_t *mips32 = &mips_m4k->mips32_common;
 
diff --git a/src/target/target.c b/src/target/target.c
index 6346ae03..2528a64e 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -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) {
diff --git a/src/target/target.h b/src/target/target.h
index 5a611708..f5b6eb22 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -136,7 +136,7 @@ typedef struct target_s
 	target_type_t *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 */
-	jtag_tap_t *tap;					/* where on the jtag chain is this */
+	struct jtag_tap *tap;					/* where on the jtag chain is this */
 	const char *variant;				/* what varient of this chip is it? */
 	target_event_action_t *event_action;
 
diff --git a/src/target/xscale.c b/src/target/xscale.c
index 88914b52..c4d22b1d 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -156,7 +156,7 @@ static int xscale_verify_pointer(struct command_context_s *cmd_ctx,
 	return ERROR_OK;
 }
 
-static int xscale_jtag_set_instr(jtag_tap_t *tap, uint32_t new_instr)
+static int xscale_jtag_set_instr(struct jtag_tap *tap, uint32_t new_instr)
 {
 	if (tap == NULL)
 		return ERROR_FAIL;
@@ -2868,7 +2868,7 @@ static int xscale_init_target(struct command_context_s *cmd_ctx,
 }
 
 static int xscale_init_arch_info(target_t *target,
-		xscale_common_t *xscale, jtag_tap_t *tap, const char *variant)
+		xscale_common_t *xscale, struct jtag_tap *tap, const char *variant)
 {
 	armv4_5_common_t *armv4_5;
 	uint32_t high_reset_branch, low_reset_branch;
-- 
cgit v1.2.3