Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-316-g30bb4524d
|
From: OpenOCD-Gerrit <ope...@us...> - 2021-08-14 12:35:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 30bb4524de2b430d9c9ff005608fb5a2886fcd60 (commit)
via 08ce499f14c59ab816f781045fa4d7f75657f917 (commit)
via 347af768edd32c1d954f503cd64c6c366455599d (commit)
from 6c5618218494263cc52c8b140d047f0d046c5d69 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 30bb4524de2b430d9c9ff005608fb5a2886fcd60
Author: Marc Schink <de...@za...>
Date: Fri Jul 30 18:25:41 2021 +0200
tcl/interface/jtag_dpi: Adapt to new jtag_dpi command syntax
Change-Id: Icebf6f0a037f4ea9fb450581fcc599417bffc153
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6395
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/tcl/interface/jtag_dpi.cfg b/tcl/interface/jtag_dpi.cfg
index e43386d58..a92e131a9 100644
--- a/tcl/interface/jtag_dpi.cfg
+++ b/tcl/interface/jtag_dpi.cfg
@@ -34,5 +34,5 @@ if { [info exists DPI_ADDRESS] } {
set _DPI_ADDRESS "127.0.0.1"
}
-jtag_dpi_set_port $_DPI_PORT
-jtag_dpi_set_address $_DPI_ADDRESS
+jtag_dpi set_port $_DPI_PORT
+jtag_dpi set_address $_DPI_ADDRESS
commit 08ce499f14c59ab816f781045fa4d7f75657f917
Author: Marc Schink <de...@za...>
Date: Fri Jul 30 18:24:03 2021 +0200
drivers/jtag_dpi: Group adapter commands
Use a command group 'jtag_dpi' with subcommands instead of individual
commands with 'jtag_dpi_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: I19271546235a3c6737f975976a0bf0a2f66cbbe7
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6394
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index eb45acc39..aec6bbe4f 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -3321,11 +3321,11 @@ SystemVerilog Direct Programming Interface (DPI) compatible driver for
JTAG devices in emulation. The driver acts as a client for the SystemVerilog
DPI server interface.
-@deffn {Config Command} {jtag_dpi_set_port} port
+@deffn {Config Command} {jtag_dpi set_port} port
Specifies the TCP/IP port number of the SystemVerilog DPI server interface.
@end deffn
-@deffn {Config Command} {jtag_dpi_set_address} address
+@deffn {Config Command} {jtag_dpi set_address} address
Specifies the TCP/IP address of the SystemVerilog DPI server interface.
@end deffn
@end deffn
diff --git a/src/jtag/drivers/jtag_dpi.c b/src/jtag/drivers/jtag_dpi.c
index 73746d6d2..016ff5536 100644
--- a/src/jtag/drivers/jtag_dpi.c
+++ b/src/jtag/drivers/jtag_dpi.c
@@ -373,16 +373,16 @@ COMMAND_HANDLER(jtag_dpi_set_address)
return ERROR_OK;
}
-static const struct command_registration jtag_dpi_command_handlers[] = {
+static const struct command_registration jtag_dpi_subcommand_handlers[] = {
{
- .name = "jtag_dpi_set_port",
+ .name = "set_port",
.handler = &jtag_dpi_set_port,
.mode = COMMAND_CONFIG,
.help = "set the port of the DPI server",
.usage = "[port]",
},
{
- .name = "jtag_dpi_set_address",
+ .name = "set_address",
.handler = &jtag_dpi_set_address,
.mode = COMMAND_CONFIG,
.help = "set the address of the DPI server",
@@ -391,6 +391,17 @@ static const struct command_registration jtag_dpi_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration jtag_dpi_command_handlers[] = {
+ {
+ .name = "jtag_dpi",
+ .mode = COMMAND_ANY,
+ .help = "perform jtag_dpi management",
+ .chain = jtag_dpi_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static struct jtag_interface jtag_dpi_interface = {
.supported = DEBUG_CAP_TMS_SEQ,
.execute_queue = jtag_dpi_execute_queue,
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 92d8c8de4..263cde255 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -309,6 +309,18 @@ proc parport_toggling_time args {
eval parport toggling_time $args
}
+lappend _telnet_autocomplete_skip jtag_dpi_set_port
+proc jtag_dpi_set_port args {
+ echo "DEPRECATED! use 'jtag_dpi set_port' not 'jtag_dpi_set_port'"
+ eval jtag_dpi set_port $args
+}
+
+lappend _telnet_autocomplete_skip jtag_dpi_set_address
+proc jtag_dpi_set_address args {
+ echo "DEPRECATED! use 'jtag_dpi set_address' not 'jtag_dpi_set_address'"
+ eval jtag_dpi set_address $args
+}
+
lappend _telnet_autocomplete_skip presto_serial
proc presto_serial args {
echo "DEPRECATED! use 'presto serial' not 'presto_serial'"
commit 347af768edd32c1d954f503cd64c6c366455599d
Author: Marc Schink <de...@za...>
Date: Fri Jul 30 18:22:41 2021 +0200
drivers/vsllink: Group adapter commands
Use a command group 'vsllink' with subcommands instead of individual
commands with 'vsllink_' prefix.
The old commands are still available for backward compatibility but
marked as deprecated.
Change-Id: I59273bd7cd08c9801e4a9b3de7beaa86ca854622
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: http://openocd.zylin.com/6393
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tar...@gm...>
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/jtag/drivers/vsllink.c b/src/jtag/drivers/vsllink.c
index 57a7c666f..7325f6abc 100644
--- a/src/jtag/drivers/vsllink.c
+++ b/src/jtag/drivers/vsllink.c
@@ -887,44 +887,44 @@ static void vsllink_debug_buffer(uint8_t *buffer, int length)
}
}
-static const struct command_registration vsllink_command_handlers[] = {
+static const struct command_registration vsllink_subcommand_handlers[] = {
{
- .name = "vsllink_usb_vid",
+ .name = "usb_vid",
.handler = &vsllink_handle_usb_vid_command,
.mode = COMMAND_CONFIG,
.help = "Set USB VID",
.usage = "<vid>",
},
{
- .name = "vsllink_usb_pid",
+ .name = "usb_pid",
.handler = &vsllink_handle_usb_pid_command,
.mode = COMMAND_CONFIG,
.help = "Set USB PID",
.usage = "<pid>",
},
{
- .name = "vsllink_usb_serial",
+ .name = "usb_serial",
.handler = &vsllink_handle_usb_serial_command,
.mode = COMMAND_CONFIG,
.help = "Set or disable check for USB serial",
.usage = "[<serial>]",
},
{
- .name = "vsllink_usb_bulkin",
+ .name = "usb_bulkin",
.handler = &vsllink_handle_usb_bulkin_command,
.mode = COMMAND_CONFIG,
.help = "Set USB input endpoint",
.usage = "<ep_in>",
},
{
- .name = "vsllink_usb_bulkout",
+ .name = "usb_bulkout",
.handler = &vsllink_handle_usb_bulkout_command,
.mode = COMMAND_CONFIG,
.help = "Set USB output endpoint",
.usage = "<ep_out>",
},
{
- .name = "vsllink_usb_interface",
+ .name = "usb_interface",
.handler = &vsllink_handle_usb_interface_command,
.mode = COMMAND_CONFIG,
.help = "Set USB output interface",
@@ -933,6 +933,17 @@ static const struct command_registration vsllink_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration vsllink_command_handlers[] = {
+ {
+ .name = "vsllink",
+ .mode = COMMAND_ANY,
+ .help = "perform vsllink management",
+ .chain = vsllink_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static const char * const vsllink_transports[] = {"jtag", "swd", NULL};
static const struct swd_driver vsllink_swd_driver = {
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 19ce510c8..92d8c8de4 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -327,4 +327,40 @@ proc ulink_download_firmware args {
eval ulink download_firmware $args
}
+lappend _telnet_autocomplete_skip vsllink_usb_vid
+proc vsllink_usb_vid args {
+ echo "DEPRECATED! use 'vsllink usb_vid' not 'vsllink_usb_vid'"
+ eval vsllink usb_vid $args
+}
+
+lappend _telnet_autocomplete_skip vsllink_usb_pid
+proc vsllink_usb_pid args {
+ echo "DEPRECATED! use 'vsllink usb_pid' not 'vsllink_usb_pid'"
+ eval vsllink usb_pid $args
+}
+
+lappend _telnet_autocomplete_skip vsllink_usb_serial
+proc vsllink_usb_serial args {
+ echo "DEPRECATED! use 'vsllink usb_serial' not 'vsllink_usb_serial'"
+ eval vsllink usb_serial $args
+}
+
+lappend _telnet_autocomplete_skip vsllink_usb_bulkin
+proc vsllink_usb_bulkin args {
+ echo "DEPRECATED! use 'vsllink usb_bulkin' not 'vsllink_usb_bulkin'"
+ eval vsllink usb_bulkin $args
+}
+
+lappend _telnet_autocomplete_skip vsllink_usb_bulkout
+proc vsllink_usb_bulkout args {
+ echo "DEPRECATED! use 'vsllink usb_bulkout' not 'vsllink_usb_bulkout'"
+ eval vsllink usb_bulkout $args
+}
+
+lappend _telnet_autocomplete_skip vsllink_usb_interface
+proc vsllink_usb_interface args {
+ echo "DEPRECATED! use 'vsllink usb_interface' not 'vsllink_usb_interface'"
+ eval vsllink usb_interface $args
+}
+
# END MIGRATION AIDS
-----------------------------------------------------------------------
Summary of changes:
doc/openocd.texi | 4 ++--
src/jtag/drivers/jtag_dpi.c | 17 +++++++++++++---
src/jtag/drivers/vsllink.c | 25 ++++++++++++++++-------
src/jtag/startup.tcl | 48 +++++++++++++++++++++++++++++++++++++++++++++
tcl/interface/jtag_dpi.cfg | 4 ++--
5 files changed, 84 insertions(+), 14 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
