projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jtag/kitprog: switch to command 'adapter serial'
[fw/openocd]
/
src
/
jtag
/
drivers
/
kitprog.c
diff --git
a/src/jtag/drivers/kitprog.c
b/src/jtag/drivers/kitprog.c
index 327bb572db055f03038c92fabcc3a984c7f4ff6f..0c5ccc6a7ee8fbb0237cbdc37dd2102bacd40523 100644
(file)
--- a/
src/jtag/drivers/kitprog.c
+++ b/
src/jtag/drivers/kitprog.c
@@
-39,6
+39,7
@@
#include <hidapi.h>
#include <hidapi.h>
+#include <jtag/adapter.h>
#include <jtag/interface.h>
#include <jtag/swd.h>
#include <jtag/commands.h>
#include <jtag/interface.h>
#include <jtag/swd.h>
#include <jtag/commands.h>
@@
-114,7
+115,6
@@
struct pending_transfer_result {
void *buffer;
};
void *buffer;
};
-static char *kitprog_serial;
static bool kitprog_init_acquire_psoc;
static int pending_transfer_count, pending_queue_len;
static bool kitprog_init_acquire_psoc;
static int pending_transfer_count, pending_queue_len;
@@
-230,7
+230,6
@@
static int kitprog_quit(void)
free(kitprog_handle->packet_buffer);
free(kitprog_handle->serial);
free(kitprog_handle);
free(kitprog_handle->packet_buffer);
free(kitprog_handle->serial);
free(kitprog_handle);
- free(kitprog_serial);
free(pending_transfers);
return ERROR_OK;
free(pending_transfers);
return ERROR_OK;
@@
-272,7
+271,7
@@
static int kitprog_usb_open(void)
const uint16_t vids[] = { VID, 0 };
const uint16_t pids[] = { PID, 0 };
const uint16_t vids[] = { VID, 0 };
const uint16_t pids[] = { PID, 0 };
- if (jtag_libusb_open(vids, pids,
kitprog_serial
,
+ if (jtag_libusb_open(vids, pids,
adapter_get_required_serial()
,
&kitprog_handle->usb_handle, NULL) != ERROR_OK) {
LOG_ERROR("Failed to open or find the device");
return ERROR_FAIL;
&kitprog_handle->usb_handle, NULL) != ERROR_OK) {
LOG_ERROR("Failed to open or find the device");
return ERROR_FAIL;
@@
-851,22
+850,6
@@
COMMAND_HANDLER(kitprog_handle_acquire_psoc_command)
return retval;
}
return retval;
}
-COMMAND_HANDLER(kitprog_handle_serial_command)
-{
- if (CMD_ARGC == 1) {
- kitprog_serial = strdup(CMD_ARGV[0]);
- if (!kitprog_serial) {
- LOG_ERROR("Failed to allocate memory for the serial number");
- return ERROR_FAIL;
- }
- } else {
- LOG_ERROR("expected exactly one argument to kitprog_serial <serial-number>");
- return ERROR_FAIL;
- }
-
- return ERROR_OK;
-}
-
COMMAND_HANDLER(kitprog_handle_init_acquire_psoc_command)
{
kitprog_init_acquire_psoc = true;
COMMAND_HANDLER(kitprog_handle_init_acquire_psoc_command)
{
kitprog_init_acquire_psoc = true;
@@
-900,13
+883,6
@@
static const struct command_registration kitprog_command_handlers[] = {
.usage = "<cmd>",
.chain = kitprog_subcommand_handlers,
},
.usage = "<cmd>",
.chain = kitprog_subcommand_handlers,
},
- {
- .name = "kitprog_serial",
- .handler = &kitprog_handle_serial_command,
- .mode = COMMAND_CONFIG,
- .help = "set the serial number of the adapter",
- .usage = "serial_string",
- },
{
.name = "kitprog_init_acquire_psoc",
.handler = &kitprog_handle_init_acquire_psoc_command,
{
.name = "kitprog_init_acquire_psoc",
.handler = &kitprog_handle_init_acquire_psoc_command,