X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fft232r.c;h=e5d80559d16d8df2cad1eab7a7de1a54af483295;hb=b8594026e4bf1aa910944c0b72dd5f1def181f13;hp=d97db56a640501dbc22f3a5900016b7959af1b9e;hpb=24db985f602bbe21ee4d10147937ed897f28a555;p=fw%2Fopenocd
diff --git a/src/jtag/drivers/ft232r.c b/src/jtag/drivers/ft232r.c
index d97db56a6..e5d80559d 100644
--- a/src/jtag/drivers/ft232r.c
+++ b/src/jtag/drivers/ft232r.c
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
/***************************************************************************
* Copyright (C) 2010 Serge Vakulenko *
* serge@vak.ru *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * 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, see . *
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@ -26,6 +15,7 @@
#endif
/* project specific includes */
+#include
#include
#include
#include
@@ -68,7 +58,6 @@
#define FT232R_BUF_SIZE_EXTRA 4096
-static char *ft232r_serial_desc;
static uint16_t ft232r_vid = 0x0403; /* FTDI */
static uint16_t ft232r_pid = 0x6001; /* FT232R */
static struct libusb_device_handle *adapter;
@@ -170,13 +159,13 @@ static int ft232r_send_recv(void)
return ERROR_OK;
}
-void ft232r_increase_buf_size(size_t new_buf_size)
+static void ft232r_increase_buf_size(size_t new_buf_size)
{
uint8_t *new_buf_ptr;
if (new_buf_size >= ft232r_buf_size) {
new_buf_size += FT232R_BUF_SIZE_EXTRA;
new_buf_ptr = realloc(ft232r_output, new_buf_size);
- if (new_buf_ptr != NULL) {
+ if (new_buf_ptr) {
ft232r_output = new_buf_ptr;
ft232r_buf_size = new_buf_size;
}
@@ -257,9 +246,10 @@ static int ft232r_init(void)
{
uint16_t avids[] = {ft232r_vid, 0};
uint16_t apids[] = {ft232r_pid, 0};
- if (jtag_libusb_open(avids, apids, ft232r_serial_desc, &adapter, NULL)) {
+ if (jtag_libusb_open(avids, apids, &adapter, NULL)) {
+ const char *ft232r_serial_desc = adapter_get_required_serial();
LOG_ERROR("ft232r not found: vid=%04x, pid=%04x, serial=%s\n",
- ft232r_vid, ft232r_pid, (ft232r_serial_desc == NULL) ? "[any]" : ft232r_serial_desc);
+ ft232r_vid, ft232r_pid, (!ft232r_serial_desc) ? "[any]" : ft232r_serial_desc);
return ERROR_JTAG_INIT_FAILED;
}
@@ -310,7 +300,7 @@ static int ft232r_init(void)
}
ft232r_output = malloc(ft232r_buf_size);
- if (ft232r_output == NULL) {
+ if (!ft232r_output) {
LOG_ERROR("Unable to allocate memory for the buffer");
return ERROR_JTAG_INIT_FAILED;
}
@@ -395,16 +385,6 @@ static int ft232r_bit_name_to_number(const char *name)
return -1;
}
-COMMAND_HANDLER(ft232r_handle_serial_desc_command)
-{
- if (CMD_ARGC == 1)
- ft232r_serial_desc = strdup(CMD_ARGV[0]);
- else
- LOG_ERROR("require exactly one argument to "
- "ft232r_serial_desc ");
- return ERROR_OK;
-}
-
COMMAND_HANDLER(ft232r_handle_vid_pid_command)
{
if (CMD_ARGC > 2) {
@@ -560,72 +540,65 @@ COMMAND_HANDLER(ft232r_handle_restore_serial_command)
return ERROR_OK;
}
-static const struct command_registration ft232r_command_handlers[] = {
+static const struct command_registration ft232r_subcommand_handlers[] = {
{
- .name = "ft232r_serial_desc",
- .handler = ft232r_handle_serial_desc_command,
- .mode = COMMAND_CONFIG,
- .help = "USB serial descriptor of the adapter",
- .usage = "serial string",
- },
- {
- .name = "ft232r_vid_pid",
+ .name = "vid_pid",
.handler = ft232r_handle_vid_pid_command,
.mode = COMMAND_CONFIG,
.help = "USB VID and PID of the adapter",
.usage = "vid pid",
},
{
- .name = "ft232r_jtag_nums",
+ .name = "jtag_nums",
.handler = ft232r_handle_jtag_nums_command,
.mode = COMMAND_CONFIG,
.help = "gpio numbers for tck, tms, tdi, tdo. (in that order)",
.usage = "<0-7|TXD-RI> <0-7|TXD-RI> <0-7|TXD-RI> <0-7|TXD-RI>",
},
{
- .name = "ft232r_tck_num",
+ .name = "tck_num",
.handler = ft232r_handle_tck_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for tck.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_tms_num",
+ .name = "tms_num",
.handler = ft232r_handle_tms_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for tms.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_tdo_num",
+ .name = "tdo_num",
.handler = ft232r_handle_tdo_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for tdo.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_tdi_num",
+ .name = "tdi_num",
.handler = ft232r_handle_tdi_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for tdi.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_srst_num",
+ .name = "srst_num",
.handler = ft232r_handle_srst_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for srst.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_trst_num",
+ .name = "trst_num",
.handler = ft232r_handle_trst_num_command,
.mode = COMMAND_CONFIG,
.help = "gpio number for trst.",
.usage = "<0-7|TXD|RXD|RTS|CTS|DTR|DSR|DCD|RI>",
},
{
- .name = "ft232r_restore_serial",
+ .name = "restore_serial",
.handler = ft232r_handle_restore_serial_command,
.mode = COMMAND_CONFIG,
.help = "bitmode control word that restores serial port.",
@@ -634,6 +607,17 @@ static const struct command_registration ft232r_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration ft232r_command_handlers[] = {
+ {
+ .name = "ft232r",
+ .mode = COMMAND_ANY,
+ .help = "perform ft232r management",
+ .chain = ft232r_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
/*
* Synchronous bitbang protocol implementation.
*/