ARM: streamline register init

[openocd.git] / src / target / xscale.h

diff --git a/src/target/xscale.h b/src/target/xscale.h
index 53bf4721c84c52b85bef1d72f68ed622f360938c..4f1b54d8b92403cd15e68aa907af24f03d0ba771 100644 (file)
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -69,7 +69,7 @@ struct xscale_trace_data
 struct xscale_trace
 {
        trace_status_t capture_status;  /* current state of capture run */
-       struct image_s *image;                                  /* source for target opcodes */
+       struct image *image;                                    /* source for target opcodes */
        struct xscale_trace_data *data;         /* linked list of collected trace data */
        int buffer_enabled;                             /* whether trace buffer is enabled */
        int buffer_fill;                                /* maximum number of trace runs to read (-1 for wrap-around) */
@@ -132,7 +132,7 @@ struct xscale_common
 };
 
 static inline struct xscale_common *
-target_to_xscale(struct target_s *target)
+target_to_xscale(struct target *target)
 {
        return container_of(target->arch_info, struct xscale_common,
                        armv4_5_common);
@@ -141,7 +141,7 @@ target_to_xscale(struct target_s *target)
 struct xscale_reg
 {
        int dbg_handler_number;
-       target_t *target;
+       struct target *target;
 };
 
 enum