Audit and eliminate redundant #include directives in arm target files.

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

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 8199c23adde1b584d136a874882d351a881e652b..cb7bb5cbfae4d0bc952af8df389437c35a9e4c03 100644 (file)
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -5,6 +5,9 @@
  *   Copyright (C) 2006 by Magnus Lundin                                   *
  *   lundin@mlu.mine.nu                                                    *
  *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -23,9 +26,12 @@
 #ifndef ARMV7M_COMMON_H
 #define ARMV7M_COMMON_H
 
-#include "register.h"
-#include "target.h"
-#include "arm_jtag.h"
+#include "arm_adi_v5.h"
+
+/* define for enabling armv7 gdb workarounds */
+#if 1
+#define ARMV7_GDB_HACKS
+#endif
 
 enum armv7m_mode
 {
@@ -70,6 +76,8 @@ typedef struct armv7m_common_s
        reg_cache_t *core_cache;
        enum armv7m_mode core_mode;
        int exception_number;
+       swjdp_common_t swjdp_info;
+
        
        /* Direct processor core register read and writes */
        int (*load_core_reg_u32)(struct target_s *target, enum armv7m_regtype type, u32 num, u32 *value);
@@ -78,8 +86,6 @@ typedef struct armv7m_common_s
        int (*read_core_reg)(struct target_s *target, int num);
        int (*write_core_reg)(struct target_s *target, int num);
        
-       arm_jtag_t jtag_info;
-
        int (*examine_debug_reason)(target_t *target);
        void (*pre_debug_entry)(target_t *target);
        void (*post_debug_entry)(target_t *target);
@@ -112,7 +118,6 @@ extern int armv7m_mode_to_number(enum armv7m_mode mode);
 
 extern int armv7m_arch_state(struct target_s *target);
 extern int armv7m_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size);
-extern int armv7m_invalidate_core_regs(target_t *target);
 
 extern int armv7m_register_commands(struct command_context_s *cmd_ctx);
 extern int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m);
@@ -124,6 +129,7 @@ extern int armv7m_invalidate_core_regs(target_t *target);
 extern int armv7m_restore_context(target_t *target);
 
 extern int armv7m_checksum_memory(struct target_s *target, u32 address, u32 count, u32* checksum);
+extern int armv7m_blank_check_memory(struct target_s *target, u32 address, u32 count, u32* blank);
 
 /* Thumb mode instructions
  */