Convert DEBUG_JTAG_IO to LOG_DEBUG_IO

[openocd.git] / src / jtag / drivers / usbprog.c

diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index d81c329d4deb7b884839b3f6f3c7dec0b42411d4..bcbaff8d8ede96479e877c216da6cfb063b97671 100644 (file)
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -103,62 +103,50 @@ static int usbprog_execute_queue(void)
 
        while (cmd) {
                switch (cmd->type) {
 
        while (cmd) {
                switch (cmd->type) {

-                   case JTAG_RESET:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("reset trst: %i srst %i",
-                               cmd->cmd.reset->trst,
-                               cmd->cmd.reset->srst);
-#endif
-                           if (cmd->cmd.reset->trst == 1)
-                                   tap_set_state(TAP_RESET);
-                           usbprog_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
-                           break;
-                   case JTAG_RUNTEST:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("runtest %i cycles, end in %i",
-                               cmd->cmd.runtest->num_cycles,
-                               cmd->cmd.runtest->end_state);
-#endif
-                           usbprog_end_state(cmd->cmd.runtest->end_state);
-                           usbprog_runtest(cmd->cmd.runtest->num_cycles);
-                           break;
-                   case JTAG_TLR_RESET:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
-#endif
-                           usbprog_end_state(cmd->cmd.statemove->end_state);
-                           usbprog_state_move();
-                           break;
-                   case JTAG_PATHMOVE:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("pathmove: %i states, end in %i",
-                               cmd->cmd.pathmove->num_states,
-                               cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
-#endif
-                           usbprog_path_move(cmd->cmd.pathmove);
-                           break;
-                   case JTAG_SCAN:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("scan end in %i", cmd->cmd.scan->end_state);
-#endif
-                           usbprog_end_state(cmd->cmd.scan->end_state);
-                           scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
-                           type = jtag_scan_type(cmd->cmd.scan);
-                           usbprog_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size);
-                           if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK)
-                                   return ERROR_JTAG_QUEUE_FAILED;
-                           if (buffer)
-                                   free(buffer);
-                           break;
-                   case JTAG_SLEEP:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("sleep %i", cmd->cmd.sleep->us);
-#endif
-                           jtag_sleep(cmd->cmd.sleep->us);
-                           break;
-                   default:
-                           LOG_ERROR("BUG: unknown JTAG command type encountered");
-                           exit(-1);
+               case JTAG_RESET:
+                       LOG_DEBUG_IO("reset trst: %i srst %i",
+                                       cmd->cmd.reset->trst,
+                                       cmd->cmd.reset->srst);
+                       if (cmd->cmd.reset->trst == 1)
+                               tap_set_state(TAP_RESET);
+                       usbprog_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
+                       break;
+               case JTAG_RUNTEST:
+                       LOG_DEBUG_IO("runtest %i cycles, end in %i",
+                                       cmd->cmd.runtest->num_cycles,
+                                       cmd->cmd.runtest->end_state);
+                       usbprog_end_state(cmd->cmd.runtest->end_state);
+                       usbprog_runtest(cmd->cmd.runtest->num_cycles);
+                       break;
+               case JTAG_TLR_RESET:
+                       LOG_DEBUG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
+                       usbprog_end_state(cmd->cmd.statemove->end_state);
+                       usbprog_state_move();
+                       break;
+               case JTAG_PATHMOVE:
+                       LOG_DEBUG_IO("pathmove: %i states, end in %i",
+                                       cmd->cmd.pathmove->num_states,
+                                       cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
+                       usbprog_path_move(cmd->cmd.pathmove);
+                       break;
+               case JTAG_SCAN:
+                       LOG_DEBUG_IO("scan end in %i", cmd->cmd.scan->end_state);
+                       usbprog_end_state(cmd->cmd.scan->end_state);
+                       scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
+                       type = jtag_scan_type(cmd->cmd.scan);
+                       usbprog_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size);
+                       if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK)
+                               return ERROR_JTAG_QUEUE_FAILED;
+                       if (buffer)
+                               free(buffer);
+                       break;
+               case JTAG_SLEEP:
+                       LOG_DEBUG_IO("sleep %i", cmd->cmd.sleep->us);
+                       jtag_sleep(cmd->cmd.sleep->us);
+                       break;
+               default:
+                       LOG_ERROR("BUG: unknown JTAG command type encountered");
+                       exit(-1);

                }
 
                cmd = cmd->next;
                }
 
                cmd = cmd->next;


@@ -270,10 +258,8 @@ static void usbprog_runtest(int num_cycles)
                usbprog_write(0, 0, 0);
        }
 
                usbprog_write(0, 0, 0);
        }
 

-#ifdef _DEBUG_JTAG_IO_
-       LOG_DEBUG("runtest: cur_state %s end_state %s", tap_state_name(
+       LOG_DEBUG_IO("runtest: cur_state %s end_state %s", tap_state_name(

                        tap_get_state()), tap_state_name(tap_get_end_state()));
                        tap_get_state()), tap_state_name(tap_get_end_state()));

-#endif

 
        /* finish in end_state */
        /*
 
        /* finish in end_state */
        /*