arm7/9: remove unused post_restore_context

Unused. If something should happen after context restore, then the
calling code can just do it afterwards.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index f9deb831090ff53273f2a0c05e5df0b87070f15c..d1e7a93e10c016e9089200acca42c738c1c306ec 100644 (file)
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -1726,9 +1726,6 @@ int arm7_9_restore_context(struct target *target)
        arm7_9->write_pc(target, buf_get_u32(armv4_5->pc->value, 0, 32));
        armv4_5->pc->dirty = 0;
 
-       if (arm7_9->post_restore_context)
-               arm7_9->post_restore_context(target);
-
        return ERROR_OK;
 }
 

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index 93bee0710d875dfa833ab8fbab0e8c8d3cc44262..71f9a9d54295a4131d31ff9f1d5a301eeebb0136 100644 (file)
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -103,9 +103,6 @@ struct arm7_9_common
        void (*post_debug_entry)(struct target *target); /**< Callback function called after entering debug mode */
 
        void (*pre_restore_context)(struct target *target); /**< Callback function called before restoring the processor context */
-       void (*post_restore_context)(struct target *target); /**< Callback function called after restoring the processor context */
-
-
 };
 
 static inline struct arm7_9_common *

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index bd29caf9b22641756ebc492c94d22ec8097d16f4..ab8a3e52dcb54b2ad5144c4b550b8fa84b45336b 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -685,7 +685,6 @@ int arm7tdmi_init_arch_info(struct target *target,
        arm7_9->post_debug_entry = NULL;
 
        arm7_9->pre_restore_context = NULL;
-       arm7_9->post_restore_context = NULL;
 
        /* initialize arch-specific breakpoint handling */
        arm7_9->arm_bkpt = 0xdeeedeee;

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 7c1e372fb227cfc5bbee49997d9c6f7092fbd0bb..f3935a3a2283cd483a3400f183c075fe80e5b2f9 100644 (file)
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -787,7 +787,6 @@ int arm9tdmi_init_arch_info(struct target *target,
        arm7_9->post_debug_entry = NULL;
 
        arm7_9->pre_restore_context = NULL;
-       arm7_9->post_restore_context = NULL;
 
        /* initialize arch-specific breakpoint handling */
        arm7_9->arm_bkpt = 0xdeeedeee;

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 5ef8c42a21e28d1cbb5ff8a9e0c80c147fddcb40..621761d73cef939387bc05e92deadd49da968446 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -65,8 +65,6 @@ struct armv7a_common
        void (*post_debug_entry)(struct target *target);
 
        void (*pre_restore_context)(struct target *target);
-       void (*post_restore_context)(struct target *target);
-
 };
 
 static inline struct armv7a_common *

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 1216a45fbe2564e3af9f5dd16dce8d43566e53d3..f0829c61770e62752d4a59b677ca5533f6f65d13 100644 (file)
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -139,9 +139,6 @@ int armv7m_restore_context(struct target *target)
                }
        }
 
-       if (armv7m->post_restore_context)
-               armv7m->post_restore_context(target);
-
        return ERROR_OK;
 }
 

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 51d670489513fb5fee456b8d0a2891ee6e49a386..57d46ede496087dea325c78171836ea83e265298 100644 (file)
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -124,7 +124,6 @@ struct armv7m_common
        void (*post_debug_entry)(struct target *target);
 
        void (*pre_restore_context)(struct target *target);
-       void (*post_restore_context)(struct target *target);
 };
 
 static inline struct armv7m_common *

diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index 332a55a5fc9cff538e71c5e2e4f6e353f2f3bf25..a5480272ec731628ad219d43dfa019e5745ce3f6 100644 (file)
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -1020,9 +1020,6 @@ static int cortex_a8_restore_context(struct target *target, bool bpwp)
 
        arm_dpm_write_dirty_registers(&armv7a->dpm, bpwp);
 
-       if (armv7a->post_restore_context)
-               armv7a->post_restore_context(target);
-
        return ERROR_OK;
 }
 
@@ -1589,7 +1586,6 @@ static int cortex_a8_init_arch_info(struct target *target,
        armv7a->post_debug_entry = cortex_a8_post_debug_entry;
 
        armv7a->pre_restore_context = NULL;
-       armv7a->post_restore_context = NULL;
        armv7a->armv4_5_mmu.armv4_5_cache.ctype = -1;
 //     armv7a->armv4_5_mmu.get_ttb = armv7a_get_ttb;
        armv7a->armv4_5_mmu.read_memory = cortex_a8_read_memory;

diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index d39d839c5371620bd2e6766f37a797650f7268d5..7f6cbafa522b3f2ccd062a933bfe9211e2932c50 100644 (file)
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -1876,7 +1876,6 @@ static int cortex_m3_init_arch_info(struct target *target,
        armv7m->post_debug_entry = NULL;
 
        armv7m->pre_restore_context = NULL;
-       armv7m->post_restore_context = NULL;
 
        armv7m->load_core_reg_u32 = cortex_m3_load_core_reg_u32;
        armv7m->store_core_reg_u32 = cortex_m3_store_core_reg_u32;

diff --git a/src/target/fa526.c b/src/target/fa526.c
index b6149e318ad4aa4b2967d1932adbbc2527cae01c..d9d5d43b51b22ce2c6c61025c16343e8133c1338 100644 (file)
--- a/src/target/fa526.c
+++ b/src/target/fa526.c
@@ -292,7 +292,6 @@ static int fa526_init_arch_info_2(struct target *target,
        arm7_9->post_debug_entry = NULL;
 
        arm7_9->pre_restore_context = NULL;
-       arm7_9->post_restore_context = NULL;
 
        /* initialize arch-specific breakpoint handling */
        arm7_9->arm_bkpt = 0xdeeedeee;