arm7_9: Avoid infinite loops in bulk write dispatching

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

diff --git a/src/target/arm920t.h b/src/target/arm920t.h
index b2ab45983b9b28f2b0344b4ac9ba10fcb3fc0be3..71876a69bc126245e82cd5b5afc887a5d4c93dd0 100644 (file)
--- a/src/target/arm920t.h
+++ b/src/target/arm920t.h
@@ -15,8 +15,9 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifndef ARM920T_H
 #define ARM920T_H
 
@@ -25,11 +26,10 @@
 
 #define        ARM920T_COMMON_MAGIC 0xa920a920
 
-struct arm920t_common
-{
-       struct arm9tdmi_common arm9tdmi_common;
+struct arm920t_common {
+       struct arm7_9_common arm7_9_common;
        uint32_t common_magic;
-       armv4_5_mmu_common_t armv4_5_mmu;
+       struct armv4_5_mmu_common armv4_5_mmu;
        uint32_t cp15_control_reg;
        uint32_t d_fsr;
        uint32_t i_fsr;
@@ -38,39 +38,36 @@ struct arm920t_common
        int preserve_cache;
 };
 
-static inline struct arm920t_common *
-target_to_arm920(struct target_s *target)
+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);
+       return container_of(target->arch_info, struct arm920t_common, arm7_9_common.arm);
 }
 
-struct arm920t_cache_line
-{
+struct arm920t_cache_line {
        uint32_t cam;
        uint32_t data[8];
 };
 
-struct arm920t_tlb_entry
-{
+struct arm920t_tlb_entry {
        uint32_t cam;
        uint32_t ram1;
        uint32_t ram2;
 };
 
-int arm920t_arch_state(struct target_s *target);
-int arm920t_soft_reset_halt(struct target_s *target);
-int arm920t_read_memory(struct target_s *target,
-       uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
-int arm920t_write_memory(struct target_s *target,
+int arm920t_arch_state(struct target *target);
+int arm920t_soft_reset_halt(struct target *target);
+int arm920t_read_memory(struct target *target,
        uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
-void arm920t_post_debug_entry(target_t *target);
-void arm920t_pre_restore_context(target_t *target);
-       uint32_t arm920t_get_ttb(target_t *target);
-void arm920t_disable_mmu_caches(target_t *target,
+int arm920t_write_memory(struct target *target,
+       uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer);
+int arm920t_post_debug_entry(struct target *target);
+void arm920t_pre_restore_context(struct target *target);
+int arm920t_get_ttb(struct target *target, uint32_t *result);
+int arm920t_disable_mmu_caches(struct target *target,
        int mmu, int d_u_cache, int i_cache);
-void arm920t_enable_mmu_caches(target_t *target,
+int 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 */