X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.c;h=dee9f612ad18609cd9dc632202ed1eb2c0e966c3;hb=53c05c8b1d5718b2acf5dbe0eb517dd427340041;hp=e61943a3e96d04aa0e60414602a8cae951d42d20;hpb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e;p=openocd.git

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index e61943a3e9..dee9f612ad 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -32,10 +32,10 @@
 #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, struct arm966e_common *arm966e, struct jtag_tap *tap)
 {
-	arm9tdmi_common_t *arm9tdmi = &arm966e->arm9tdmi_common;
-	arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
+	struct arm9tdmi_common *arm9tdmi = &arm966e->arm9tdmi_common;
+	struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
 
 	arm9tdmi_init_arch_info(target, arm9tdmi, tap);
 
@@ -52,13 +52,13 @@ int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap
 
 static int arm966e_target_create(struct target_s *target, Jim_Interp *interp)
 {
-	arm966e_common_t *arm966e = calloc(1,sizeof(arm966e_common_t));
+	struct arm966e_common *arm966e = calloc(1,sizeof(struct arm966e_common));
 
 	return arm966e_init_arch_info(target, arm966e, target->tap);
 }
 
 static int arm966e_verify_pointer(struct command_context_s *cmd_ctx,
-		struct arm966e_common_s *arm966e)
+		struct arm966e_common *arm966e)
 {
 	if (arm966e->common_magic != ARM966E_COMMON_MAGIC) {
 		command_print(cmd_ctx, "target is not an ARM966");
@@ -70,9 +70,9 @@ static int arm966e_verify_pointer(struct command_context_s *cmd_ctx,
 static int arm966e_read_cp15(target_t *target, int reg_addr, uint32_t *value)
 {
 	int retval = ERROR_OK;
-	struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
-	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
-	scan_field_t fields[3];
+	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
+	struct arm_jtag *jtag_info = &arm7_9->jtag_info;
+	struct scan_field fields[3];
 	uint8_t reg_addr_buf = reg_addr & 0x3f;
 	uint8_t nr_w_buf = 0;
 
@@ -122,9 +122,9 @@ static int arm966e_read_cp15(target_t *target, int reg_addr, uint32_t *value)
 int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value)
 {
 	int retval = ERROR_OK;
-	struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
-	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
-	scan_field_t fields[3];
+	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
+	struct arm_jtag *jtag_info = &arm7_9->jtag_info;
+	struct scan_field fields[3];
 	uint8_t reg_addr_buf = reg_addr & 0x3f;
 	uint8_t nr_w_buf = 1;
 	uint8_t value_buf[4];
@@ -166,7 +166,7 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
 {
 	int retval;
 	target_t *target = get_current_target(cmd_ctx);
-	struct arm966e_common_s *arm966e = target_to_arm966(target);
+	struct arm966e_common *arm966e = target_to_arm966(target);
 
 	retval = arm966e_verify_pointer(cmd_ctx, arm966e);
 	if (retval != ERROR_OK)
@@ -174,7 +174,7 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
 
 	if (target->state != TARGET_HALTED)
 	{
-		command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+		command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
 		return ERROR_OK;
 	}