#include "interface.h"
#include "commands.h"
#include <usb.h>
+#include "usb_common.h"
#define USB_VID 0x15ba
static uint8_t usb_in_buffer[ARMJTAGEW_IN_BUFFER_SIZE];
static uint8_t usb_out_buffer[ARMJTAGEW_OUT_BUFFER_SIZE];
-/* External interface functions */
-static int armjtagew_execute_queue(void);
-static int armjtagew_speed(int speed);
-static int armjtagew_khz(int khz, int *jtag_speed);
-static int armjtagew_register_commands(struct command_context_s *cmd_ctx);
-static int armjtagew_init(void);
-static int armjtagew_quit(void);
-
-/* CLI command handler functions */
-static int armjtagew_handle_armjtagew_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
/* Queue command functions */
static void armjtagew_end_state(tap_state_t state);
static void armjtagew_state_move(void);
/***************************************************************************/
/* External interface implementation */
-struct jtag_interface armjtagew_interface =
-{
- .name = "arm-jtag-ew",
- .execute_queue = armjtagew_execute_queue,
- .speed = armjtagew_speed,
- .khz = armjtagew_khz,
- .register_commands = armjtagew_register_commands,
- .init = armjtagew_init,
- .quit = armjtagew_quit
-};
-
-
static int armjtagew_execute_queue(void)
{
struct jtag_command *cmd = jtag_command_queue;
return ERROR_OK;
}
-static int armjtagew_register_commands(struct command_context_s *cmd_ctx)
-{
- register_command(cmd_ctx, NULL, "armjtagew_info", armjtagew_handle_armjtagew_info_command, COMMAND_EXEC,
- "query armjtagew info");
- return ERROR_OK;
-}
-
static int armjtagew_init(void)
{
int check_cnt;
return ERROR_OK;
}
-static int armjtagew_handle_armjtagew_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(armjtagew_handle_armjtagew_info_command)
{
if (armjtagew_get_version_info() == ERROR_OK)
{
return ERROR_OK;
}
+static int armjtagew_register_commands(struct command_context *cmd_ctx)
+{
+ COMMAND_REGISTER(cmd_ctx, NULL, "armjtagew_info",
+ &armjtagew_handle_armjtagew_info_command, COMMAND_EXEC,
+ "query armjtagew info");
+ return ERROR_OK;
+}
+
+struct jtag_interface armjtagew_interface = {
+ .name = "arm-jtag-ew",
+ .execute_queue = &armjtagew_execute_queue,
+ .speed = &armjtagew_speed,
+ .khz = &armjtagew_khz,
+ .register_commands = &armjtagew_register_commands,
+ .init = &armjtagew_init,
+ .quit = &armjtagew_quit,
+ };
+
/***************************************************************************/
/* ARM-JTAG-EW tap functions */
static struct armjtagew* armjtagew_usb_open()
{
- struct usb_bus *busses;
- struct usb_bus *bus;
- struct usb_device *dev;
-
- struct armjtagew *result;
-
- result = (struct armjtagew*) malloc(sizeof(struct armjtagew));
-
usb_init();
- usb_find_busses();
- usb_find_devices();
- busses = usb_get_busses();
+ 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)
+ return NULL;
- /* find armjtagew device in usb bus */
-
- for (bus = busses; bus; bus = bus->next)
- {
- for (dev = bus->devices; dev; dev = dev->next)
- {
- if ((dev->descriptor.idVendor == USB_VID) && (dev->descriptor.idProduct == USB_PID))
- {
- result->usb_handle = usb_open(dev);
+ struct armjtagew *result = malloc(sizeof(struct armjtagew));
+ result->usb_handle = dev;
#if 0
- /* usb_set_configuration required under win32 */
- usb_set_configuration(result->usb_handle, dev->config[0].bConfigurationValue);
+ /* usb_set_configuration required under win32 */
+ usb_set_configuration(dev, dev->config[0].bConfigurationValue);
#endif
- usb_claim_interface(result->usb_handle, 0);
-
+ usb_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(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(dev, 0);
#endif
- return result;
- }
- }
- }
-
- free(result);
- return NULL;
+ return result;
}
static void armjtagew_usb_close(struct armjtagew *armjtagew)