Duane Ellis: fix warnings

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

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index a29593daad936031576873752a4348d2a4368dd4..7eaa5c512805f48f8669cb4ac55ce43d94fc20ef 100644 (file)
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -27,21 +27,21 @@
 #include "target.h"
 #include "arm_jtag.h"
 
+/* define for enabling armv7 gdb workarounds */
+#if 1
+#define ARMV7_GDB_HACKS
+#endif
+
 enum armv7m_mode
 {
-       ARMV7M_MODE_HANDLER = 0, 
-       ARMV7M_MODE_THREAD = 1, 
+       ARMV7M_MODE_THREAD = 0,
+       ARMV7M_MODE_USER_THREAD = 1,
+       ARMV7M_MODE_HANDLER = 2,
        ARMV7M_MODE_ANY = -1
 };
 
 extern char* armv7m_mode_strings[];
 
-enum armv7m_state
-{
-       ARMV7M_STATE_THUMB,
-       ARMV7M_STATE_DEBUG,
-};
-
 enum armv7m_regtype
 {
        ARMV7M_REGISTER_CORE_GP,
@@ -49,13 +49,6 @@ enum armv7m_regtype
        ARMV7M_REGISTER_MEMMAP
 };
 
-enum armv7m_runcontext
-{
-       ARMV7M_PROCESS_CONTEXT,
-       ARMV7M_DEBUG_CONTEXT
-};
-
-extern char* armv7m_state_strings[];
 extern char* armv7m_exception_strings[];
 
 extern char *armv7m_exception_string(int number);
@@ -80,11 +73,8 @@ typedef struct armv7m_common_s
 {
        int common_magic;
        reg_cache_t *core_cache;
-       reg_cache_t *process_context;
-       reg_cache_t *debug_context;
        enum armv7m_mode core_mode;
-       enum armv7m_state core_state;
-       int  exception_number;
+       int exception_number;
        
        /* Direct processor core register read and writes */
        int (*load_core_reg_u32)(struct target_s *target, enum armv7m_regtype type, u32 num, u32 *value);
@@ -93,8 +83,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);
@@ -108,9 +96,8 @@ typedef struct armv7m_common_s
 typedef struct armv7m_algorithm_s
 {
        int common_magic;
-               
+       
        enum armv7m_mode core_mode;
-       enum armv7m_state core_state;
 } armv7m_algorithm_t;
 
 typedef struct armv7m_core_reg_s
@@ -137,12 +124,10 @@ extern int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem
 
 extern int armv7m_invalidate_core_regs(target_t *target);
 
-extern enum armv7m_runcontext armv7m_get_context(target_t *target);
-extern int armv7m_use_context(target_t *target, enum armv7m_runcontext new_ctx);
-extern enum armv7m_runcontext armv7m_get_context(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
  */