This is an automated email from Gerrit.

Hsiangkai Wang ([email protected]) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/1574

-- gerrit

commit 0a4d110b79ff0f4fb422dabe45bcc29b4de71912
Author: Hsiangkai Wang <[email protected]>
Date:   Mon May 27 13:18:08 2013 +0800

    nds32: always polling after gdb attached
    
    Do not turn on/off polling as leave/enter debug mode.
    Enable polling after gdb attached, and disable polling
    after gdb detached.
    
    Change-Id: Id64459b86f44937af7ea5ccfe2cd13e31732eecf
    Signed-off-by: Hsiangkai Wang <[email protected]>

diff --git a/src/target/nds32.c b/src/target/nds32.c
index 0cb7534..e5530cc 100644
--- a/src/target/nds32.c
+++ b/src/target/nds32.c
@@ -2160,8 +2160,6 @@ int nds32_assert_reset(struct target *target)
        struct nds32 *nds32 = target_to_nds32(target);
        struct aice_port_s *aice = target_to_aice(target);
 
-       jtag_poll_set_enabled(true);
-
        if (target->reset_halt) {
                if (nds32->soft_reset_halt)
                        target->type->soft_reset_halt(target);
@@ -2199,7 +2197,9 @@ static int nds32_gdb_attach(struct nds32 *nds32)
                }
 
                target_halt(nds32->target);
-               target_poll(nds32->target);
+
+               /* turn on polling */
+               jtag_poll_set_enabled(true);
 
                gdb_attached = true;
        }
diff --git a/src/target/nds32_v2.c b/src/target/nds32_v2.c
index ceeed0a..c774194 100644
--- a/src/target/nds32_v2.c
+++ b/src/target/nds32_v2.c
@@ -287,8 +287,6 @@ static int nds32_v2_debug_entry(struct nds32 *nds32, bool 
enable_watchpoint)
 {
        LOG_DEBUG("nds32_v2_debug_entry");
 
-       jtag_poll_set_enabled(false);
-
        if (nds32->virtual_hosting)
                LOG_WARNING("<-- TARGET WARNING! Virtual hosting is not 
supported "
                                "under V1/V2 architecture. -->");
@@ -387,8 +385,6 @@ static int nds32_v2_leave_debug_state(struct nds32 *nds32, 
bool enable_watchpoin
 
        register_cache_invalidate(nds32->core_cache);
 
-       jtag_poll_set_enabled(true);
-
        return ERROR_OK;
 }
 
@@ -426,10 +422,6 @@ static int nds32_v2_deassert_reset(struct target *target)
                retval = target_halt(target);
                if (retval != ERROR_OK)
                        return retval;
-               /* call target_poll() to avoid "Halt timed out" */
-               CHECK_RETVAL(target_poll(target));
-       } else {
-               jtag_poll_set_enabled(false);
        }
 
        return ERROR_OK;
diff --git a/src/target/nds32_v3.c b/src/target/nds32_v3.c
index 5996a90..f1763cb 100644
--- a/src/target/nds32_v3.c
+++ b/src/target/nds32_v3.c
@@ -254,12 +254,8 @@ static int nds32_v3_deassert_reset(struct target *target)
                if (retval != ERROR_OK)
                        return retval;
 
-               /* call target_poll() to avoid "Halt timed out" */
-               CHECK_RETVAL(target_poll(target));
        } else {
                /* reset-halt */
-               jtag_poll_set_enabled(false);
-
                struct nds32_v3_common *nds32_v3 = target_to_nds32_v3(target);
                struct nds32 *nds32 = &(nds32_v3->nds32);
                uint32_t value;
diff --git a/src/target/nds32_v3_common.c b/src/target/nds32_v3_common.c
index f0cd77d..b524679 100644
--- a/src/target/nds32_v3_common.c
+++ b/src/target/nds32_v3_common.c
@@ -71,8 +71,6 @@ static int nds32_v3_debug_entry(struct nds32 *nds32, bool 
enable_watchpoint)
 {
        LOG_DEBUG("nds32_v3_debug_entry");
 
-       jtag_poll_set_enabled(false);
-
        enum target_state backup_state = nds32->target->state;
        nds32->target->state = TARGET_HALTED;
 
@@ -117,8 +115,6 @@ static int nds32_v3_debug_entry(struct nds32 *nds32, bool 
enable_watchpoint)
                if (enable_watchpoint)
                        
CHECK_RETVAL(v3_common_callback->activate_hardware_watchpoint(nds32->target));
 
-               jtag_poll_set_enabled(true);
-
                return ERROR_FAIL;
        }
 
@@ -228,9 +224,6 @@ static int nds32_v3_leave_debug_state(struct nds32 *nds32, 
bool enable_watchpoin
                target_add_breakpoint(target, &syscall_breakpoint);
        }
 
-       /* enable polling */
-       jtag_poll_set_enabled(true);
-
        return ERROR_OK;
 }
 
diff --git a/src/target/nds32_v3m.c b/src/target/nds32_v3m.c
index d72d986..35a7637 100644
--- a/src/target/nds32_v3m.c
+++ b/src/target/nds32_v3m.c
@@ -235,10 +235,7 @@ static int nds32_v3m_deassert_reset(struct target *target)
                retval = target_halt(target);
                if (retval != ERROR_OK)
                        return retval;
-               /* call target_poll() to avoid "Halt timed out" */
-               CHECK_RETVAL(target_poll(target));
-       } else {
-               jtag_poll_set_enabled(false);
+
        }
 
        return ERROR_OK;

-- 

------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to