projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
target/target.c: fixed rp check bug in asynchronous flash write algorithm.
[fw/openocd]
/
src
/
target
/
arm_jtag.c
diff --git
a/src/target/arm_jtag.c
b/src/target/arm_jtag.c
index f8b5f4f4f1fd652494a5575e839f045247d1e570..6f70e853a04bf9cedd20f1c0e5c215569e0f33ba 100644
(file)
--- a/
src/target/arm_jtag.c
+++ b/
src/target/arm_jtag.c
@@
-18,20
+18,21
@@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 5
9 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
+ * 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
***************************************************************************/
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "arm_jtag.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "arm_jtag.h"
-
#if 0
#define _ARM_JTAG_SCAN_N_CHECK_
#endif
#if 0
#define _ARM_JTAG_SCAN_N_CHECK_
#endif
-int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
+int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info,
+ uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
{
struct jtag_tap *tap;
tap = jtag_info->tap;
{
struct jtag_tap *tap;
tap = jtag_info->tap;
@@
-40,14
+41,12
@@
int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr, vo
field.num_bits = tap->ir_length;
field.out_value = t;
field.num_bits = tap->ir_length;
field.out_value = t;
- buf_set_u32(
field.out_value
, 0, field.num_bits, new_instr);
+ buf_set_u32(
t
, 0, field.num_bits, new_instr);
field.in_value = NULL;
if (no_verify_capture == NULL)
field.in_value = NULL;
if (no_verify_capture == NULL)
- {
jtag_add_ir_scan(tap, &field, end_state);
jtag_add_ir_scan(tap, &field, end_state);
- } else
- {
+ else {
/* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
* have special verification code.
*/
/* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
* have special verification code.
*/
@@
-60,21
+59,18
@@
int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr, vo
int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state)
{
int retval = ERROR_OK;
int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state)
{
int retval = ERROR_OK;
- uint32_t values[1];
- int num_bits[1];
- values[0]=new_scan_chain;
- num_bits[0]=jtag_info->scann_size;
+ uint8_t out_value[4];
+ buf_set_u32(out_value, 0, jtag_info->scann_size, new_scan_chain);
+ struct scan_field field = { .num_bits = jtag_info->scann_size, .out_value = out_value, };
- if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state)) != ERROR_OK)
- {
+ retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state);
+ if (retval != ERROR_OK)
return retval;
return retval;
- }
- jtag_add_dr_
out
(jtag_info->tap,
+ jtag_add_dr_
scan
(jtag_info->tap,
1,
1,
- num_bits,
- values,
+ &field,
end_state);
jtag_info->cur_scan_chain = new_scan_chain;
end_state);
jtag_info->cur_scan_chain = new_scan_chain;
@@
-82,14
+78,12
@@
int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, ta
return retval;
}
return retval;
}
-int arm_jtag_reset_callback(enum jtag_event event, void *priv)
+
static
int arm_jtag_reset_callback(enum jtag_event event, void *priv)
{
struct arm_jtag *jtag_info = priv;
if (event == JTAG_TRST_ASSERTED)
{
struct arm_jtag *jtag_info = priv;
if (event == JTAG_TRST_ASSERTED)
- {
jtag_info->cur_scan_chain = 0;
jtag_info->cur_scan_chain = 0;
- }
return ERROR_OK;
}
return ERROR_OK;
}