Convert DEBUG_JTAG_IO to LOG_DEBUG_IO

[openocd.git] / src / jtag / drivers / arm-jtag-ew.c

diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index 35b6b929f18420343eb820578ce6ce6a18beb129..285bf9b7f9ccdc1ce6e82c11f30ca6ed6b3a0711 100644 (file)
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -108,7 +106,7 @@ static int armjtagew_execute_queue(void)
        while (cmd != NULL) {
                switch (cmd->type) {
                        case JTAG_RUNTEST:
-                               DEBUG_JTAG_IO("runtest %i cycles, end in %i",
+                               LOG_DEBUG_IO("runtest %i cycles, end in %i",
                                                cmd->cmd.runtest->num_cycles, \
                                                cmd->cmd.runtest->end_state);
 
@@ -117,14 +115,14 @@ static int armjtagew_execute_queue(void)
                                break;
 
                        case JTAG_TLR_RESET:
-                               DEBUG_JTAG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
+                               LOG_DEBUG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
 
                                armjtagew_end_state(cmd->cmd.statemove->end_state);
                                armjtagew_state_move();
                                break;
 
                        case JTAG_PATHMOVE:
-                               DEBUG_JTAG_IO("pathmove: %i states, end in %i", \
+                               LOG_DEBUG_IO("pathmove: %i states, end in %i", \
                                                cmd->cmd.pathmove->num_states, \
                                                cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
 
@@ -133,12 +131,12 @@ static int armjtagew_execute_queue(void)
                                break;
 
                        case JTAG_SCAN:
-                               DEBUG_JTAG_IO("scan end in %i", cmd->cmd.scan->end_state);
+                               LOG_DEBUG_IO("scan end in %i", cmd->cmd.scan->end_state);
 
                                armjtagew_end_state(cmd->cmd.scan->end_state);
 
                                scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
-                               DEBUG_JTAG_IO("scan input, length = %d", scan_size);
+                               LOG_DEBUG_IO("scan input, length = %d", scan_size);
 
 #ifdef _DEBUG_USB_COMMS_
                                armjtagew_debug_buffer(buffer, (scan_size + 7) / 8);
@@ -150,7 +148,7 @@ static int armjtagew_execute_queue(void)
                                break;
 
                        case JTAG_RESET:
-                               DEBUG_JTAG_IO("reset trst: %i srst %i",
+                               LOG_DEBUG_IO("reset trst: %i srst %i",
                                                cmd->cmd.reset->trst,
                                                cmd->cmd.reset->srst);
 
@@ -162,7 +160,7 @@ static int armjtagew_execute_queue(void)
                                break;
 
                        case JTAG_SLEEP:
-                               DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
+                               LOG_DEBUG_IO("sleep %i", cmd->cmd.sleep->us);
                                armjtagew_tap_execute();
                                jtag_sleep(cmd->cmd.sleep->us);
                                break;
@@ -355,7 +353,10 @@ static void armjtagew_scan(bool ir_scan,
        /* Move to appropriate scan state */
        armjtagew_end_state(ir_scan ? TAP_IRSHIFT : TAP_DRSHIFT);
 
-       armjtagew_state_move();
+       /* Only move if we're not already there */
+       if (tap_get_state() != tap_get_end_state())
+               armjtagew_state_move();
+
        armjtagew_end_state(saved_end_state);
 
        /* Scan */
@@ -489,6 +490,7 @@ static const struct command_registration armjtagew_command_handlers[] = {
                .handler = &armjtagew_handle_armjtagew_info_command,
                .mode = COMMAND_EXEC,
                .help = "query armjtagew info",
+               .usage = "",
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -645,7 +647,7 @@ static int armjtagew_tap_execute(void)
                                /* Copy to buffer */
                                buf_set_buf(tdo_buffer, first, buffer, 0, length);
 
-                               DEBUG_JTAG_IO("pending scan result, length = %d", length);
+                               LOG_DEBUG_IO("pending scan result, length = %d", length);
 
 #ifdef _DEBUG_USB_COMMS_
                                armjtagew_debug_buffer(buffer, byte_length);
@@ -745,7 +747,7 @@ static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
        result = usb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT, \
                        (char *)usb_out_buffer, out_length, ARMJTAGEW_USB_TIMEOUT);
 
-       DEBUG_JTAG_IO("armjtagew_usb_write, out_length = %d, result = %d", out_length, result);
+       LOG_DEBUG_IO("armjtagew_usb_write, out_length = %d, result = %d", out_length, result);
 
 #ifdef _DEBUG_USB_COMMS_
        armjtagew_debug_buffer(usb_out_buffer, out_length);
@@ -759,7 +761,7 @@ static int armjtagew_usb_read(struct armjtagew *armjtagew, int exp_in_length)
        int result = usb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN, \
                        (char *)usb_in_buffer, exp_in_length, ARMJTAGEW_USB_TIMEOUT);
 
-       DEBUG_JTAG_IO("armjtagew_usb_read, result = %d", result);
+       LOG_DEBUG_IO("armjtagew_usb_read, result = %d", result);
 
 #ifdef _DEBUG_USB_COMMS_
        armjtagew_debug_buffer(usb_in_buffer, result);