X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fzy1000.c;h=52619b159428e009370be721966ffc7588482664;hb=c68684c2e6790213fd37fff6626604632e75923b;hp=cfe40f4c2166939bce89c14d8115283776fc0958;hpb=a88871bc6ad13561d9e60fbd9152b8f0c05329b1;p=openocd.git

diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c
index cfe40f4c21..52619b1594 100644
--- a/src/jtag/zy1000.c
+++ b/src/jtag/zy1000.c
@@ -20,10 +20,9 @@
 #include "config.h"
 #endif
 
-#define INCLUDE_JTAG_MINIDRIVER_H
-#define INCLUDE_JTAG_INTERFACE_H
 #include "embeddedice.h"
-#include "bitbang.h"
+#include "minidriver.h"
+#include "interface.h"
 
 #include <cyg/hal/hal_io.h>             // low level i/o
 #include <cyg/hal/hal_diag.h>
@@ -117,7 +116,7 @@ static int zy1000_power_dropout(int *dropout)
 jtag_interface_t zy1000_interface =
 {
 	.name = "ZY1000",
-	.execute_queue = bitbang_execute_queue,
+	.execute_queue = NULL,
 	.speed = zy1000_speed,
 	.register_commands = zy1000_register_commands,
 	.init = zy1000_init,
@@ -128,15 +127,6 @@ jtag_interface_t zy1000_interface =
 	.srst_asserted = zy1000_srst_asserted,
 };
 
-bitbang_interface_t zy1000_bitbang =
-{
-	.read = zy1000_read,
-	.write = zy1000_write,
-	.reset = zy1000_reset
-};
-
-
-
 static void zy1000_write(int tck, int tms, int tdi)
 {
 
@@ -368,8 +358,6 @@ int zy1000_init(void)
 	zy1000_reset(0, 0);
 	zy1000_speed(jtag_speed);
 
-	bitbang_interface = &zy1000_bitbang;
-
 	return ERROR_OK;
 }
 
@@ -381,7 +369,6 @@ int zy1000_quit(void)
 
 
 
-
 int interface_jtag_execute_queue(void)
 {
 	cyg_uint32 empty;
@@ -523,7 +510,7 @@ int interface_jtag_add_end_state(tap_state_t state)
 }
 
 
-int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
 
 	int j;
@@ -584,7 +571,7 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t
 
 
 
-int interface_jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_plain_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
 	scanFields(num_fields, fields, TAP_IRSHIFT, cmd_queue_end_state);
 
@@ -593,7 +580,7 @@ int interface_jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, tap_s
 
 /*extern jtag_command_t **jtag_get_last_command_p(void);*/
 
-int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
 
 	int j;
@@ -637,7 +624,7 @@ int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, tap_state_t
 	return ERROR_OK;
 }
 
-int interface_jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_plain_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
 	scanFields(num_fields, fields, TAP_DRSHIFT, cmd_queue_end_state);
 	return ERROR_OK;
@@ -720,7 +707,7 @@ int interface_jtag_add_sleep(u32 us)
 	return ERROR_OK;
 }
 
-int interface_jtag_add_pathmove(int num_states, tap_state_t *path)
+int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
 {
 	int state_count;
 	int tms = 0;