X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv7a.h;h=42a25df88db4906ce4652f142a84a54aea175035;hp=3fc97f1fe36abbb689d2a8e8c65b4ad39fe8dbd7;hb=2744a031cb333f4d1c2cd81171cbdafd6c780e1d;hpb=db116b1ea3c77a3c5850fccbce9e0795faa21dda

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 3fc97f1fe3..42a25df88d 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -89,7 +89,7 @@ enum
 #define V2POWUR  6
 #define V2POWUW  7
 
-typedef struct armv7a_common_s
+struct armv7a_common
 {
 	int common_magic;
 	reg_cache_t *core_cache;
@@ -97,7 +97,7 @@ typedef struct armv7a_common_s
 	enum armv7a_state core_state;
 
 	/* arm adp debug port */
-	swjdp_common_t swjdp_info;
+	struct swjdp_common swjdp_info;
 
 	/* Core Debug Unit */
 	uint32_t debug_base;
@@ -105,9 +105,8 @@ typedef struct armv7a_common_s
 	uint8_t memory_ap;
 
 	/* Cache and Memory Management Unit */
-	armv4_5_mmu_common_t armv4_5_mmu;
+	struct armv4_5_mmu_common armv4_5_mmu;
 	armv4_5_common_t armv4_5_common;
-	void *arch_info;
 
 //	int (*full_context)(struct target_s *target);
 //	int (*read_core_reg)(struct target_s *target, int num, enum armv7a_mode mode);
@@ -125,36 +124,36 @@ typedef struct armv7a_common_s
 	void (*pre_restore_context)(target_t *target);
 	void (*post_restore_context)(target_t *target);
 
-} armv7a_common_t;
+};
 
-static inline struct armv7a_common_s *
+static inline struct armv7a_common *
 target_to_armv7a(struct target_s *target)
 {
-	return container_of(target->arch_info, struct armv7a_common_s,
+	return container_of(target->arch_info, struct armv7a_common,
 			armv4_5_common);
 }
 
-typedef struct armv7a_algorithm_s
+struct armv7a_algorithm
 {
 	int common_magic;
 
 	enum armv7a_mode core_mode;
 	enum armv7a_state core_state;
-} armv7a_algorithm_t;
+};
 
-typedef struct armv7a_core_reg_s
+struct armv7a_core_reg
 {
 	int num;
 	enum armv7a_mode mode;
 	target_t *target;
-	armv7a_common_t *armv7a_common;
-} armv7a_core_reg_t;
+	struct armv7a_common *armv7a_common;
+};
 
 int armv7a_arch_state(struct target_s *target);
 reg_cache_t *armv7a_build_reg_cache(target_t *target,
-		armv7a_common_t *armv7a_common);
+		struct armv7a_common *armv7a_common);
 int armv7a_register_commands(struct command_context_s *cmd_ctx);
-int armv7a_init_arch_info(target_t *target, armv7a_common_t *armv7a);
+int armv7a_init_arch_info(target_t *target, struct armv7a_common *armv7a);
 
 /* map psr mode bits to linear number */
 static inline int armv7a_mode_to_number(enum armv7a_mode mode)