This is an automated email from Gerrit.
Franck Jullien (franck.jull...@gmail.com) just uploaded a new patch set to
Gerrit, which you can find at http://openocd.zylin.com/2163
-- gerrit
commit a0c14b379f793c3843a2fd3db094033323d41258
Author: Franck Jullien <franck.jull...@gmail.com>
Date: Mon Jun 9 21:31:47 2014 +0200
openrisc: restore current JTAG module while polling the CPU
Change-Id: I93827afaa164d23a93bdddbfa864624b18473f45
Signed-off-by: Franck Jullien <franck.jull...@gmail.com>
diff --git a/src/target/openrisc/or1k_du_adv.c
b/src/target/openrisc/or1k_du_adv.c
index f497a86..8a5562f 100644
--- a/src/target/openrisc/or1k_du_adv.c
+++ b/src/target/openrisc/or1k_du_adv.c
@@ -50,6 +50,7 @@
#define DBG_MODULE_SELECT_REG_SIZE 2
#define DBG_MAX_MODULES 4
+#define DC_NONE -1
#define DC_WISHBONE 0
#define DC_CPU0 1
#define DC_CPU1 2
@@ -173,7 +174,7 @@ static int or1k_adv_jtag_init(struct or1k_jtag *jtag_info)
jtag_info->or1k_jtag_inited = 1;
/* TAP reset - not sure what state debug module chain is in now */
- jtag_info->or1k_jtag_module_selected = -1;
+ jtag_info->or1k_jtag_module_selected = DC_NONE;
jtag_info->current_reg_idx = malloc(DBG_MAX_MODULES * sizeof(uint8_t));
memset(jtag_info->current_reg_idx, 0, DBG_MAX_MODULES *
sizeof(uint8_t));
@@ -781,6 +782,8 @@ static int or1k_adv_is_cpu_running(struct or1k_jtag
*jtag_info, int *running)
return retval;
}
+ int current = jtag_info->or1k_jtag_module_selected;
+
retval = adbg_select_module(jtag_info, DC_CPU0);
if (retval != ERROR_OK)
return retval;
@@ -795,6 +798,12 @@ static int or1k_adv_is_cpu_running(struct or1k_jtag
*jtag_info, int *running)
else
*running = 1;
+ if (current != DC_NONE) {
+ retval = adbg_select_module(jtag_info, current);
+ if (retval != ERROR_OK)
+ return retval;
+ }
+
return ERROR_OK;
}
--
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
