diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-17 10:51:34 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-17 10:51:34 +0000 |
| commit | 8d8937f1a68e1b050b92f91b1d264bf4bd3af489 (patch) | |
| tree | ccf3355aa5ee018ebd4e89aa4fdfeb2d7d7d5ad0 /src/jtag | |
| parent | d727e31af99cebff95c41fd1d2b319fddea9edd1 (diff) | |
| download | openocd+libswd-8d8937f1a68e1b050b92f91b1d264bf4bd3af489.tar.gz openocd+libswd-8d8937f1a68e1b050b92f91b1d264bf4bd3af489.tar.bz2 openocd+libswd-8d8937f1a68e1b050b92f91b1d264bf4bd3af489.tar.xz openocd+libswd-8d8937f1a68e1b050b92f91b1d264bf4bd3af489.zip | |
dummy driver now works under eCos
git-svn-id: svn://svn.berlios.de/openocd/trunk@2268 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag')
| -rw-r--r-- | src/jtag/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jtag/jtag.h | 2 | ||||
| -rw-r--r-- | src/jtag/tcl.c | 4 | ||||
| -rw-r--r-- | src/jtag/zy1000/zy1000.c | 24 |
4 files changed, 4 insertions, 28 deletions
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am index 58bbff36..5af6c74f 100644 --- a/src/jtag/Makefile.am +++ b/src/jtag/Makefile.am @@ -9,7 +9,7 @@ DRIVERFILES = if MINIDRIVER -if ECOSBOARD +if ZY1000 DRIVERFILES += zy1000/zy1000.c AM_CPPFLAGS += -I$(srcdir)/zy1000 endif diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index cddceef4..459f7fd0 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -62,7 +62,7 @@ */ typedef enum tap_state { -#if BUILD_ECOSBOARD +#if BUILD_ZY1000 /* These are the old numbers. Leave as-is for now... */ TAP_RESET = 0, TAP_IDLE = 8, TAP_DRSELECT = 1, TAP_DRCAPTURE = 2, TAP_DRSHIFT = 3, TAP_DREXIT1 = 4, diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index fc2671e2..ad4d886a 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -49,7 +49,7 @@ static const Jim_Nvp nvp_jtag_tap_event[] = { /* jtag interfaces (parport, FTDI-USB, TI-USB, ...) */ -#if BUILD_ECOSBOARD == 1 +#if BUILD_ZY1000 == 1 extern jtag_interface_t zy1000_interface; #elif defined(BUILD_MINIDRIVER_DUMMY) extern jtag_interface_t minidummy_interface; @@ -119,7 +119,7 @@ static const Jim_Nvp nvp_jtag_tap_event[] = { * or some number of standard driver interfaces, never both. */ jtag_interface_t *jtag_interfaces[] = { -#if BUILD_ECOSBOARD == 1 +#if BUILD_ZY1000 == 1 &zy1000_interface, #elif defined(BUILD_MINIDRIVER_DUMMY) &minidummy_interface, diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index 4dbdef24..daac0772 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -33,7 +33,6 @@ #define ZYLIN_TIME __TIME__ #define ZYLIN_OPENOCD "$Revision$" #define ZYLIN_OPENOCD_VERSION "Zylin JTAG ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE " " ZYLIN_TIME -const char *zylin_config_dir="/config/settings"; /* low level command set */ @@ -783,27 +782,4 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little } } -int loadFile(const char *fileName, void **data, int *len); - -/* boolean parameter stored on config */ -int boolParam(char *var) -{ - bool result = false; - char *name = alloc_printf("%s/%s", zylin_config_dir, var); - if (name == NULL) - return result; - - void *data; - int len; - if (loadFile(name, &data, &len) == ERROR_OK) - { - if (len > 1) - len = 1; - result = strncmp((char *) data, "1", len) == 0; - free(data); - } - free(name); - return result; -} - |