summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroyvind <oyvind@titan.(none)>2009-10-19 15:08:52 +0200
committeroyvind <oyvind@titan.(none)>2009-10-19 15:08:52 +0200
commit89a8a37998871b54dd8e80d179ea5a0e59b3e7ea (patch)
tree18eae8218c038e05c40aa8917889a794dc38b155 /src
parent76b4ee8935c86466895b0cbf070389337581d593 (diff)
downloadopenocd+libswd-89a8a37998871b54dd8e80d179ea5a0e59b3e7ea.tar.gz
openocd+libswd-89a8a37998871b54dd8e80d179ea5a0e59b3e7ea.tar.bz2
openocd+libswd-89a8a37998871b54dd8e80d179ea5a0e59b3e7ea.tar.xz
openocd+libswd-89a8a37998871b54dd8e80d179ea5a0e59b3e7ea.zip
Switch from svn to git version string handling.
Diffstat (limited to 'src')
-rw-r--r--src/jtag/zy1000/zy1000.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index cb008a7d..dc0efb0b 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -23,15 +23,15 @@
#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.55"
+#define ZYLIN_VERSION GIT_ZY1000_VERSION
#define ZYLIN_DATE __DATE__
#define ZYLIN_TIME __TIME__
-#define ZYLIN_OPENOCD "$Revision$"
+#define ZYLIN_OPENOCD GIT_OPENOCD_VERSION
#define ZYLIN_OPENOCD_VERSION "Zylin JTAG ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE " " ZYLIN_TIME
/* 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)
{