warning fix: remove senseless assignment before bailing out of fn w/error

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

diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h
index f5dde5b1d61e440c584b0d3317f60547b3028189..e16aa89feb96544664d4997f8e032843656341bd 100644 (file)
--- a/src/target/cortex_m3.h
+++ b/src/target/cortex_m3.h
@@ -26,8 +26,6 @@
 #ifndef CORTEX_M3_H
 #define CORTEX_M3_H
 
-#include "register.h"
-#include "target.h"
 #include "armv7m.h"
 
 
@@ -136,6 +134,19 @@ struct cortex_m3_dwt_comparator
        uint32_t dwt_comparator_address;
 };
 
+enum cortex_m3_soft_reset_config
+{
+       CORTEX_M3_RESET_SYSRESETREQ,
+       CORTEX_M3_RESET_VECTRESET,
+};
+
+enum cortex_m3_isrmasking_mode
+{
+       CORTEX_M3_ISRMASK_AUTO,
+       CORTEX_M3_ISRMASK_OFF,
+       CORTEX_M3_ISRMASK_ON,
+};
+
 struct cortex_m3_common
 {
        int common_magic;
@@ -160,11 +171,15 @@ struct cortex_m3_common
        struct cortex_m3_dwt_comparator *dwt_comparator_list;
        struct reg_cache *dwt_cache;
 
+       enum cortex_m3_soft_reset_config soft_reset_config;
+
+       enum cortex_m3_isrmasking_mode isrmasking_mode;
+
        struct armv7m_common armv7m;
 };
 
 static inline struct cortex_m3_common *
-target_to_cm3(struct target_s *target)
+target_to_cm3(struct target *target)
 {
        return container_of(target->arch_info,
                        struct cortex_m3_common, armv7m);