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

diff --git a/src/target/xscale.c b/src/target/xscale.c
index ccf23b491b..9e93c020c8 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -27,12 +27,14 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "xscale.h"
 #include "target_type.h"
 #include "arm7_9_common.h"
 #include "arm_simulator.h"
 #include "arm_disassembler.h"
 #include "time_support.h"
+#include "register.h"
 #include "image.h"
 
 
@@ -146,7 +148,7 @@ static int xscale_set_reg_u32(struct reg *reg, uint32_t value)
 
 static const char xscale_not[] = "target is not an XScale";
 
-static int xscale_verify_pointer(struct command_context_s *cmd_ctx,
+static int xscale_verify_pointer(struct command_context *cmd_ctx,
 		struct xscale_common *xscale)
 {
 	if (xscale->common_magic != XSCALE_COMMON_MAGIC) {
@@ -2555,7 +2557,7 @@ static int xscale_read_instruction(struct target *target,
 	struct xscale_common *xscale = target_to_xscale(target);
 	int i;
 	int section = -1;
-	uint32_t size_read;
+	size_t size_read;
 	uint32_t opcode;
 	int retval;
 
@@ -2630,7 +2632,7 @@ static int xscale_branch_address(struct xscale_trace_data *trace_data,
 	return 0;
 }
 
-static int xscale_analyze_trace(struct target *target, command_context_t *cmd_ctx)
+static int xscale_analyze_trace(struct target *target, struct command_context *cmd_ctx)
 {
 	struct xscale_common *xscale = target_to_xscale(target);
 	int next_pc_ok = 0;
@@ -2849,8 +2851,6 @@ static void xscale_build_reg_cache(struct target *target)
 		(*cache_p)->reg_list[i].dirty = 0;
 		(*cache_p)->reg_list[i].valid = 0;
 		(*cache_p)->reg_list[i].size = 32;
-		(*cache_p)->reg_list[i].bitfield_desc = NULL;
-		(*cache_p)->reg_list[i].num_bitfields = 0;
 		(*cache_p)->reg_list[i].arch_info = &arch_info[i];
 		(*cache_p)->reg_list[i].arch_type = xscale_reg_arch_type;
 		arch_info[i] = xscale_reg_arch_info[i];
@@ -2860,7 +2860,7 @@ static void xscale_build_reg_cache(struct target *target)
 	xscale->reg_cache = (*cache_p);
 }
 
-static int xscale_init_target(struct command_context_s *cmd_ctx,
+static int xscale_init_target(struct command_context *cmd_ctx,
 		struct target *target)
 {
 	xscale_build_reg_cache(target);
@@ -3575,9 +3575,9 @@ COMMAND_HANDLER(xscale_handle_cp15)
 	return ERROR_OK;
 }
 
-static int xscale_register_commands(struct command_context_s *cmd_ctx)
+static int xscale_register_commands(struct command_context *cmd_ctx)
 {
-	command_t *xscale_cmd;
+	struct command *xscale_cmd;
 
 	xscale_cmd = register_command(cmd_ctx, NULL, "xscale", NULL, COMMAND_ANY, "xscale specific commands");
 
@@ -3628,8 +3628,9 @@ struct target_type xscale_target =
 	.read_memory = xscale_read_memory,
 	.write_memory = xscale_write_memory,
 	.bulk_write_memory = xscale_bulk_write_memory,
-	.checksum_memory = arm7_9_checksum_memory,
-	.blank_check_memory = arm7_9_blank_check_memory,
+
+	.checksum_memory = arm_checksum_memory,
+	.blank_check_memory = arm_blank_check_memory,
 
 	.run_algorithm = armv4_5_run_algorithm,