Howdy,
I have attached a patch to simplify the jlink.c file, which I wanted to
submit before trying to do some more work on that module. With these
changes, the code will fit neatly into an 80 column terminal and should
be much easier to read. There should not be _any_ functional changes;
even the pre-existing warnings should be intact.
That said, I did invert numerous logic tests to allow their blocks of
the code to require less indentation. The biggest improvement in this
regard was in jlink_usb_message, which became nearly flat after
unwinding its logic. I also re-factored most of jlink_execute_queue
into a nearby static helper function, mostly for the same reason.
To aid reviewing this patch, I suggest applying it to a working copy and
using 'svn diff -x -w' to mask the lines that only changed whitespace.
This reduces the number of lines reported changed by over half.
Cheers,
Zach Welch
Corvallis, OR
Index: src/jtag/jlink.c
===================================================================
--- src/jtag/jlink.c (revision 1433)
+++ src/jtag/jlink.c (working copy)
@@ -85,14 +85,16 @@
int jlink_quit(void);
/* CLI command handler functions */
-int jlink_handle_jlink_info_command(struct command_context_s *cmd_ctx, char
*cmd, char **args, int argc);
+int jlink_handle_jlink_info_command(struct command_context_s *cmd_ctx,
+ char *cmd, char **args, int argc);
/* Queue command functions */
void jlink_end_state(tap_state_t state);
void jlink_state_move(void);
void jlink_path_move(int num_states, tap_state_t *path);
void jlink_runtest(int num_cycles);
-void jlink_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size,
scan_command_t *command);
+void jlink_scan(int ir_scan, enum scan_type type,
+ u8 *buffer, int scan_size, scan_command_t *command);
void jlink_reset(int trst, int srst);
void jlink_simple_command(u8 command);
int jlink_get_status(void);
@@ -140,95 +142,107 @@
.quit = jlink_quit
};
-int jlink_execute_queue(void)
+static void jlink_execute_queue_command(jtag_command_t *cmd)
{
- jtag_command_t *cmd = jtag_command_queue;
int scan_size;
enum scan_type type;
u8 *buffer;
- while (cmd != NULL)
+ switch (cmd->type)
{
- switch (cmd->type)
+ case JTAG_END_STATE:
+ DEBUG_JTAG_IO("end_state: %i", cmd->cmd.end_state->end_state);
+
+ if (cmd->cmd.end_state->end_state != -1)
{
- case JTAG_END_STATE:
- DEBUG_JTAG_IO("end_state: %i",
cmd->cmd.end_state->end_state);
+ jlink_end_state(cmd->cmd.end_state->end_state);
+ }
+ break;
- if (cmd->cmd.end_state->end_state != -1)
- {
-
jlink_end_state(cmd->cmd.end_state->end_state);
- }
- break;
+ case JTAG_RUNTEST:
+ DEBUG_JTAG_IO( "runtest %i cycles, end in %i",i
+ cmd->cmd.runtest->num_cycles,
+ cmd->cmd.runtest->end_state);
- case JTAG_RUNTEST:
- DEBUG_JTAG_IO( "runtest %i cycles, end in %i",
cmd->cmd.runtest->num_cycles, \
- cmd->cmd.runtest->end_state);
+ if (cmd->cmd.runtest->end_state != -1)
+ {
+ jlink_end_state(cmd->cmd.runtest->end_state);
+ }
+ jlink_runtest(cmd->cmd.runtest->num_cycles);
+ break;
- if (cmd->cmd.runtest->end_state != -1)
- {
-
jlink_end_state(cmd->cmd.runtest->end_state);
- }
- jlink_runtest(cmd->cmd.runtest->num_cycles);
- break;
+ case JTAG_STATEMOVE:
+ DEBUG_JTAG_IO("statemove end in %i",
+ cmd->cmd.statemove->end_state);
- case JTAG_STATEMOVE:
- DEBUG_JTAG_IO("statemove end in %i",
cmd->cmd.statemove->end_state);
+ if (cmd->cmd.statemove->end_state != -1)
+ {
+ jlink_end_state(cmd->cmd.statemove->end_state);
+ }
+ jlink_state_move();
+ break;
- if (cmd->cmd.statemove->end_state != -1)
- {
-
jlink_end_state(cmd->cmd.statemove->end_state);
- }
- jlink_state_move();
- break;
+ case JTAG_PATHMOVE:
+ DEBUG_JTAG_IO("pathmove: %i states, end in %i",
+ cmd->cmd.pathmove->num_states,
+ cmd->cmd.pathmove->path[
+ cmd->cmd.pathmove->num_states - 1]);
- case JTAG_PATHMOVE:
- DEBUG_JTAG_IO("pathmove: %i states, end in %i",
\
- cmd->cmd.pathmove->num_states, \
-
cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
+ jlink_path_move(cmd->cmd.pathmove->num_states,
+ cmd->cmd.pathmove->path);
+ break;
- jlink_path_move(cmd->cmd.pathmove->num_states,
cmd->cmd.pathmove->path);
- break;
+ case JTAG_SCAN:
+ DEBUG_JTAG_IO("scan end in %i", cmd->cmd.scan->end_state);
- case JTAG_SCAN:
- DEBUG_JTAG_IO("scan end in %i",
cmd->cmd.scan->end_state);
+ if (cmd->cmd.scan->end_state != -1)
+ {
+ jlink_end_state(cmd->cmd.scan->end_state);
+ }
- if (cmd->cmd.scan->end_state != -1)
- {
-
jlink_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);
- scan_size = jtag_build_buffer(cmd->cmd.scan,
&buffer);
- DEBUG_JTAG_IO("scan input, length = %d",
scan_size);
-
#ifdef _DEBUG_USB_COMMS_
- jlink_debug_buffer(buffer, (scan_size + 7) / 8);
+ jlink_debug_buffer(buffer, (scan_size + 7) / 8);
#endif
- type = jtag_scan_type(cmd->cmd.scan);
- jlink_scan(cmd->cmd.scan->ir_scan, type,
buffer, scan_size, cmd->cmd.scan);
- break;
+ type = jtag_scan_type(cmd->cmd.scan);
+ jlink_scan(cmd->cmd.scan->ir_scan, type,
+ buffer, scan_size, cmd->cmd.scan);
+ break;
- case JTAG_RESET:
- DEBUG_JTAG_IO("reset trst: %i srst %i",
cmd->cmd.reset->trst, cmd->cmd.reset->srst);
+ case JTAG_RESET:
+ DEBUG_JTAG_IO("reset trst: %i srst %i",
+ cmd->cmd.reset->trst, cmd->cmd.reset->srst);
- jlink_tap_execute();
+ jlink_tap_execute();
- if (cmd->cmd.reset->trst == 1)
- {
- tap_set_state(TAP_RESET);
- }
- jlink_reset(cmd->cmd.reset->trst,
cmd->cmd.reset->srst);
- break;
+ if (cmd->cmd.reset->trst == 1)
+ {
+ tap_set_state(TAP_RESET);
+ }
+ jlink_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
+ break;
- case JTAG_SLEEP:
- DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
- jlink_tap_execute();
- jtag_sleep(cmd->cmd.sleep->us);
- break;
+ case JTAG_SLEEP:
+ DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
+ jlink_tap_execute();
+ jtag_sleep(cmd->cmd.sleep->us);
+ break;
- default:
- LOG_ERROR("BUG: unknown JTAG command type
encountered");
- exit(-1);
- }
+ default:
+ LOG_ERROR("BUG: unknown JTAG command type encountered");
+ exit(-1);
+ }
+}
+
+int jlink_execute_queue(void)
+{
+ jtag_command_t *cmd = jtag_command_queue;
+
+ while (cmd != NULL)
+ {
+ jlink_execute_queue_command(cmd);
cmd = cmd->next;
}
@@ -240,31 +254,31 @@
{
int result;
- if (speed <= JLINK_MAX_SPEED)
+ if (speed > JLINK_MAX_SPEED)
{
- /* check for RTCK setting */
- if (speed == 0)
- speed = -1;
+ LOG_INFO("Requested speed %dkHz exceeds maximum of %dkHz,
ignored",
+ speed, JLINK_MAX_SPEED);
+ return ERROR_OK;
+ }
- usb_out_buffer[0] = EMU_CMD_SET_SPEED;
- usb_out_buffer[1] = (speed >> 0) & 0xff;
- usb_out_buffer[2] = (speed >> 8) & 0xff;
+ /* check for RTCK setting */
+ if (speed == 0)
+ speed = -1;
- result = jlink_usb_write(jlink_jtag_handle, 3);
+ usb_out_buffer[0] = EMU_CMD_SET_SPEED;
+ usb_out_buffer[1] = (speed >> 0) & 0xff;
+ usb_out_buffer[2] = (speed >> 8) & 0xff;
- if (result == 3)
- {
- return ERROR_OK;
- }
- else
- {
- LOG_ERROR("J-Link setting speed failed (%d)", result);
- return ERROR_JTAG_DEVICE_ERROR;
- }
+ result = jlink_usb_write(jlink_jtag_handle, 3);
+
+ if (result == 3)
+ {
+ return ERROR_OK;
}
else
{
- LOG_INFO("Requested speed %dkHz exceeds maximum of %dkHz,
ignored", speed, JLINK_MAX_SPEED);
+ LOG_ERROR("J-Link setting speed failed (%d)", result);
+ return ERROR_JTAG_DEVICE_ERROR;
}
return ERROR_OK;
@@ -279,7 +293,8 @@
int jlink_register_commands(struct command_context_s *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "jlink_info",
jlink_handle_jlink_info_command, COMMAND_EXEC,
+ register_command(cmd_ctx, NULL, "jlink_info",
+ jlink_handle_jlink_info_command, COMMAND_EXEC,
"query jlink info");
return ERROR_OK;
}
@@ -292,7 +307,8 @@
if (jlink_jtag_handle == 0)
{
- LOG_ERROR("Cannot find jlink Interface! Please check connection
and permissions.");
+ LOG_ERROR("Cannot find jlink Interface! "
+ "Please check connection and permissions.");
return ERROR_JTAG_INIT_FAILED;
}
@@ -376,7 +392,9 @@
}
else
{
- LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
tap_state_name(tap_get_state()), tap_state_name(path[i]));
+ LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
+ tap_state_name(tap_get_state()),
+ tap_state_name(path[i]));
exit(-1);
}
@@ -413,7 +431,8 @@
}
}
-void jlink_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size,
scan_command_t *command)
+void jlink_scan(int ir_scan, enum scan_type type,
+ u8 *buffer, int scan_size, scan_command_t *command)
{
tap_state_t saved_end_state;
@@ -487,24 +506,23 @@
jlink_simple_command(EMU_CMD_GET_STATE);
result = jlink_usb_read(jlink_jtag_handle);
- if (result == 8)
+ if (result != 8)
{
- int vref = usb_in_buffer[0] + (usb_in_buffer[1] << 8);
- LOG_INFO("Vref = %d.%d TCK = %d TDI = %d TDO = %d TMS = %d SRST
= %d TRST = %d\n", \
- vref / 1000, vref % 1000, \
- usb_in_buffer[2], usb_in_buffer[3], usb_in_buffer[4], \
- usb_in_buffer[5], usb_in_buffer[6], usb_in_buffer[7]);
+ LOG_ERROR("J-Link command EMU_CMD_GET_STATE failed (%d)\n",
+ result);
+ return ERROR_OK;
+ }
+ int vref = usb_in_buffer[0] + (usb_in_buffer[1] << 8);
+ LOG_INFO("Vref = %d.%d TCK = %d TDI = %d "
+ "TDO = %d TMS = %d SRST = %d TRST = %d\n",
+ vref / 1000, vref % 1000,
+ usb_in_buffer[2], usb_in_buffer[3], usb_in_buffer[4],
+ usb_in_buffer[5], usb_in_buffer[6], usb_in_buffer[7]);
- if (vref < 1500)
- {
- LOG_ERROR("Vref too low. Check Target Power\n");
- }
- }
- else
+ if (vref < 1500)
{
- LOG_ERROR("J-Link command EMU_CMD_GET_STATE failed (%d)\n",
result);
+ LOG_ERROR("Vref too low. Check Target Power\n");
}
-
return ERROR_OK;
}
@@ -534,7 +552,8 @@
return ERROR_JTAG_DEVICE_ERROR;
}
-int jlink_handle_jlink_info_command(struct command_context_s *cmd_ctx, char
*cmd, char **args, int argc)
+int jlink_handle_jlink_info_command(struct command_context_s *cmd_ctx,
+ char *cmd, char **args, int argc)
{
if (jlink_get_version_info() == ERROR_OK)
{
@@ -593,35 +612,34 @@
last_tms = tms;
int index = tap_length / 8;
- if (index < JLINK_TAP_BUFFER_SIZE)
+ if (index >= JLINK_TAP_BUFFER_SIZE)
{
- int bit_index = tap_length % 8;
- u8 bit = 1 << bit_index;
+ LOG_ERROR("jlink_tap_append_step, overflow");
+ return;
+ }
- if (tms)
- {
- tms_buffer[index] |= bit;
- }
- else
- {
- tms_buffer[index] &= ~bit;
- }
+ int bit_index = tap_length % 8;
+ u8 bit = 1 << bit_index;
- if (tdi)
- {
- tdi_buffer[index] |= bit;
- }
- else
- {
- tdi_buffer[index] &= ~bit;
- }
+ if (tms)
+ {
+ tms_buffer[index] |= bit;
+ }
+ else
+ {
+ tms_buffer[index] &= ~bit;
+ }
- tap_length++;
+ if (tdi)
+ {
+ tdi_buffer[index] |= bit;
}
else
{
- LOG_ERROR("jlink_tap_append_step, overflow");
+ tdi_buffer[index] &= ~bit;
}
+
+ tap_length++;
}
void jlink_tap_append_scan(int length, u8 *buffer, scan_command_t *command)
@@ -636,7 +654,8 @@
for (i = 0; i < length; i++)
{
- jlink_tap_append_step((i < length-1 ? 0 : 1), (buffer[i/8] >>
(i%8)) & 1);
+ jlink_tap_append_step((i < length-1 ? 0 : 1),
+ (buffer[i/8] >> (i%8)) & 1);
}
pending_scan_results_length++;
}
@@ -651,82 +670,82 @@
int i;
int result;
- if (tap_length > 0)
+ if (tap_length <= 0)
+ return ERROR_OK;
+
+ /* Pad last byte so that tap_length is divisible by 8 */
+ while (tap_length % 8 != 0)
{
- /* Pad last byte so that tap_length is divisible by 8 */
- while (tap_length % 8 != 0)
- {
- /* More of the last TMS value keeps us in the same
state,
- * analogous to free-running JTAG interfaces. */
- jlink_tap_append_step(last_tms, 0);
- }
+ /* More of the last TMS value keeps us in the same state,
+ * analogous to free-running JTAG interfaces. */
+ jlink_tap_append_step(last_tms, 0);
+ }
- byte_length = tap_length / 8;
+ byte_length = tap_length / 8;
- usb_out_buffer[0] = EMU_CMD_HW_JTAG3;
- usb_out_buffer[1] = 0;
- usb_out_buffer[2] = (tap_length >> 0) & 0xff;
- usb_out_buffer[3] = (tap_length >> 8) & 0xff;
+ usb_out_buffer[0] = EMU_CMD_HW_JTAG3;
+ usb_out_buffer[1] = 0;
+ usb_out_buffer[2] = (tap_length >> 0) & 0xff;
+ usb_out_buffer[3] = (tap_length >> 8) & 0xff;
- tms_offset = 4;
- for (i = 0; i < byte_length; i++)
- {
- usb_out_buffer[tms_offset + i] = tms_buffer[i];
- }
+ tms_offset = 4;
+ for (i = 0; i < byte_length; i++)
+ {
+ usb_out_buffer[tms_offset + i] = tms_buffer[i];
+ }
- tdi_offset = tms_offset + byte_length;
- for (i = 0; i < byte_length; i++)
- {
- usb_out_buffer[tdi_offset + i] = tdi_buffer[i];
- }
+ tdi_offset = tms_offset + byte_length;
+ for (i = 0; i < byte_length; i++)
+ {
+ usb_out_buffer[tdi_offset + i] = tdi_buffer[i];
+ }
- result = jlink_usb_message(jlink_jtag_handle, 4 + 2 *
byte_length, byte_length);
+ result = jlink_usb_message(jlink_jtag_handle,
+ 4 + 2 * byte_length, byte_length);
- if (result == byte_length)
- {
- for (i = 0; i < byte_length; i++)
- {
- tdo_buffer[i] = usb_in_buffer[i];
- }
+ if (result != byte_length)
+ {
+ LOG_ERROR("jlink_tap_execute, wrong result %d, expected %d",
+ result, byte_length);
+ return ERROR_JTAG_QUEUE_FAILED;
+ }
- for (i = 0; i < pending_scan_results_length; i++)
- {
- pending_scan_result_t *pending_scan_result =
&pending_scan_results_buffer[i];
- u8 *buffer = pending_scan_result->buffer;
- int length = pending_scan_result->length;
- int first = pending_scan_result->first;
- scan_command_t *command =
pending_scan_result->command;
+ for (i = 0; i < byte_length; i++)
+ {
+ tdo_buffer[i] = usb_in_buffer[i];
+ }
- /* Copy to buffer */
- buf_set_buf(tdo_buffer, first, buffer, 0,
length);
+ for (i = 0; i < pending_scan_results_length; i++)
+ {
+ pending_scan_result_t *pending_scan_result =
&pending_scan_results_buffer[i];
+ u8 *buffer = pending_scan_result->buffer;
+ int length = pending_scan_result->length;
+ int first = pending_scan_result->first;
+ scan_command_t *command = pending_scan_result->command;
- DEBUG_JTAG_IO("pending scan result, length =
%d", length);
+ /* Copy to buffer */
+ buf_set_buf(tdo_buffer, first, buffer, 0, length);
+ DEBUG_JTAG_IO("pending scan result, length = %d", length);
+
#ifdef _DEBUG_USB_COMMS_
- jlink_debug_buffer(buffer, byte_length);
+ jlink_debug_buffer(buffer, byte_length);
#endif
- if (jtag_read_buffer(buffer, command) !=
ERROR_OK)
- {
- jlink_tap_init();
- return ERROR_JTAG_QUEUE_FAILED;
- }
-
- if (pending_scan_result->buffer != NULL)
- {
- free(pending_scan_result->buffer);
- }
- }
- }
- else
+ if (jtag_read_buffer(buffer, command) != ERROR_OK)
{
- LOG_ERROR("jlink_tap_execute, wrong result %d, expected
%d", result, byte_length);
+ jlink_tap_init();
return ERROR_JTAG_QUEUE_FAILED;
}
- jlink_tap_init();
+ if (pending_scan_result->buffer != NULL)
+ {
+ free(pending_scan_result->buffer);
+ }
}
+ jlink_tap_init();
+
return ERROR_OK;
}
@@ -755,23 +774,25 @@
{
for (dev = bus->devices; dev; dev = dev->next)
{
- if ((dev->descriptor.idVendor == VID) &&
(dev->descriptor.idProduct == PID))
+ if ((dev->descriptor.idVendor != VID) ||
+ (dev->descriptor.idProduct != PID))
{
- result->usb_handle = usb_open(dev);
+ continue;
+ }
+ result->usb_handle = usb_open(dev);
- /* usb_set_configuration required under win32 */
- usb_set_configuration(result->usb_handle,
dev->config[0].bConfigurationValue);
- usb_claim_interface(result->usb_handle, 0);
-
+ /* usb_set_configuration required under win32 */
+ usb_set_configuration(result->usb_handle,
+ dev->config[0].bConfigurationValue);
+ usb_claim_interface(result->usb_handle, 0);
#if 0
- /*
- * This makes problems under Mac OS X. And is
not needed
- * under Windows. Hopefully this will not break
a linux build
- */
- usb_set_altinterface(result->usb_handle, 0);
+ /*
+ * This makes problems under Mac OS X. And is not needed
+ * under Windows. Hopefully this will not break a linux
build
+ */
+ usb_set_altinterface(result->usb_handle, 0);
#endif
- return result;
- }
+ return result;
}
}
@@ -792,57 +813,43 @@
int result2;
result = jlink_usb_write(jlink_jtag, out_length);
- if (result == out_length)
+ if (result != out_length)
{
- result = jlink_usb_read(jlink_jtag);
- if (result == in_length || result == in_length+1)
+ LOG_ERROR("usb_bulk_write failed (requested=%d, result=%d)",
+ out_length, result);
+ return -1;
+ }
+ result = jlink_usb_read(jlink_jtag);
+ if (result == in_length)
+ {
+ /* Must read the result from the EMU too */
+ result2 = jlink_usb_read_emu_result(jlink_jtag);
+ if (1 != result2)
{
- if (result == in_length)
- {
- /* Must read the result from the EMU too */
- result2 = jlink_usb_read_emu_result(jlink_jtag);
- if (1 == result2)
- {
- /* Check the result itself */
- if (0 == usb_emu_result_buffer[0])
- {
- return result;
- }
- else
- {
-
LOG_ERROR("jlink_usb_read_emu_result (requested=0, result=%d)",
usb_emu_result_buffer[0]);
- return -1;
- }
- }
- else
- {
- LOG_ERROR("jlink_usb_read_emu_result
len (requested=1, result=%d)", result2);
- return -1;
- }
- }
- else
- {
- /* Check the result itself */
- if (0 == usb_in_buffer[result-1])
- {
- return result-1;
- }
- else
- {
- LOG_ERROR("jlink_usb_read_emu_result
(requested=0, result=%d)", usb_in_buffer[result]);
- return -1;
- }
- }
- }
- else
- {
- LOG_ERROR("usb_bulk_read failed (requested=%d,
result=%d)", in_length, result);
+ LOG_ERROR("jlink_usb_read_emu_result len "
+ "(requested=1, result=%d)", result2);
return -1;
}
+ /* Check the result itself */
+ if (0 == usb_emu_result_buffer[0])
+ return result;
+ LOG_ERROR("jlink_usb_read_emu_result (requested=0, result=%d)",
+ usb_emu_result_buffer[0]);
+ return -1;
}
+ else if (result == in_length + 1)
+ {
+ /* Check the result itself */
+ if (0 == usb_in_buffer[result - 1])
+ return result - 1;
+ LOG_ERROR("jlink_usb_read_emu_result (requested=0, result=%d)",
+ usb_in_buffer[result]);
+ return -1;
+ }
else
{
- LOG_ERROR("usb_bulk_write failed (requested=%d, result=%d)",
out_length, result);
+ LOG_ERROR("usb_bulk_read failed (requested=%d, result=%d)",
+ in_length, result);
return -1;
}
}
@@ -854,14 +861,17 @@
if (out_length > JLINK_OUT_BUFFER_SIZE)
{
- LOG_ERROR("jlink_jtag_write illegal out_length=%d (max=%d)",
out_length, JLINK_OUT_BUFFER_SIZE);
+ LOG_ERROR("jlink_jtag_write illegal out_length=%d (max=%d)",
+ out_length, JLINK_OUT_BUFFER_SIZE);
return -1;
}
- result = usb_bulk_write(jlink_jtag->usb_handle, JLINK_WRITE_ENDPOINT, \
- usb_out_buffer, out_length, JLINK_USB_TIMEOUT);
+ result = usb_bulk_write(jlink_jtag->usb_handle,
+ JLINK_WRITE_ENDPOINT, usb_out_buffer,
+ out_length, JLINK_USB_TIMEOUT);
- DEBUG_JTAG_IO("jlink_usb_write, out_length = %d, result = %d",
out_length, result);
+ DEBUG_JTAG_IO("jlink_usb_write, out_length = %d, result = %d",
+ out_length, result);
#ifdef _DEBUG_USB_COMMS_
jlink_debug_buffer(usb_out_buffer, out_length);
@@ -872,8 +882,9 @@
/* Read data from USB into in_buffer. */
int jlink_usb_read(jlink_jtag_t *jlink_jtag)
{
- int result = usb_bulk_read(jlink_jtag->usb_handle, JLINK_READ_ENDPOINT,
\
- usb_in_buffer, JLINK_IN_BUFFER_SIZE, JLINK_USB_TIMEOUT);
+ int result = usb_bulk_read(jlink_jtag->usb_handle,
+ JLINK_READ_ENDPOINT, usb_in_buffer,
+ JLINK_IN_BUFFER_SIZE, JLINK_USB_TIMEOUT);
DEBUG_JTAG_IO("jlink_usb_read, result = %d", result);
@@ -886,8 +897,9 @@
/* Read the result from the previous EMU cmd into result_buffer. */
int jlink_usb_read_emu_result(jlink_jtag_t *jlink_jtag)
{
- int result = usb_bulk_read(jlink_jtag->usb_handle, JLINK_READ_ENDPOINT,
\
- usb_emu_result_buffer, JLINK_EMU_RESULT_BUFFER_SIZE,
JLINK_USB_TIMEOUT);
+ int result = usb_bulk_read(jlink_jtag->usb_handle,
+ JLINK_READ_ENDPOINT, usb_emu_result_buffer,
+ JLINK_EMU_RESULT_BUFFER_SIZE, JLINK_USB_TIMEOUT);
DEBUG_JTAG_IO("jlink_usb_read_result, result = %d", result);
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
