Removed unused interface_jtag_set_end_state and wrote down some notes on TCP/IP clien...

[openocd.git] / src / jtag / zy1000 / zy1000.c

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 8e896380c2ae29d7063eeb3fc344d1939ac747f6..f45bff5e32a6fb6fe40f88007658bb9cc10424c4 100644 (file)
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -23,16 +23,16 @@
 #include "embeddedice.h"
 #include "minidriver.h"
 #include "interface.h"
+#include "zy1000_version.h"
 
 #include <cyg/hal/hal_io.h>             // low level i/o
 #include <cyg/hal/hal_diag.h>
 
-
-#define ZYLIN_VERSION "1.54"
+#define ZYLIN_VERSION GIT_ZY1000_VERSION
 #define ZYLIN_DATE __DATE__
 #define ZYLIN_TIME __TIME__
-#define ZYLIN_OPENOCD "$Revision$"
-#define ZYLIN_OPENOCD_VERSION "Zylin JTAG ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE " " ZYLIN_TIME
+#define ZYLIN_OPENOCD GIT_OPENOCD_VERSION
+#define ZYLIN_OPENOCD_VERSION "ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE
 
 /* low level command set
  */
@@ -270,10 +270,7 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv
                const char *str = Jim_GetString(argv[1], NULL);
                if (strcmp("openocd", str) == 0)
                {
-                       int revision;
-                       revision = atol(ZYLIN_OPENOCD + strlen("XRevision: "));
-                       sprintf(buff, "%d", revision);
-                       version_str = buff;
+                       version_str = ZYLIN_OPENOCD;
                }
                else if (strcmp("zy1000", str) == 0)
                {
@@ -283,6 +280,10 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv
                {
                        version_str = ZYLIN_DATE;
                }
+               else if (strcmp("time", str) == 0)
+               {
+                       version_str = ZYLIN_TIME;
+               }
                else if (strcmp("pcb", str) == 0)
                {
 #ifdef CYGPKG_HAL_NIOS2
@@ -531,12 +532,6 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_
        }
 }
 
-int interface_jtag_set_end_state(tap_state_t state)
-{
-       return ERROR_OK;
-}
-
-
 int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
 
@@ -657,9 +652,6 @@ int interface_jtag_add_tlr()
 
 
 
-extern int jtag_nsrst_delay;
-extern int jtag_ntrst_delay;
-
 int interface_jtag_add_reset(int req_trst, int req_srst)
 {
        zy1000_reset(req_trst, req_srst);