[Openocd-svn] r2031 - trunk trunk/src/jtag zy1000/trunk/build zy1000/trunk/build/include

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-03 09:55:56 +0200 (Wed, 03 Jun 2009)
New Revision: 2031

Modified:
   trunk/configure.in
   trunk/src/jtag/zy1000.c
   zy1000/trunk/build/buildocd.sh
   zy1000/trunk/build/include/jtag_minidriver.h
Log:
catchup with jtag refactoring.

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-06-03 07:06:37 UTC (rev 2030)
+++ trunk/configure.in	2009-06-03 07:55:56 UTC (rev 2031)
@@ -454,7 +454,6 @@
 fi
 
 if test $build_ecosboard = yes; then
-  build_bitbang=yes
   AC_DEFINE(BUILD_ECOSBOARD, 1, [1 if you want eCosBoard.])
 else
   AC_DEFINE(BUILD_ECOSBOARD, 0, [0 if you don't want eCosBoard.])

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-06-03 07:06:37 UTC (rev 2030)
+++ trunk/src/jtag/zy1000.c	2009-06-03 07:55:56 UTC (rev 2031)
@@ -23,7 +23,6 @@
 #include "embeddedice.h"
 #include "minidriver.h"
 #include "interface.h"
-#include "bitbang.h"
 
 #include <cyg/hal/hal_io.h>             // low level i/o
 #include <cyg/hal/hal_diag.h>
@@ -117,7 +116,7 @@
 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 @@
 	.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 @@
 	zy1000_reset(0, 0);
 	zy1000_speed(jtag_speed);
 
-	bitbang_interface = &zy1000_bitbang;
-
 	return ERROR_OK;
 }
 

Modified: zy1000/trunk/build/buildocd.sh
===================================================================
--- zy1000/trunk/build/buildocd.sh	2009-06-03 07:06:37 UTC (rev 2030)
+++ zy1000/trunk/build/buildocd.sh	2009-06-03 07:55:56 UTC (rev 2031)
@@ -19,7 +19,7 @@
 rm -rf /tmp/ecosboard/build
 mkdir /tmp/ecosboard/build
 cd /tmp/ecosboard/build
-$OPENOCD/../../openocd/configure --disable-werror --enable-ioutil --host=arm-elf --includedir=/tmp/ecosboard/ecos/install/include/ --enable-ecosboard --prefix=/tmp/ecosboard/ocdinstall
+$OPENOCD/../../openocd/configure --disable-bitbang --disable-werror --enable-ioutil --host=arm-elf --includedir=/tmp/ecosboard/ecos/install/include/ --enable-ecosboard --prefix=/tmp/ecosboard/ocdinstall
 echo >makephi.sh sh $OPENOCD/makephi.sh
 echo >>makephi.sh sh $OPENOCD/makefw.sh
 make

Modified: zy1000/trunk/build/include/jtag_minidriver.h
===================================================================
--- zy1000/trunk/build/include/jtag_minidriver.h	2009-06-03 07:06:37 UTC (rev 2030)
+++ zy1000/trunk/build/include/jtag_minidriver.h	2009-06-03 07:55:56 UTC (rev 2031)
@@ -205,6 +205,6 @@
 	}
 }
 
-#define jtag_add_callback(callback, in) callback(in)
+#define interface_jtag_add_callback(callback, in) callback(in)
 
-#define jtag_add_callback4(callback, in, data1, data2, data3) jtag_set_error(callback(in, data1, data2, data3))
+#define interface_jtag_add_callback4(callback, in, data1, data2, data3) jtag_set_error(callback(in, data1, data2, data3))