X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fjtag%2Fdrivers%2Fusb_blaster%2Fusb_blaster.c;h=fcb594f30b900789f2cb5210404c1067fa336257;hb=efd1d642220a4f6d3b9a9607c186452b265400d2;hp=165ebdcd35a75e93064542987fbb6b72ef9e569a;hpb=159f11fefc194743a0af6e29e134b184bf26650d;p=openocd.git

diff --git a/src/jtag/drivers/usb_blaster/usb_blaster.c b/src/jtag/drivers/usb_blaster/usb_blaster.c
index 165ebdcd35..fcb594f30b 100644
--- a/src/jtag/drivers/usb_blaster/usb_blaster.c
+++ b/src/jtag/drivers/usb_blaster/usb_blaster.c
@@ -816,6 +816,11 @@ static int ublast_execute_queue(void)
 		case JTAG_SCAN:
 			ret = ublast_scan(cmd->cmd.scan);
 			break;
+		default:
+			LOG_ERROR("BUG: unknown JTAG command type 0x%X",
+				  cmd->type);
+			ret = ERROR_FAIL;
+			break;
 		}
 	}
 
@@ -1066,13 +1071,18 @@ static const struct command_registration ublast_command_handlers[] = {
 	COMMAND_REGISTRATION_DONE
 };
 
-struct jtag_interface usb_blaster_interface = {
+static struct jtag_interface usb_blaster_interface = {
+	.supported = DEBUG_CAP_TMS_SEQ,
+	.execute_queue = ublast_execute_queue,
+};
+
+struct adapter_driver usb_blaster_adapter_driver = {
 	.name = "usb_blaster",
 	.transports = jtag_only,
 	.commands = ublast_command_handlers,
-	.supported = DEBUG_CAP_TMS_SEQ,
 
-	.execute_queue = ublast_execute_queue,
 	.init = ublast_init,
 	.quit = ublast_quit,
+
+	.jtag_ops = &usb_blaster_interface,
 };