zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

David Brownell <david-b@pacbell.net>: 

Whitespace fixes in jtag.c ... mostly end-of-line crap.
Flag "jtag_device" command as obsolete in its helptext.


git-svn-id: svn://svn.berlios.de/openocd/trunk@1987 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
zwelch 2009-06-01 23:13:24 +00:00
parent 4caa72b988
commit 5120d1263b
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jtag/jtag.c
View File

@ -6,7 +6,7 @@
* oyvind.harboe@zylin.com * * oyvind.harboe@zylin.com *
* * * *
* Copyright (C) 2009 SoftPLC Corporation * * Copyright (C) 2009 SoftPLC Corporation *
* http://softplc.com * * http://softplc.com *
* dick@softplc.com * * dick@softplc.com *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@ -595,12 +595,10 @@ void jtag_add_ir_scan(int in_num_fields, scan_field_t *in_fields, tap_state_t st
{ {
if (jtag_verify&&jtag_verify_capture_ir) if (jtag_verify&&jtag_verify_capture_ir)
{ {
/* 8 x 32 bit id's is enough for all invoations */ /* 8 x 32 bit id's is enough for all invocations */
for (int j = 0; j < in_num_fields; j++) for (int j = 0; j < in_num_fields; j++)
{ {
in_fields[j].check_value=NULL;
in_fields[j].check_mask=NULL;
/* if we are to run a verification of the ir scan, we need to get the input back. /* if we are to run a verification of the ir scan, we need to get the input back.
* We may have to allocate space if the caller didn't ask for the input back. * We may have to allocate space if the caller didn't ask for the input back.
*/ */
@ -2322,7 +2320,7 @@ int jtag_register_commands(struct command_context_s *cmd_ctx)
COMMAND_ANY, "set maximum jtag speed (if supported); " COMMAND_ANY, "set maximum jtag speed (if supported); "
"parameter is maximum khz, or 0 for adaptive clocking (RTCK)."); "parameter is maximum khz, or 0 for adaptive clocking (RTCK).");
register_command(cmd_ctx, NULL, "jtag_device", handle_jtag_device_command, register_command(cmd_ctx, NULL, "jtag_device", handle_jtag_device_command,
COMMAND_CONFIG, "jtag_device <ir_length> <ir_expected> <ir_mask>"); COMMAND_CONFIG, "(DEPRECATED) jtag_device <ir_length> <ir_expected> <ir_mask>");
register_command(cmd_ctx, NULL, "reset_config", handle_reset_config_command, register_command(cmd_ctx, NULL, "reset_config", handle_reset_config_command,
COMMAND_ANY, COMMAND_ANY,
"[none/trst_only/srst_only/trst_and_srst] [srst_pulls_trst/trst_pulls_srst] [combined/separate] [trst_push_pull/trst_open_drain] [srst_push_pull/srst_open_drain]"); "[none/trst_only/srst_only/trst_and_srst] [srst_pulls_trst/trst_pulls_srst] [combined/separate] [trst_push_pull/trst_open_drain] [srst_push_pull/srst_open_drain]");
@ -3369,7 +3367,7 @@ static const struct tms_sequences old_tms_seqs[6][6] = /* [from_state_ndx][to_
* N.B. OOCD clocks TMS from LSB first, so read these right-to-left. * N.B. OOCD clocks TMS from LSB first, so read these right-to-left.
* N.B. These values are tightly bound to the table in tap_get_tms_path_len(). * N.B. These values are tightly bound to the table in tap_get_tms_path_len().
* N.B. Reset only needs to be 0b11111, but in JLink an even byte of 1's is more stable. * N.B. Reset only needs to be 0b11111, but in JLink an even byte of 1's is more stable.
* These extra ones cause no TAP state problem, because we go into reset and stay in reset. * These extra ones cause no TAP state problem, because we go into reset and stay in reset.
*/ */
@ -3388,7 +3386,7 @@ static const struct tms_sequences old_tms_seqs[6][6] = /* [from_state_ndx][to_
static const struct tms_sequences short_tms_seqs[6][6] = /* [from_state_ndx][to_state_ndx] */ static const struct tms_sequences short_tms_seqs[6][6] = /* [from_state_ndx][to_state_ndx] */
{ {
/* this is the table submitted by Jeff Williams on 3/30/2009 with this comment: /* this is the table submitted by Jeff Williams on 3/30/2009 with this comment:
OK, I added Peter's version of the state table, and it works OK for OK, I added Peter's version of the state table, and it works OK for
me on MC1322x. I've recreated the jlink portion of patch with this me on MC1322x. I've recreated the jlink portion of patch with this
@ -3443,7 +3441,7 @@ bool tap_is_state_stable(tap_state_t astate)
{ {
bool is_stable; bool is_stable;
/* A switch() is used because it is symbol dependent /* A switch() is used because it is symbol dependent
(not value dependent like an array), and can also check bounds. (not value dependent like an array), and can also check bounds.
*/ */
switch( astate ) switch( astate )
@ -3467,7 +3465,7 @@ tap_state_t tap_state_transition(tap_state_t cur_state, bool tms)
{ {
tap_state_t new_state; tap_state_t new_state;
/* A switch is used because it is symbol dependent and not value dependent /* A switch is used because it is symbol dependent and not value dependent
like an array. Also it can check for out of range conditions. like an array. Also it can check for out of range conditions.
*/ */