X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fcmsis_dap_usb.c;h=95f553b626f147e6718a1399a3d4ad6ee5626105;hp=8c815230d475d199976f624677540139b44785fc;hb=885f4388144840e411512543cd92fb9335ce806a;hpb=6db70bc89b34b0e3e70358d3e58eefab9e7947c8 diff --git a/src/jtag/drivers/cmsis_dap_usb.c b/src/jtag/drivers/cmsis_dap_usb.c index 8c815230d4..95f553b626 100644 --- a/src/jtag/drivers/cmsis_dap_usb.c +++ b/src/jtag/drivers/cmsis_dap_usb.c @@ -60,6 +60,8 @@ /* vid = pid = 0 marks the end of the list */ static uint16_t cmsis_dap_vid[MAX_USB_IDS + 1] = { 0 }; static uint16_t cmsis_dap_pid[MAX_USB_IDS + 1] = { 0 }; +static wchar_t *cmsis_dap_serial; +static bool swd_mode; #define PACKET_SIZE (64 + 1) /* 64 bytes plus report id */ #define USB_TIMEOUT 1000 @@ -136,7 +138,7 @@ static uint16_t cmsis_dap_pid[MAX_USB_IDS + 1] = { 0 }; /* CMSIS-DAP Vendor Commands * None as yet... */ -static char *info_caps_str[] = { +static const char * const info_caps_str[] = { "SWD Supported", "JTAG Supported" }; @@ -162,14 +164,16 @@ static int cmsis_dap_usb_open(void) struct hid_device_info *devs, *cur_dev; unsigned short target_vid, target_pid; + bool found = false; + target_vid = 0; target_pid = 0; /* - The CMSIS-DAP specification stipulates: - "The Product String must contain "CMSIS-DAP" somewhere in the string. This is used by the - debuggers to idenify a CMSIS-DAP compliant Debug Unit that is connected to a host computer." - */ + * The CMSIS-DAP specification stipulates: + * "The Product String must contain "CMSIS-DAP" somewhere in the string. This is used by the + * debuggers to identify a CMSIS-DAP compliant Debug Unit that is connected to a host computer." + */ devs = hid_enumerate(0x0, 0x0); cur_dev = devs; while (NULL != cur_dev) { @@ -178,21 +182,32 @@ static int cmsis_dap_usb_open(void) LOG_DEBUG("Cannot read product string of device 0x%x:0x%x", cur_dev->vendor_id, cur_dev->product_id); } else { - if (wcsstr(cur_dev->product_string, L"CMSIS-DAP")) - /* - if the user hasn't specified VID:PID *and* - product string contains "CMSIS-DAP", pick it - */ - break; + if (wcsstr(cur_dev->product_string, L"CMSIS-DAP")) { + /* if the user hasn't specified VID:PID *and* + * product string contains "CMSIS-DAP", pick it + */ + found = true; + } } } else { - /* - otherwise, exhaustively compare against all VID:PID in list - */ + /* otherwise, exhaustively compare against all VID:PID in list */ for (i = 0; cmsis_dap_vid[i] || cmsis_dap_pid[i]; i++) { if ((cmsis_dap_vid[i] == cur_dev->vendor_id) && (cmsis_dap_pid[i] == cur_dev->product_id)) - break; + found = true; } + + if (cmsis_dap_vid[i] || cmsis_dap_pid[i]) + found = true; + } + + if (found) { + /* we have found an adapter, so exit further checks */ + /* check serial number matches if given */ + if (cmsis_dap_serial != NULL) { + if (wcscmp(cmsis_dap_serial, cur_dev->serial_number) == 0) + break; + } else + break; } cur_dev = cur_dev->next; @@ -205,6 +220,11 @@ static int cmsis_dap_usb_open(void) hid_free_enumeration(devs); + if (target_vid == 0 && target_pid == 0) { + LOG_ERROR("unable to find CMSIS-DAP device"); + return ERROR_FAIL; + } + if (hid_init() != 0) { LOG_ERROR("unable to open HIDAPI"); return ERROR_FAIL; @@ -264,6 +284,11 @@ static void cmsis_dap_usb_close(struct cmsis_dap *dap) cmsis_dap_handle = NULL; } + if (cmsis_dap_serial) { + free(cmsis_dap_serial); + cmsis_dap_serial = NULL; + } + return; } @@ -479,8 +504,13 @@ static int cmsis_dap_cmd_DAP_Delay(uint16_t delay_us) } #endif -static int cmsis_dap_swd_read_reg(uint8_t cmd, uint32_t *value) +static int queued_retval; + +static void cmsis_dap_swd_read_reg(struct adiv5_dap *dap, uint8_t cmd, uint32_t *value) { + if (queued_retval != ERROR_OK) + return; + uint8_t *buffer = cmsis_dap_handle->packet_buffer; int retval; uint32_t val; @@ -497,7 +527,8 @@ static int cmsis_dap_swd_read_reg(uint8_t cmd, uint32_t *value) /* TODO - need better response checking */ if (retval != ERROR_OK || buffer[1] != 0x01) { LOG_ERROR("CMSIS-DAP: Read Error (0x%02" PRIx8 ")", buffer[2]); - return buffer[2]; + queued_retval = buffer[2]; + return; } val = le_to_h_u32(&buffer[3]); @@ -506,11 +537,14 @@ static int cmsis_dap_swd_read_reg(uint8_t cmd, uint32_t *value) if (value) *value = val; - return retval; + queued_retval = retval; } -static int cmsis_dap_swd_write_reg(uint8_t cmd, uint32_t value) +static void cmsis_dap_swd_write_reg(struct adiv5_dap *dap, uint8_t cmd, uint32_t value) { + if (queued_retval != ERROR_OK) + return; + uint8_t *buffer = cmsis_dap_handle->packet_buffer; DEBUG_IO("CMSIS-DAP: Write Reg 0x%02" PRIx8 " 0x%08" PRIx32, cmd, value); @@ -531,6 +565,13 @@ static int cmsis_dap_swd_write_reg(uint8_t cmd, uint32_t value) retval = buffer[2]; } + queued_retval = retval; +} + +static int cmsis_dap_swd_run(struct adiv5_dap *dap) +{ + int retval = queued_retval; + queued_retval = ERROR_OK; return retval; } @@ -702,11 +743,50 @@ static int cmsis_dap_reset_link(void) return retval; } +static int cmsis_dap_swd_open(void) +{ + int retval; + + DEBUG_IO("CMSIS-DAP: cmsis_dap_swd_open"); + + if (cmsis_dap_handle == NULL) { + + /* SWD init */ + retval = cmsis_dap_usb_open(); + if (retval != ERROR_OK) + return retval; + + retval = cmsis_dap_get_caps_info(); + if (retval != ERROR_OK) + return retval; + } + + if (!(cmsis_dap_handle->caps & INFO_CAPS_SWD)) { + LOG_ERROR("CMSIS-DAP: SWD not supported"); + return ERROR_JTAG_DEVICE_ERROR; + } + + retval = cmsis_dap_cmd_DAP_Connect(CONNECT_SWD); + if (retval != ERROR_OK) + return retval; + + /* Add more setup here.??... */ + + LOG_INFO("CMSIS-DAP: Interface Initialised (SWD)"); + return ERROR_OK; +} + static int cmsis_dap_init(void) { int retval; uint8_t *data; + if (swd_mode) { + retval = cmsis_dap_swd_open(); + if (retval != ERROR_OK) + return retval; + } + if (cmsis_dap_handle == NULL) { /* JTAG init */ @@ -812,36 +892,9 @@ static int cmsis_dap_init(void) return ERROR_OK; } -static int cmsis_dap_swd_init(uint8_t trn) +static int cmsis_dap_swd_init(void) { - int retval; - - DEBUG_IO("CMSIS-DAP: cmsis_dap_swd_init"); - - if (cmsis_dap_handle == NULL) { - - /* SWD init */ - retval = cmsis_dap_usb_open(); - if (retval != ERROR_OK) - return retval; - - retval = cmsis_dap_get_caps_info(); - if (retval != ERROR_OK) - return retval; - } - - if (!(cmsis_dap_handle->caps & INFO_CAPS_SWD)) { - LOG_ERROR("CMSIS-DAP: SWD not supported"); - return ERROR_JTAG_DEVICE_ERROR; - } - - retval = cmsis_dap_cmd_DAP_Connect(CONNECT_SWD); - if (retval != ERROR_OK) - return retval; - - /* Add more setup here.??... */ - - LOG_INFO("CMSIS-DAP: Interface Initialised (SWD)"); + swd_mode = true; return ERROR_OK; } @@ -964,6 +1017,27 @@ COMMAND_HANDLER(cmsis_dap_handle_vid_pid_command) return ERROR_OK; } +COMMAND_HANDLER(cmsis_dap_handle_serial_command) +{ + if (CMD_ARGC == 1) { + size_t len = mbstowcs(NULL, CMD_ARGV[0], 0); + cmsis_dap_serial = calloc(len + 1, sizeof(wchar_t)); + if (cmsis_dap_serial == NULL) { + LOG_ERROR("unable to allocate memory"); + return ERROR_OK; + } + if (mbstowcs(cmsis_dap_serial, CMD_ARGV[0], len + 1) == (size_t)-1) { + free(cmsis_dap_serial); + cmsis_dap_serial = NULL; + LOG_ERROR("unable to convert serial"); + } + } else { + LOG_ERROR("expected exactly one argument to cmsis_dap_serial "); + } + + return ERROR_OK; +} + static const struct command_registration cmsis_dap_subcommand_handlers[] = { { .name = "info", @@ -990,13 +1064,21 @@ static const struct command_registration cmsis_dap_command_handlers[] = { .help = "the vendor ID and product ID of the CMSIS-DAP device", .usage = "(vid pid)* ", }, + { + .name = "cmsis_dap_serial", + .handler = &cmsis_dap_handle_serial_command, + .mode = COMMAND_CONFIG, + .help = "set the serial number of the adapter", + .usage = "serial_string", + }, COMMAND_REGISTRATION_DONE }; static const struct swd_driver cmsis_dap_swd_driver = { - .init = cmsis_dap_swd_init, - .read_reg = cmsis_dap_swd_read_reg, - .write_reg = cmsis_dap_swd_write_reg, + .init = cmsis_dap_swd_init, + .read_reg = cmsis_dap_swd_read_reg, + .write_reg = cmsis_dap_swd_write_reg, + .run = cmsis_dap_swd_run, }; const char *cmsis_dap_transport[] = {"cmsis-dap", NULL};