target: don't implicitly include "breakpoint.h"

[fw/openocd] / src / target / xscale.c

diff --git a/src/target/xscale.c b/src/target/xscale.c
index ca3ea2ae89ffe4a31029e632fcf9b031eb1d7f1c..d8977e2189e77804ea7e1dfa59be7a8559a49ff2 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -27,6 +27,7 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "xscale.h"
 #include "target_type.h"
 #include "arm7_9_common.h"
@@ -2849,8 +2850,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];
@@ -3628,8 +3627,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,