ARM: add arm_mode_name()

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

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index c775d0c24debee287f4332c666e6352a5c5cd284..e781e72070abdcdca11a8b7630861bb445c46972 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -19,9 +19,6 @@
 #ifndef ARMV7A_H
 #define ARMV7A_H
 
-#include "register.h"
-#include "target.h"
-#include "log.h"
 #include "arm_adi_v5.h"
 #include "armv4_5.h"
 #include "armv4_5_mmu.h"
@@ -40,8 +37,6 @@ typedef enum armv7a_mode
        ARMV7A_MODE_ANY = -1
 } armv7a_t;
 
-extern char **armv7a_mode_strings;
-
 typedef enum armv7a_state
 {
        ARMV7A_STATE_ARM,
@@ -76,7 +71,6 @@ enum
        ARMV7A_SPSR_UND = 36
 };
 
-#define ARMV4_5_COMMON_MAGIC 0x0A450A45
 #define ARMV7_COMMON_MAGIC 0x0A450999
 
 /* VA to PA translation operations opc2 values*/
@@ -108,26 +102,26 @@ struct armv7a_common
        struct armv4_5_mmu_common armv4_5_mmu;
        struct arm armv4_5_common;
 
-//     int (*full_context)(struct target_s *target);
-//     int (*read_core_reg)(struct target_s *target, int num, enum armv7a_mode mode);
-//     int (*write_core_reg)(struct target_s *target, int num, enum armv7a_mode mode, u32 value);
-       int (*read_cp15)(struct target_s *target,
+//     int (*full_context)(struct target *target);
+//     int (*read_core_reg)(struct target *target, int num, enum armv7a_mode mode);
+//     int (*write_core_reg)(struct target *target, int num, enum armv7a_mode mode, u32 value);
+       int (*read_cp15)(struct target *target,
                        uint32_t op1, uint32_t op2,
                        uint32_t CRn, uint32_t CRm, uint32_t *value);
-       int (*write_cp15)(struct target_s *target,
+       int (*write_cp15)(struct target *target,
                        uint32_t op1, uint32_t op2,
                        uint32_t CRn, uint32_t CRm, uint32_t value);
 
-       int (*examine_debug_reason)(target_t *target);
-       void (*post_debug_entry)(target_t *target);
+       int (*examine_debug_reason)(struct target *target);
+       void (*post_debug_entry)(struct target *target);
 
-       void (*pre_restore_context)(target_t *target);
-       void (*post_restore_context)(target_t *target);
+       void (*pre_restore_context)(struct target *target);
+       void (*post_restore_context)(struct target *target);
 
 };
 
 static inline struct armv7a_common *
-target_to_armv7a(struct target_s *target)
+target_to_armv7a(struct target *target)
 {
        return container_of(target->arch_info, struct armv7a_common,
                        armv4_5_common);
@@ -145,15 +139,15 @@ struct armv7a_core_reg
 {
        int num;
        enum armv7a_mode mode;
-       target_t *target;
+       struct target *target;
        struct armv7a_common *armv7a_common;
 };
 
-int armv7a_arch_state(struct target_s *target);
-struct reg_cache *armv7a_build_reg_cache(target_t *target,
+int armv7a_arch_state(struct target *target);
+struct reg_cache *armv7a_build_reg_cache(struct target *target,
                struct armv7a_common *armv7a_common);
-int armv7a_register_commands(struct command_context_s *cmd_ctx);
-int armv7a_init_arch_info(target_t *target, struct armv7a_common *armv7a);
+int armv7a_register_commands(struct command_context *cmd_ctx);
+int armv7a_init_arch_info(struct target *target, struct armv7a_common *armv7a);
 
 /* map psr mode bits to linear number */
 static inline int armv7a_mode_to_number(enum armv7a_mode mode)