* 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
#include <jtag/interface.h>
#include <jtag/commands.h>
-#include <usb.h>
-#include "usb_common.h"
-
+#include "helper/system.h"
+#include "libusb_helper.h"
#define USB_VID 0x15ba
#define USB_PID 0x001e
#define ARMJTAGEW_IN_BUFFER_SIZE (4*1024)
#define ARMJTAGEW_OUT_BUFFER_SIZE (4*1024)
-
/* USB command request codes. */
#define CMD_GET_VERSION 0x00
#define CMD_SELECT_DPIMPL 0x10
static void armjtagew_state_move(void);
static void armjtagew_path_move(int num_states, tap_state_t *path);
static void armjtagew_runtest(int num_cycles);
-static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
+static void armjtagew_scan(bool ir_scan,
+ enum scan_type type,
+ uint8_t *buffer,
+ int scan_size,
+ struct scan_command *command);
static void armjtagew_reset(int trst, int srst);
-//static void armjtagew_simple_command(uint8_t command);
+/* static void armjtagew_simple_command(uint8_t command); */
static int armjtagew_get_status(void);
/* tap buffer functions */
/* ARM-JTAG-EW lowlevel functions */
struct armjtagew {
- struct usb_dev_handle* usb_handle;
+ struct libusb_device_handle *usb_handle;
};
static struct armjtagew *armjtagew_usb_open(void);
static void armjtagew_debug_buffer(uint8_t *buffer, int length);
#endif
-static struct armjtagew* armjtagew_handle;
-
-
+static struct armjtagew *armjtagew_handle;
-/***************************************************************************/
-/* External interface implementation */
+/**************************************************************************
+ * External interface implementation */
static int armjtagew_execute_queue(void)
{
enum scan_type type;
uint8_t *buffer;
- while (cmd != NULL)
- {
- switch (cmd->type)
- {
+ while (cmd) {
+ switch (cmd->type) {
case JTAG_RUNTEST:
- DEBUG_JTAG_IO("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, \
- cmd->cmd.runtest->end_state);
+ LOG_DEBUG_IO("runtest %i cycles, end in %i",
+ cmd->cmd.runtest->num_cycles,
+ cmd->cmd.runtest->end_state);
armjtagew_end_state(cmd->cmd.runtest->end_state);
armjtagew_runtest(cmd->cmd.runtest->num_cycles);
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", \
- cmd->cmd.pathmove->num_states, \
- cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
+ LOG_DEBUG_IO("pathmove: %i states, end in %i",
+ cmd->cmd.pathmove->num_states,
+ cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
- armjtagew_path_move(cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->path);
+ armjtagew_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);
+ 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);
#endif
type = jtag_scan_type(cmd->cmd.scan);
- armjtagew_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size, cmd->cmd.scan);
+ armjtagew_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);
+ LOG_DEBUG_IO("reset trst: %i srst %i",
+ cmd->cmd.reset->trst,
+ cmd->cmd.reset->srst);
armjtagew_tap_execute();
if (cmd->cmd.reset->trst == 1)
- {
tap_set_state(TAP_RESET);
- }
armjtagew_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
break;
case JTAG_SLEEP:
- DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
+ LOG_DEBUG_IO("sleep %" PRIu32, cmd->cmd.sleep->us);
armjtagew_tap_execute();
jtag_sleep(cmd->cmd.sleep->us);
break;
return armjtagew_tap_execute();
}
-
/* Sets speed in kHz. */
static int armjtagew_speed(int speed)
{
- int result;
- int speed_real;
+ int result;
+ int speed_real;
- usb_out_buffer[0] = CMD_SET_TCK_FREQUENCY;
+ usb_out_buffer[0] = CMD_SET_TCK_FREQUENCY;
buf_set_u32(usb_out_buffer + 1, 0, 32, speed*1000);
- result = armjtagew_usb_message(armjtagew_handle, 5, 4);
+ result = armjtagew_usb_message(armjtagew_handle, 5, 4);
- if (result < 0)
- {
- LOG_ERROR("ARM-JTAG-EW setting speed failed (%d)", result);
- return ERROR_JTAG_DEVICE_ERROR;
- }
+ if (result < 0) {
+ LOG_ERROR("ARM-JTAG-EW setting speed failed (%d)", result);
+ return ERROR_JTAG_DEVICE_ERROR;
+ }
usb_out_buffer[0] = CMD_GET_TCK_FREQUENCY;
- result = armjtagew_usb_message(armjtagew_handle, 1, 4);
- speed_real = (int)buf_get_u32(usb_in_buffer,0,32) / 1000;
- if (result < 0)
- {
- LOG_ERROR("ARM-JTAG-EW getting speed failed (%d)", result);
- return ERROR_JTAG_DEVICE_ERROR;
- }
- else
- {
- LOG_INFO("Requested speed %dkHz, emulator reported %dkHz.", speed, speed_real);
- }
+ result = armjtagew_usb_message(armjtagew_handle, 1, 4);
+ speed_real = (int)buf_get_u32(usb_in_buffer, 0, 32) / 1000;
+ if (result < 0) {
+ LOG_ERROR("ARM-JTAG-EW getting speed failed (%d)", result);
+ return ERROR_JTAG_DEVICE_ERROR;
+ } else
+ LOG_INFO("Requested speed %dkHz, emulator reported %dkHz.", speed, speed_real);
- return ERROR_OK;
+ return ERROR_OK;
}
-
static int armjtagew_khz(int khz, int *jtag_speed)
{
*jtag_speed = khz;
return ERROR_OK;
}
-static int armjtagew_speed_div(int speed, int* khz)
+static int armjtagew_speed_div(int speed, int *khz)
{
*khz = speed;
return ERROR_OK;
}
-
static int armjtagew_init(void)
{
int check_cnt;
armjtagew_handle = armjtagew_usb_open();
- if (armjtagew_handle == 0)
- {
- LOG_ERROR("Cannot find ARM-JTAG-EW Interface! Please check connection and permissions.");
+ if (armjtagew_handle == 0) {
+ LOG_ERROR(
+ "Cannot find ARM-JTAG-EW Interface! Please check connection and permissions.");
return ERROR_JTAG_INIT_FAILED;
}
check_cnt = 0;
- while (check_cnt < 3)
- {
- if (armjtagew_get_version_info() == ERROR_OK)
- {
+ while (check_cnt < 3) {
+ if (armjtagew_get_version_info() == ERROR_OK) {
/* attempt to get status */
armjtagew_get_status();
break;
}
if (check_cnt == 3)
- {
LOG_INFO("ARM-JTAG-EW initial read failed, don't worry");
- }
+
+ /* Initial JTAG speed (for reset and initialization): 32 kHz */
+ armjtagew_speed(32);
LOG_INFO("ARM-JTAG-EW JTAG Interface ready");
return ERROR_OK;
}
-/***************************************************************************/
-/* Queue command implementations */
+/**************************************************************************
+ * Queue command implementations */
static void armjtagew_end_state(tap_state_t state)
{
if (tap_is_state_stable(state))
- {
tap_set_end_state(state);
- }
- else
- {
+ else {
LOG_ERROR("BUG: %i is not a valid end state", state);
exit(-1);
}
uint8_t tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state());
int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
- for (i = 0; i < tms_count; i++)
- {
+ for (i = 0; i < tms_count; i++) {
tms = (tms_scan >> i) & 1;
armjtagew_tap_append_step(tms, 0);
}
{
int i;
- for (i = 0; i < num_states; i++)
- {
+ for (i = 0; i < num_states; i++) {
/*
* TODO: The ARM-JTAG-EW hardware delays TDI with 3 TCK cycles when in RTCK mode.
* Either handle that here, or update the documentation with examples
* how to fix that in the configuration files.
*/
if (path[i] == tap_state_transition(tap_get_state(), false))
- {
armjtagew_tap_append_step(0, 0);
- }
else if (path[i] == tap_state_transition(tap_get_state(), true))
- {
armjtagew_tap_append_step(1, 0);
- }
- else
- {
- LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_name(tap_get_state()), tap_state_name(path[i]));
+ else {
+ LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
+ tap_state_name(tap_get_state()), tap_state_name(path[i]));
exit(-1);
}
tap_state_t saved_end_state = tap_get_end_state();
/* only do a state_move when we're not already in IDLE */
- if (tap_get_state() != TAP_IDLE)
- {
+ if (tap_get_state() != TAP_IDLE) {
armjtagew_end_state(TAP_IDLE);
armjtagew_state_move();
}
/* execute num_cycles */
for (i = 0; i < num_cycles; i++)
- {
armjtagew_tap_append_step(0, 0);
- }
/* finish in end_state */
armjtagew_end_state(saved_end_state);
if (tap_get_state() != tap_get_end_state())
- {
armjtagew_state_move();
- }
}
-static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command)
+static void armjtagew_scan(bool ir_scan,
+ enum scan_type type,
+ uint8_t *buffer,
+ int scan_size,
+ struct scan_command *command)
{
tap_state_t saved_end_state;
/* 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 */
tap_set_state(ir_scan ? TAP_IRPAUSE : TAP_DRPAUSE);
if (tap_get_state() != tap_get_end_state())
- {
armjtagew_state_move();
- }
}
static void armjtagew_reset(int trst, int srst)
LOG_DEBUG("trst: %i, srst: %i", trst, srst);
- if (srst == 0)
- {
+ if (srst == 0) {
val |= srst_mask;
outp_en &= ~srst_mask; /* tristate */
change_mask |= srst_mask;
- }
- else if (srst == 1)
- {
+ } else if (srst == 1) {
val &= ~srst_mask;
outp_en |= srst_mask;
change_mask |= srst_mask;
}
- if (trst == 0)
- {
+ if (trst == 0) {
val |= trst_mask;
outp_en &= ~trst_mask; /* tristate */
change_mask |= trst_mask;
- }
- else if (trst == 1)
- {
+ } else if (trst == 1) {
val &= ~trst_mask;
outp_en |= trst_mask;
change_mask |= trst_mask;
usb_out_buffer[3] = change_mask;
result = armjtagew_usb_write(armjtagew_handle, 4);
if (result != 4)
- {
LOG_ERROR("ARM-JTAG-EW TRST/SRST pin set failed failed (%d)", result);
- }
}
-
static int armjtagew_get_status(void)
{
int result;
usb_out_buffer[0] = CMD_GET_TAPHW_STATE;
result = armjtagew_usb_message(armjtagew_handle, 1, 12);
- if (result == 0)
- {
+ if (result == 0) {
unsigned int u_tg = buf_get_u32(usb_in_buffer, 0, 16);
- LOG_INFO("U_tg = %d mV, U_aux = %d mV, U_tgpwr = %d mV, I_tgpwr = %d mA, D1 = %d, Target power %s %s",
- (int)(buf_get_u32(usb_in_buffer + 0, 0, 16)),
- (int)(buf_get_u32(usb_in_buffer + 2, 0, 16)),
- (int)(buf_get_u32(usb_in_buffer + 4, 0, 16)),
- (int)(buf_get_u32(usb_in_buffer + 6, 0, 16)),
- usb_in_buffer[9],
- usb_in_buffer[11] ? "OVERCURRENT" : "OK",
- usb_in_buffer[10] ? "enabled" : "disabled");
+ LOG_INFO(
+ "U_tg = %d mV, U_aux = %d mV, U_tgpwr = %d mV, I_tgpwr = %d mA, D1 = %d, Target power %s %s",
+ (int)(buf_get_u32(usb_in_buffer + 0, 0, 16)),
+ (int)(buf_get_u32(usb_in_buffer + 2, 0, 16)),
+ (int)(buf_get_u32(usb_in_buffer + 4, 0, 16)),
+ (int)(buf_get_u32(usb_in_buffer + 6, 0, 16)),
+ usb_in_buffer[9],
+ usb_in_buffer[11] ? "OVERCURRENT" : "OK",
+ usb_in_buffer[10] ? "enabled" : "disabled");
if (u_tg < 1500)
- {
LOG_ERROR("Vref too low. Check Target Power");
- }
- }
- else
- {
+ } else
LOG_ERROR("ARM-JTAG-EW command CMD_GET_TAPHW_STATE failed (%d)", result);
- }
return ERROR_OK;
}
usb_out_buffer[0] = CMD_GET_VERSION;
result = armjtagew_usb_message(armjtagew_handle, 1, 4 + 15 + 256);
- if (result != 0)
- {
+ if (result != 0) {
LOG_ERROR("ARM-JTAG-EW command CMD_GET_VERSION failed (%d)", result);
return ERROR_JTAG_DEVICE_ERROR;
}
-
memcpy(sn, usb_in_buffer + 4, 15);
sn[15] = '\0';
memcpy(auxinfo, usb_in_buffer + 4+15, 256);
auxinfo[256] = '\0';
- LOG_INFO("ARM-JTAG-EW firmware version %d.%d, hardware revision %c, SN=%s, Additional info: %s", \
- usb_in_buffer[1], usb_in_buffer[0], \
- isgraph(usb_in_buffer[2]) ? usb_in_buffer[2] : 'X', \
- sn, auxinfo);
+ LOG_INFO(
+ "ARM-JTAG-EW firmware version %d.%d, hardware revision %c, SN=%s, Additional info: %s",
+ usb_in_buffer[1],
+ usb_in_buffer[0],
+ isgraph(usb_in_buffer[2]) ? usb_in_buffer[2] : 'X',
+ sn,
+ auxinfo);
+
+ if (1 != usb_in_buffer[1] || 6 != usb_in_buffer[0])
+ LOG_WARNING(
+ "ARM-JTAG-EW firmware version %d.%d is untested with this version of OpenOCD. You might experience unexpected behavior.",
+ usb_in_buffer[1],
+ usb_in_buffer[0]);
return ERROR_OK;
}
COMMAND_HANDLER(armjtagew_handle_armjtagew_info_command)
{
- if (armjtagew_get_version_info() == ERROR_OK)
- {
+ if (armjtagew_get_version_info() == ERROR_OK) {
/* attempt to get status */
armjtagew_get_status();
}
.handler = &armjtagew_handle_armjtagew_info_command,
.mode = COMMAND_EXEC,
.help = "query armjtagew info",
+ .usage = "",
},
COMMAND_REGISTRATION_DONE
};
-struct jtag_interface armjtagew_interface = {
+static struct jtag_interface armjtagew_interface = {
+ .execute_queue = armjtagew_execute_queue,
+};
+
+struct adapter_driver armjtagew_adapter_driver = {
.name = "arm-jtag-ew",
+ .transports = jtag_only,
.commands = armjtagew_command_handlers,
- .execute_queue = armjtagew_execute_queue,
- .speed = armjtagew_speed,
- .speed_div = armjtagew_speed_div,
- .khz = armjtagew_khz,
.init = armjtagew_init,
.quit = armjtagew_quit,
+ .speed = armjtagew_speed,
+ .khz = armjtagew_khz,
+ .speed_div = armjtagew_speed_div,
+
+ .jtag_ops = &armjtagew_interface,
};
-/***************************************************************************/
-/* ARM-JTAG-EW tap functions */
+/**************************************************************************
+ * ARM-JTAG-EW tap functions */
/* 2048 is the max value we can use here */
#define ARMJTAGEW_TAP_BUFFER_SIZE 2048
struct pending_scan_result {
int first; /* First bit position in tdo_buffer to read */
- int length; /* Number of bits to read */
- struct scan_command *command; /* Corresponding scan command */
+ int length; /* Number of bits to read */
+ struct scan_command *command; /* Corresponding scan command */
uint8_t *buffer;
};
int available_bits = ARMJTAGEW_TAP_BUFFER_SIZE * 8 - tap_length;
if (scans > available_scans || bits > available_bits)
- {
armjtagew_tap_execute();
- }
}
static void armjtagew_tap_append_step(int tms, int tdi)
last_tms = tms;
int index_local = tap_length / 8;
- if (index_local < ARMJTAGEW_TAP_BUFFER_SIZE)
- {
+ if (index_local < ARMJTAGEW_TAP_BUFFER_SIZE) {
int bit_index = tap_length % 8;
uint8_t bit = 1 << bit_index;
if (tms)
- {
tms_buffer[index_local] |= bit;
- }
else
- {
tms_buffer[index_local] &= ~bit;
- }
if (tdi)
- {
tdi_buffer[index_local] |= bit;
- }
else
- {
tdi_buffer[index_local] &= ~bit;
- }
tap_length++;
- }
- else
- {
+ } else
LOG_ERROR("armjtagew_tap_append_step, overflow");
- }
}
void armjtagew_tap_append_scan(int length, uint8_t *buffer, struct scan_command *command)
{
- struct pending_scan_result *pending_scan_result = &pending_scan_results_buffer[pending_scan_results_length];
+ struct pending_scan_result *pending_scan_result =
+ &pending_scan_results_buffer[pending_scan_results_length];
int i;
pending_scan_result->first = tap_length;
pending_scan_result->buffer = buffer;
for (i = 0; i < length; i++)
- {
armjtagew_tap_append_step((i < length-1 ? 0 : 1), (buffer[i/8] >> (i%8)) & 1);
- }
pending_scan_results_length++;
}
int i;
int result;
- if (tap_length > 0)
- {
+ if (tap_length > 0) {
/* Pad last byte so that tap_length is divisible by 8 */
- while (tap_length % 8 != 0)
- {
+ while (tap_length % 8 != 0) {
/* More of the last TMS value keeps us in the same state,
* analogous to free-running JTAG interfaces. */
armjtagew_tap_append_step(last_tms, 0);
tms_offset = 3;
for (i = 0; i < byte_length; i++)
- {
- usb_out_buffer[tms_offset + i] = flip_u32(tms_buffer[i],8);
- }
+ usb_out_buffer[tms_offset + i] = flip_u32(tms_buffer[i], 8);
tdi_offset = tms_offset + byte_length;
for (i = 0; i < byte_length; i++)
- {
- usb_out_buffer[tdi_offset + i] = flip_u32(tdi_buffer[i],8);
- }
+ usb_out_buffer[tdi_offset + i] = flip_u32(tdi_buffer[i], 8);
- result = armjtagew_usb_message(armjtagew_handle, 3 + 2 * byte_length, byte_length + 4);
+ result = armjtagew_usb_message(armjtagew_handle,
+ 3 + 2 * byte_length,
+ byte_length + 4);
- if (result == 0)
- {
+ if (result == 0) {
int stat_local;
stat_local = (int)buf_get_u32(usb_in_buffer + byte_length, 0, 32);
if (stat_local) {
- LOG_ERROR("armjtagew_tap_execute, emulator returned error code %d for a CMD_TAP_SHIFT command", stat_local);
+ LOG_ERROR(
+ "armjtagew_tap_execute, emulator returned error code %d for a CMD_TAP_SHIFT command",
+ stat_local);
return ERROR_JTAG_QUEUE_FAILED;
}
for (i = 0; i < byte_length; i++)
- {
- tdo_buffer[i] = flip_u32(usb_in_buffer[i],8);
- }
+ tdo_buffer[i] = flip_u32(usb_in_buffer[i], 8);
- for (i = 0; i < pending_scan_results_length; i++)
- {
- struct pending_scan_result *pending_scan_result = &pending_scan_results_buffer[i];
+ for (i = 0; i < pending_scan_results_length; i++) {
+ struct pending_scan_result *pending_scan_result =
+ &pending_scan_results_buffer[i];
uint8_t *buffer = pending_scan_result->buffer;
int length = pending_scan_result->length;
int first = pending_scan_result->first;
/* 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);
#endif
- if (jtag_read_buffer(buffer, command) != ERROR_OK)
- {
+ if (jtag_read_buffer(buffer, command) != ERROR_OK) {
armjtagew_tap_init();
return ERROR_JTAG_QUEUE_FAILED;
}
- if (pending_scan_result->buffer != NULL)
- {
- free(pending_scan_result->buffer);
- }
+ free(pending_scan_result->buffer);
}
- }
- else
- {
- LOG_ERROR("armjtagew_tap_execute, wrong result %d, expected %d", result, byte_length);
+ } else {
+ LOG_ERROR("armjtagew_tap_execute, wrong result %d, expected %d",
+ result,
+ byte_length);
return ERROR_JTAG_QUEUE_FAILED;
}
return ERROR_OK;
}
-/*****************************************************************************/
-/* JLink USB low-level functions */
+/****************************************************************************
+ * JLink USB low-level functions */
-static struct armjtagew* armjtagew_usb_open()
+static struct armjtagew *armjtagew_usb_open(void)
{
- usb_init();
-
const uint16_t vids[] = { USB_VID, 0 };
const uint16_t pids[] = { USB_PID, 0 };
- struct usb_dev_handle *dev;
- if (jtag_usb_open(vids, pids, &dev) != ERROR_OK)
+ struct libusb_device_handle *dev;
+
+ if (jtag_libusb_open(vids, pids, &dev, NULL) != ERROR_OK)
return NULL;
struct armjtagew *result = malloc(sizeof(struct armjtagew));
result->usb_handle = dev;
#if 0
- /* usb_set_configuration required under win32 */
- usb_set_configuration(dev, dev->config[0].bConfigurationValue);
+ /* libusb_set_configuration required under win32 */
+ struct libusb_config_descriptor *config;
+ struct libusb_device *usb_dev = libusb_get_device(dev);
+ libusb_get_config_descriptor(usb_dev, 0, &config);
+ libusb_set_configuration(dev, config->bConfigurationValue);
#endif
- usb_claim_interface(dev, 0);
+ libusb_claim_interface(dev, 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(dev, 0);
+ libusb_set_interface_alt_setting(dev, 0, 0);
#endif
return result;
}
static void armjtagew_usb_close(struct armjtagew *armjtagew)
{
- usb_close(armjtagew->usb_handle);
+ libusb_close(armjtagew->usb_handle);
free(armjtagew);
}
int result;
result = armjtagew_usb_write(armjtagew, out_length);
- if (result == out_length)
- {
+ if (result == out_length) {
result = armjtagew_usb_read(armjtagew, in_length);
- if (result != in_length)
- {
- LOG_ERROR("usb_bulk_read failed (requested=%d, result=%d)", in_length, result);
+ if (result != in_length) {
+ LOG_ERROR("jtag_libusb_bulk_read failed (requested=%d, result=%d)",
+ in_length,
+ result);
return -1;
}
- }
- else
- {
- LOG_ERROR("usb_bulk_write failed (requested=%d, result=%d)", out_length, result);
+ } else {
+ LOG_ERROR("jtag_libusb_bulk_write failed (requested=%d, result=%d)", out_length, result);
return -1;
}
return 0;
static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
{
int result;
+ int transferred;
- if (out_length > ARMJTAGEW_OUT_BUFFER_SIZE)
- {
- LOG_ERROR("armjtagew_write illegal out_length=%d (max=%d)", out_length, ARMJTAGEW_OUT_BUFFER_SIZE);
+ if (out_length > ARMJTAGEW_OUT_BUFFER_SIZE) {
+ LOG_ERROR("armjtagew_write illegal out_length=%d (max=%d)",
+ out_length,
+ ARMJTAGEW_OUT_BUFFER_SIZE);
return -1;
}
- result = usb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT, \
- (char*)usb_out_buffer, out_length, ARMJTAGEW_USB_TIMEOUT);
+ result = jtag_libusb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT,
+ (char *)usb_out_buffer, out_length, ARMJTAGEW_USB_TIMEOUT, &transferred);
- 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);
#endif
- return result;
+ if (result != ERROR_OK)
+ return -1;
+ return transferred;
}
/* Read data from USB into in_buffer. */
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);
+ int transferred;
+ int result = jtag_libusb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN,
+ (char *)usb_in_buffer, exp_in_length, ARMJTAGEW_USB_TIMEOUT, &transferred);
- 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);
#endif
- return result;
+ if (result != ERROR_OK)
+ return -1;
+ return transferred;
}
-
#ifdef _DEBUG_USB_COMMS_
#define BYTES_PER_LINE 16
int i;
int j;
- for (i = 0; i < length; i += BYTES_PER_LINE)
- {
+ for (i = 0; i < length; i += BYTES_PER_LINE) {
snprintf(line, 5, "%04x", i);
- for (j = i; j < i + BYTES_PER_LINE && j < length; j++)
- {
+ for (j = i; j < i + BYTES_PER_LINE && j < length; j++) {
snprintf(s, 4, " %02x", buffer[j]);
strcat(line, s);
}
LOG_DEBUG("%s", line);
+
+ /* Prevent GDB timeout (writing to log might take some time) */
+ keep_alive();
}
}
#endif
-
projects / fw / openocd / blobdiff