projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jtag/ftdi: switch to command 'adapter serial'
[fw/openocd]
/
src
/
jtag
/
drivers
/
ftdi.c
diff --git
a/src/jtag/drivers/ftdi.c
b/src/jtag/drivers/ftdi.c
index 8366774bc1e527a95b556627cc028905c75b1dd2..7671cee5d08fdbad14a3e615f60018fb37f3c73f 100644
(file)
--- a/
src/jtag/drivers/ftdi.c
+++ b/
src/jtag/drivers/ftdi.c
@@
-90,7
+90,6
@@
#define SWD_MODE (LSB_FIRST | POS_EDGE_IN | NEG_EDGE_OUT)
static char *ftdi_device_desc;
#define SWD_MODE (LSB_FIRST | POS_EDGE_IN | NEG_EDGE_OUT)
static char *ftdi_device_desc;
-static char *ftdi_serial;
static uint8_t ftdi_channel;
static uint8_t ftdi_jtag_mode = JTAG_MODE;
static uint8_t ftdi_channel;
static uint8_t ftdi_jtag_mode = JTAG_MODE;
@@
-672,7
+671,7
@@
static int ftdi_initialize(void)
for (int i = 0; ftdi_vid[i] || ftdi_pid[i]; i++) {
mpsse_ctx = mpsse_open(&ftdi_vid[i], &ftdi_pid[i], ftdi_device_desc,
for (int i = 0; ftdi_vid[i] || ftdi_pid[i]; i++) {
mpsse_ctx = mpsse_open(&ftdi_vid[i], &ftdi_pid[i], ftdi_device_desc,
-
ftdi_serial
, adapter_usb_get_location(), ftdi_channel);
+
adapter_get_required_serial()
, adapter_usb_get_location(), ftdi_channel);
if (mpsse_ctx)
break;
}
if (mpsse_ctx)
break;
}
@@
-717,7
+716,6
@@
static int ftdi_quit(void)
}
free(ftdi_device_desc);
}
free(ftdi_device_desc);
- free(ftdi_serial);
free(swd_cmd_queue);
free(swd_cmd_queue);
@@
-736,18
+734,6
@@
COMMAND_HANDLER(ftdi_handle_device_desc_command)
return ERROR_OK;
}
return ERROR_OK;
}
-COMMAND_HANDLER(ftdi_handle_serial_command)
-{
- if (CMD_ARGC == 1) {
- free(ftdi_serial);
- ftdi_serial = strdup(CMD_ARGV[0]);
- } else {
- return ERROR_COMMAND_SYNTAX_ERROR;
- }
-
- return ERROR_OK;
-}
-
COMMAND_HANDLER(ftdi_handle_channel_command)
{
if (CMD_ARGC == 1)
COMMAND_HANDLER(ftdi_handle_channel_command)
{
if (CMD_ARGC == 1)
@@
-955,13
+941,6
@@
static const struct command_registration ftdi_subcommand_handlers[] = {
.help = "set the USB device description of the FTDI device",
.usage = "description_string",
},
.help = "set the USB device description of the FTDI device",
.usage = "description_string",
},
- {
- .name = "serial",
- .handler = &ftdi_handle_serial_command,
- .mode = COMMAND_CONFIG,
- .help = "set the serial number of the FTDI device",
- .usage = "serial_string",
- },
{
.name = "channel",
.handler = &ftdi_handle_channel_command,
{
.name = "channel",
.handler = &ftdi_handle_channel_command,