remove libusb0_common support

[openocd.git] / src / jtag / drivers / ulink.c

diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c
index bbe08aae7fee30c9984df016fdf0acc5fedb673b..77fbe61933b6d9dd21c20bcb36cbbc6165b93c53 100644 (file)
--- a/src/jtag/drivers/ulink.c
+++ b/src/jtag/drivers/ulink.c
@@ -235,7 +235,7 @@ int ulink_queue_stableclocks(struct ulink *device, struct jtag_command *cmd);
 int ulink_post_process_scan(struct ulink_cmd *ulink_cmd);
 int ulink_post_process_queue(struct ulink *device);
 
-/* JTAG driver functions (registered in struct jtag_interface) */
+/* adapter driver functions */
 static int ulink_execute_queue(void);
 static int ulink_khz(int khz, int *jtag_speed);
 static int ulink_speed(int speed);
@@ -2272,17 +2272,20 @@ static const struct command_registration ulink_command_handlers[] = {
        COMMAND_REGISTRATION_DONE,
 };
 
-struct jtag_interface ulink_interface = {
-       .name = "ulink",
+static struct jtag_interface ulink_interface = {
+       .execute_queue = ulink_execute_queue,
+};
 
-       .commands = ulink_command_handlers,
+struct adapter_driver ulink_adapter_driver = {
+       .name = "ulink",
        .transports = jtag_only,
+       .commands = ulink_command_handlers,
 
-       .execute_queue = ulink_execute_queue,
-       .khz = ulink_khz,
+       .init = ulink_init,
+       .quit = ulink_quit,
        .speed = ulink_speed,
+       .khz = ulink_khz,
        .speed_div = ulink_speed_div,
 
-       .init = ulink_init,
-       .quit = ulink_quit
+       .jtag_ops = &ulink_interface,
 };