projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- rename log functions to stop conflicts under win32 (wingdi)
[fw/openocd]
/
src
/
xsvf
/
xsvf.c
diff --git
a/src/xsvf/xsvf.c
b/src/xsvf/xsvf.c
index b589a8a75de6069f8feb4f32f5aa16dc95e6144e..d9b63163037c55a39675e40e82b27bf6c0501425 100644
(file)
--- a/
src/xsvf/xsvf.c
+++ b/
src/xsvf/xsvf.c
@@
-96,7
+96,7
@@
int xsvf_read_xstates(int fd, enum tap_state *path, int max_path, int *path_len)
{
if (*path_len > max_path)
{
{
if (*path_len > max_path)
{
- WARNING("XSTATE path longer than max_path");
+
LOG_
WARNING("XSTATE path longer than max_path");
break;
}
if (read(fd, &uc, 1) < 0)
break;
}
if (read(fd, &uc, 1) < 0)
@@
-154,7
+154,7
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
switch (c)
{
case 0x00: /* XCOMPLETE */
switch (c)
{
case 0x00: /* XCOMPLETE */
- DEBUG("XCOMPLETE");
+
LOG_
DEBUG("XCOMPLETE");
if (jtag_execute_queue() != ERROR_OK)
{
tdo_mismatch = 1;
if (jtag_execute_queue() != ERROR_OK)
{
tdo_mismatch = 1;
@@
-162,12
+162,12
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
}
break;
case 0x01: /* XTDOMASK */
}
break;
case 0x01: /* XTDOMASK */
- DEBUG("XTDOMASK");
+
LOG_
DEBUG("XTDOMASK");
if (dr_in_mask && (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_in_mask) != ERROR_OK))
do_abort = 1;
break;
case 0x02: /* XSIR */
if (dr_in_mask && (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_in_mask) != ERROR_OK))
do_abort = 1;
break;
case 0x02: /* XSIR */
- DEBUG("XSIR");
+
LOG_
DEBUG("XSIR");
if (read(xsvf_fd, &c, 1) < 0)
do_abort = 1;
else
if (read(xsvf_fd, &c, 1) < 0)
do_abort = 1;
else
@@
-215,7
+215,7
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
}
break;
case 0x03: /* XSDR */
}
break;
case 0x03: /* XSDR */
- DEBUG("XSDR");
+
LOG_
DEBUG("XSDR");
if (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_out_buf) != ERROR_OK)
do_abort = 1;
else
if (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_out_buf) != ERROR_OK)
do_abort = 1;
else
@@
-252,7
+252,7
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
}
break;
case 0x04: /* XRUNTEST */
}
break;
case 0x04: /* XRUNTEST */
- DEBUG("XRUNTEST");
+
LOG_
DEBUG("XRUNTEST");
if (read(xsvf_fd, buf4, 4) < 0)
do_abort = 1;
else
if (read(xsvf_fd, buf4, 4) < 0)
do_abort = 1;
else
@@
-261,7
+261,7
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
}
break;
case 0x07: /* XREPEAT */
}
break;
case 0x07: /* XREPEAT */
- DEBUG("XREPEAT");
+
LOG_
DEBUG("XREPEAT");
if (read(xsvf_fd, &c, 1) < 0)
do_abort = 1;
else
if (read(xsvf_fd, &c, 1) < 0)
do_abort = 1;
else
@@
-270,7
+270,7
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
}
break;
case 0x08: /* XSDRSIZE */
}
break;
case 0x08: /* XSDRSIZE */
- DEBUG("XSDRSIZE");
+
LOG_
DEBUG("XSDRSIZE");
if (read(xsvf_fd, buf4, 4) < 0)
do_abort = 1;
else
if (read(xsvf_fd, buf4, 4) < 0)
do_abort = 1;
else
@@
-285,7
+285,7
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
}
break;
case 0x09: /* XSDRTDO */
}
break;
case 0x09: /* XSDRTDO */
- DEBUG("XSDRTDO");
+
LOG_
DEBUG("XSDRTDO");
if (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_out_buf) != ERROR_OK)
do_abort = 1;
else
if (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_out_buf) != ERROR_OK)
do_abort = 1;
else
@@
-327,11
+327,11
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
}
break;
case 0x0a: /* XSETDRMASKS */
}
break;
case 0x0a: /* XSETDRMASKS */
- ERROR("unsupported XSETSDRMASKS\n");
+
LOG_
ERROR("unsupported XSETSDRMASKS\n");
unsupported = 1;
break;
case 0x0b: /* XSDRINC */
unsupported = 1;
break;
case 0x0b: /* XSDRINC */
- ERROR("unsupported XSDRINC\n");
+
LOG_
ERROR("unsupported XSDRINC\n");
unsupported = 1;
break;
case 0x0c: /* XSDRB */
unsupported = 1;
break;
case 0x0c: /* XSDRB */
@@
-353,7
+353,7
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
unsupported = 1;
break;
case 0x12: /* XSTATE */
unsupported = 1;
break;
case 0x12: /* XSTATE */
- DEBUG("XSTATE");
+
LOG_
DEBUG("XSTATE");
if (read(xsvf_fd, &uc, 1) < 0)
do_abort = 1;
else
if (read(xsvf_fd, &uc, 1) < 0)
do_abort = 1;
else
@@
-371,7
+371,7
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
}
break;
case 0x13: /* XENDIR */
}
break;
case 0x13: /* XENDIR */
- DEBUG("XENDIR");
+
LOG_
DEBUG("XENDIR");
if (read(xsvf_fd, &c, 1) < 0)
do_abort = 1;
else
if (read(xsvf_fd, &c, 1) < 0)
do_abort = 1;
else
@@
-382,13
+382,13
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
xendir = 0xd;
else
{
xendir = 0xd;
else
{
- ERROR("unknown XENDIR endstate");
+
LOG_
ERROR("unknown XENDIR endstate");
unsupported = 1;
}
}
break;
case 0x14: /* XENDDR */
unsupported = 1;
}
}
break;
case 0x14: /* XENDDR */
- DEBUG("XENDDR");
+
LOG_
DEBUG("XENDDR");
if (read(xsvf_fd, &c, 1) < 0)
do_abort = 1;
else
if (read(xsvf_fd, &c, 1) < 0)
do_abort = 1;
else
@@
-399,13
+399,13
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
xenddr = 0x6;
else
{
xenddr = 0x6;
else
{
- ERROR("unknown XENDDR endstate");
+
LOG_
ERROR("unknown XENDDR endstate");
unsupported = 1;
}
}
break;
case 0x15: /* XSIR2 */
unsupported = 1;
}
}
break;
case 0x15: /* XSIR2 */
- DEBUG("XSIR2");
+
LOG_
DEBUG("XSIR2");
if (read(xsvf_fd, buf2, 2) < 0)
do_abort = 1;
else
if (read(xsvf_fd, buf2, 2) < 0)
do_abort = 1;
else
@@
-446,7
+446,7
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
} while (c != 0);
break;
case 0x17: /* XWAIT */
} while (c != 0);
break;
case 0x17: /* XWAIT */
- DEBUG("XWAIT");
+
LOG_
DEBUG("XWAIT");
if ((read(xsvf_fd, &uc, 1) < 0) || (read(xsvf_fd, &uc2, 1) < 0) || (read(xsvf_fd, buf4, 4) < 0))
do_abort = 1;
else
if ((read(xsvf_fd, &uc, 1) < 0) || (read(xsvf_fd, &uc2, 1) < 0) || (read(xsvf_fd, buf4, 4) < 0))
do_abort = 1;
else
@@
-458,7
+458,7
@@
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
}
break;
default:
}
break;
default:
- ERROR("unknown xsvf command (0x%2.2x)\n", c);
+
LOG_
ERROR("unknown xsvf command (0x%2.2x)\n", c);
unsupported = 1;
}
unsupported = 1;
}