arm_dpm: -Wshadow warning fix

[fw/openocd] / src / target / arm920t.h

diff --git a/src/target/arm920t.h b/src/target/arm920t.h
index 02f6da5c6de030354e6b7e79f657102b88c6fac8..a75f01ab16805e4f36687e61fa46e2957eaaa57c 100644 (file)
--- a/src/target/arm920t.h
+++ b/src/target/arm920t.h
@@ -27,7 +27,7 @@
 
 struct arm920t_common
 {
-       struct arm9tdmi_common arm9tdmi_common;
+       struct arm7_9_common arm7_9_common;
        uint32_t common_magic;
        struct armv4_5_mmu_common armv4_5_mmu;
        uint32_t cp15_control_reg;
@@ -42,7 +42,7 @@ static inline struct arm920t_common *
 target_to_arm920(struct target *target)
 {
        return container_of(target->arch_info, struct arm920t_common,
-                       arm9tdmi_common.arm7_9_common.armv4_5_common);
+                       arm7_9_common.armv4_5_common);
 }
 
 struct arm920t_cache_line
@@ -71,6 +71,7 @@ void arm920t_disable_mmu_caches(struct target *target,
        int mmu, int d_u_cache, int i_cache);
 void arm920t_enable_mmu_caches(struct target *target,
        int mmu, int d_u_cache, int i_cache);
-int arm920t_register_commands(struct command_context_s *cmd_ctx);
+
+extern const struct command_registration arm920t_command_handlers[];
 
 #endif /* ARM920T_H */