X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fusb_blaster%2Fusb_blaster.c;fp=src%2Fjtag%2Fdrivers%2Fusb_blaster%2Fusb_blaster.c;h=cc1d4758fc9956d06892b80bceaf748cd07a4671;hp=8519d197a56f9433dc9dd5e9c843a16ce336b00c;hb=1549bad5b3de2c64b106475cfc23cfbccba2b8a3;hpb=cba3bb6f2a736414f86a0e26d3ac8b91551b1574

diff --git a/src/jtag/drivers/usb_blaster/usb_blaster.c b/src/jtag/drivers/usb_blaster/usb_blaster.c
index 8519d197a5..cc1d4758fc 100644
--- a/src/jtag/drivers/usb_blaster/usb_blaster.c
+++ b/src/jtag/drivers/usb_blaster/usb_blaster.c
@@ -1030,16 +1030,16 @@ COMMAND_HANDLER(ublast_firmware_command)
 }
 
 
-static const struct command_registration ublast_command_handlers[] = {
+static const struct command_registration ublast_subcommand_handlers[] = {
 	{
-		.name = "usb_blaster_device_desc",
+		.name = "device_desc",
 		.handler = ublast_handle_device_desc_command,
 		.mode = COMMAND_CONFIG,
 		.help = "set the USB device description of the USB-Blaster",
 		.usage = "description-string",
 	},
 	{
-		.name = "usb_blaster_vid_pid",
+		.name = "vid_pid",
 		.handler = ublast_handle_vid_pid_command,
 		.mode = COMMAND_CONFIG,
 		.help = "the vendor ID and product ID of the USB-Blaster and "
@@ -1048,21 +1048,21 @@ static const struct command_registration ublast_command_handlers[] = {
 		.usage = "vid pid vid_uninit pid_uninit",
 	},
 	{
-		.name = "usb_blaster_lowlevel_driver",
+		.name = "lowlevel_driver",
 		.handler = ublast_handle_lowlevel_drv_command,
 		.mode = COMMAND_CONFIG,
 		.help = "set the lowlevel access for the USB Blaster (ftdi, ublast2)",
 		.usage = "(ftdi|ublast2)",
 	},
 	{
-		.name = "usb_blaster_pin",
+		.name = "pin",
 		.handler = ublast_handle_pin_command,
 		.mode = COMMAND_ANY,
 		.help = "show or set pin state for the unused GPIO pins",
 		.usage = "(pin6|pin8) (0|1|s|t)",
 	},
 		{
-		.name = "usb_blaster_firmware",
+		.name = "firmware",
 		.handler = &ublast_firmware_command,
 		.mode = COMMAND_CONFIG,
 		.help = "configure the USB-Blaster II firmware location",
@@ -1071,6 +1071,17 @@ static const struct command_registration ublast_command_handlers[] = {
 	COMMAND_REGISTRATION_DONE
 };
 
+static const struct command_registration ublast_command_handlers[] = {
+	{
+		.name = "usb_blaster",
+		.mode = COMMAND_ANY,
+		.help = "perform usb_blaster management",
+		.chain = ublast_subcommand_handlers,
+		.usage = "",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
 static struct jtag_interface usb_blaster_interface = {
 	.supported = DEBUG_CAP_TMS_SEQ,
 	.execute_queue = ublast_execute_queue,