update zy1000 to latest minidriver work
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 8 Jun 2009 14:13:32 +0000 (14:13 +0000)
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 8 Jun 2009 14:13:32 +0000 (14:13 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@2132 b42882b7-edfa-0310-969c-e2dbd0fdcd60

configure.in
src/jtag/Makefile.am
src/jtag/zy1000.c [deleted file]
src/jtag/zy1000/jtag_minidriver.h [new file with mode: 0644]
src/jtag/zy1000/zy1000.c [new file with mode: 0644]

index 7ab9db3db5085800c679e9580820524174e4a073..56e431d9b73bf7dd56b962b61c7f4f4d4debc518 100644 (file)
@@ -400,13 +400,12 @@ AC_ARG_ENABLE(minidriver_dummy,
 build_minidriver=no
 AC_MSG_CHECKING([whether to enable ZY1000 minidriver])
 if test $build_ecosboard = yes; then
-  # check for that project's header file in the current header search path
-  AC_CHECK_HEADERS(jtag_minidriver.h, [build_minidriver=yes],
-      AC_MSG_WARN([The --enable-ecosboard option needs the out-of-tree 'jtag_minidriver.h'])
-      AC_MSG_ERROR([The out-of-tree jtag_minidriver.h cannot be found.])
-    )
+  if test $build_minidriver = yes; then
+    AC_MSG_ERROR([Multiple minidriver options have been enabled.])
+  fi
+  AC_DEFINE(HAVE_JTAG_MINIDRIVER_H, 1,
+      [Define to 1 if you have the <jtag_minidriver.h> header file.])
   build_minidriver=yes
-  AC_DEFINE(BUILD_MINIDRIVER_DUMMY, 1, [Use the dummy minidriver.])
 fi
 AC_MSG_RESULT($build_ecosboard)
 
index 567a8fc2809d6e6624364f64617e1affaf2175fe..b798a28dd7bb43b27b98cecb6ec4c63e6401a265 100644 (file)
@@ -46,7 +46,8 @@ EP93XXFILES =
 endif
 
 if ECOSBOARD
-ECOSBOARDFILES = zy1000.c
+ECOSBOARDFILES = zy1000/zy1000.c
+AM_CPPFLAGS += -I$(srcdir)/zy1000
 else
 ECOSBOARDFILES =
 endif
diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c
deleted file mode 100644 (file)
index ad148f1..0000000
+++ /dev/null
@@ -1,809 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007-2008 by Ã˜yvind Harboe                              *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "embeddedice.h"
-#include "minidriver.h"
-#include "interface.h"
-
-#include <cyg/hal/hal_io.h>             // low level i/o
-#include <cyg/hal/hal_diag.h>
-
-
-#define ZYLIN_VERSION "1.52"
-#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
-const char *zylin_config_dir="/config/settings";
-
-/* low level command set
- */
-int zy1000_read(void);
-static void zy1000_write(int tck, int tms, int tdi);
-void zy1000_reset(int trst, int srst);
-
-
-int zy1000_speed(int speed);
-int zy1000_register_commands(struct command_context_s *cmd_ctx);
-int zy1000_init(void);
-int zy1000_quit(void);
-
-/* interface commands */
-int zy1000_handle_zy1000_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
-static int zy1000_khz(int khz, int *jtag_speed)
-{
-       if (khz==0)
-       {
-               *jtag_speed=0;
-       }
-       else
-       {
-               *jtag_speed=64000/khz;
-       }
-       return ERROR_OK;
-}
-
-static int zy1000_speed_div(int speed, int *khz)
-{
-       if (speed==0)
-       {
-               *khz = 0;
-       }
-       else
-       {
-               *khz=64000/speed;
-       }
-
-       return ERROR_OK;
-}
-
-static bool readPowerDropout(void)
-{
-       cyg_uint32 state;
-       // sample and clear power dropout
-       HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x80);
-       HAL_READ_UINT32(ZY1000_JTAG_BASE+0x10, state);
-       bool powerDropout;
-       powerDropout = (state & 0x80) != 0;
-       return powerDropout;
-}
-
-
-static bool readSRST(void)
-{
-       cyg_uint32 state;
-       // sample and clear SRST sensing
-       HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x00000040);
-       HAL_READ_UINT32(ZY1000_JTAG_BASE+0x10, state);
-       bool srstAsserted;
-       srstAsserted = (state & 0x40) != 0;
-       return srstAsserted;
-}
-
-static int zy1000_srst_asserted(int *srst_asserted)
-{
-       *srst_asserted=readSRST();
-       return ERROR_OK;
-}
-
-static int zy1000_power_dropout(int *dropout)
-{
-       *dropout=readPowerDropout();
-       return ERROR_OK;
-}
-
-
-jtag_interface_t zy1000_interface =
-{
-       .name = "ZY1000",
-       .execute_queue = NULL,
-       .speed = zy1000_speed,
-       .register_commands = zy1000_register_commands,
-       .init = zy1000_init,
-       .quit = zy1000_quit,
-       .khz = zy1000_khz,
-       .speed_div = zy1000_speed_div,
-       .power_dropout = zy1000_power_dropout,
-       .srst_asserted = zy1000_srst_asserted,
-};
-
-static void zy1000_write(int tck, int tms, int tdi)
-{
-
-}
-
-int zy1000_read(void)
-{
-       return -1;
-}
-
-extern bool readSRST(void);
-
-void zy1000_reset(int trst, int srst)
-{
-       LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
-       if(!srst)
-       {
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000001);
-       }
-       else
-       {
-               /* Danger!!! if clk!=0 when in
-                * idle in TAP_IDLE, reset halt on str912 will fail.
-                */
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000001);
-       }
-
-       if(!trst)
-       {
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000002);
-       }
-       else
-       {
-               /* assert reset */
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000002);
-       }
-
-       if (trst||(srst&&(jtag_reset_config & RESET_SRST_PULLS_TRST)))
-       {
-               waitIdle();
-               /* we're now in the RESET state until trst is deasserted */
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_RESET);
-       } else
-       {
-               /* We'll get RCLK failure when we assert TRST, so clear any false positives here */
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400);
-       }
-
-       /* wait for srst to float back up */
-       if (!srst)
-       {
-               int i;
-               for (i=0; i<1000; i++)
-               {
-                       // We don't want to sense our own reset, so we clear here.
-                       // There is of course a timing hole where we could loose
-                       // a "real" reset.
-                       if (!readSRST())
-                               break;
-
-                       /* wait 1ms */
-                       alive_sleep(1);
-               }
-
-               if (i==1000)
-               {
-                       LOG_USER("SRST didn't deassert after %dms", i);
-               } else if (i>1)
-               {
-                       LOG_USER("SRST took %dms to deassert", i);
-               }
-       }
-}
-
-int zy1000_speed(int speed)
-{
-       if(speed == 0)
-       {
-               /*0 means RCLK*/
-               speed = 0;
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x100);
-               LOG_DEBUG("jtag_speed using RCLK");
-       }
-       else
-       {
-               if(speed > 8190 || speed < 2)
-               {
-                       LOG_USER("valid ZY1000 jtag_speed=[8190,2]. Divisor is 64MHz / even values between 8190-2, i.e. min 7814Hz, max 32MHz");
-                       return ERROR_INVALID_ARGUMENTS;
-               }
-
-               LOG_USER("jtag_speed %d => JTAG clk=%f", speed, 64.0/(float)speed);
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x100);
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x1c, speed&~1);
-       }
-       return ERROR_OK;
-}
-
-static bool savePower;
-
-
-static void setPower(bool power)
-{
-       savePower = power;
-       if (power)
-       {
-               HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x14, 0x8);
-       } else
-       {
-               HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x8);
-       }
-}
-
-int handle_power_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       if (argc > 1)
-       {
-               return ERROR_INVALID_ARGUMENTS;
-       }
-
-       if (argc == 1)
-       {
-               if (strcmp(args[0], "on") == 0)
-               {
-                       setPower(1);
-               }
-               else if (strcmp(args[0], "off") == 0)
-               {
-                       setPower(0);
-               } else
-               {
-                       command_print(cmd_ctx, "arg is \"on\" or \"off\"");
-                       return ERROR_INVALID_ARGUMENTS;
-               }
-       }
-
-       command_print(cmd_ctx, "Target power %s", savePower ? "on" : "off");
-
-       return ERROR_OK;
-}
-
-
-/* Give TELNET a way to find out what version this is */
-static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
-{
-       if ((argc < 1) || (argc > 2))
-               return JIM_ERR;
-       char buff[128];
-       const char *version_str=NULL;
-
-       if (argc == 1)
-       {
-               version_str=ZYLIN_OPENOCD_VERSION;
-       } else
-       {
-               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;
-               }
-               else if (strcmp("zy1000", str) == 0)
-               {
-                       version_str=ZYLIN_VERSION;
-               }
-               else if (strcmp("date", str) == 0)
-               {
-                       version_str=ZYLIN_DATE;
-               }
-               else
-               {
-                       return JIM_ERR;
-               }
-       }
-
-       Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
-
-       return JIM_OK;
-}
-
-
-static int
-zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
-                                                                  int argc,
-               Jim_Obj * const *argv)
-{
-       if (argc != 1)
-       {
-               Jim_WrongNumArgs(interp, 1, argv, "powerstatus");
-               return JIM_ERR;
-       }
-
-       cyg_uint32 status;
-       ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, status);
-
-       Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80)!=0));
-
-       return JIM_OK;
-}
-
-int zy1000_register_commands(struct command_context_s *cmd_ctx)
-{
-       register_command(cmd_ctx, NULL, "power", handle_power_command, COMMAND_ANY,
-                       "power <on/off> - turn power switch to target on/off. No arguments - print status.");
-
-       Jim_CreateCommand(interp, "zy1000_version", jim_zy1000_version, NULL, NULL);
-
-
-       Jim_CreateCommand(interp, "powerstatus", zylinjtag_Jim_Command_powerstatus, NULL, NULL);
-
-       return ERROR_OK;
-}
-
-
-
-
-int zy1000_init(void)
-{
-       LOG_USER("%s", ZYLIN_OPENOCD_VERSION);
-
-       ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x30); // Turn on LED1 & LED2
-
-       setPower(true); // on by default
-
-
-        /* deassert resets. Important to avoid infinite loop waiting for SRST to deassert */
-       zy1000_reset(0, 0);
-       zy1000_speed(jtag_speed);
-
-       return ERROR_OK;
-}
-
-int zy1000_quit(void)
-{
-
-       return ERROR_OK;
-}
-
-
-
-int interface_jtag_execute_queue(void)
-{
-       cyg_uint32 empty;
-
-       waitIdle();
-       ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty);
-       /* clear JTAG error register */
-       ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400);
-
-       if ((empty&0x400)!=0)
-       {
-               LOG_WARNING("RCLK timeout");
-               /* the error is informative only as we don't want to break the firmware if there
-                * is a false positive.
-                */
-//             return ERROR_FAIL;
-       }
-       return ERROR_OK;
-}
-
-
-
-
-
-static cyg_uint32 getShiftValue(void)
-{
-       cyg_uint32 value;
-       waitIdle();
-       ZY1000_PEEK(ZY1000_JTAG_BASE+0xc, value);
-       VERBOSE(LOG_INFO("getShiftValue %08x", value));
-       return value;
-}
-#if 0
-static cyg_uint32 getShiftValueFlip(void)
-{
-       cyg_uint32 value;
-       waitIdle();
-       ZY1000_PEEK(ZY1000_JTAG_BASE+0x18, value);
-       VERBOSE(LOG_INFO("getShiftValue %08x (flipped)", value));
-       return value;
-}
-#endif
-
-#if 0
-static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endState, int repeat, cyg_uint32 value)
-{
-       VERBOSE(LOG_INFO("shiftValueInner %s %s %d %08x (flipped)", tap_state_name(state), tap_state_name(endState), repeat, value));
-       cyg_uint32 a,b;
-       a=state;
-       b=endState;
-       ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value);
-       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1<<15)|(repeat<<8)|(a<<4)|b);
-       VERBOSE(getShiftValueFlip());
-}
-#endif
-
-extern int jtag_check_value(u8 *captured, void *priv);
-
-static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_t shiftState, tap_state_t end_state)
-{
-       int i;
-       int j;
-       int k;
-
-       for (i = 0; i < num_fields; i++)
-       {
-               cyg_uint32 value;
-
-               static u8 *in_buff=NULL; /* pointer to buffer for scanned data */
-               static int in_buff_size=0;
-               u8 *inBuffer=NULL;
-
-
-               // figure out where to store the input data
-               int num_bits=fields[i].num_bits;
-               if (fields[i].in_value!=NULL)
-               {
-                       inBuffer=fields[i].in_value;
-               }
-
-               // here we shuffle N bits out/in
-               j=0;
-               while (j<num_bits)
-               {
-                       tap_state_t pause_state;
-                       int l;
-                       k=num_bits-j;
-                       pause_state=(shiftState==TAP_DRSHIFT)?TAP_DRSHIFT:TAP_IRSHIFT;
-                       if (k>32)
-                       {
-                               k=32;
-                               /* we have more to shift out */
-                       } else if (i == num_fields-1)
-                       {
-                               /* this was the last to shift out this time */
-                               pause_state=end_state;
-                       }
-
-                       // we have (num_bits+7)/8 bytes of bits to toggle out.
-                       // bits are pushed out LSB to MSB
-                       value=0;
-                       if (fields[i].out_value!=NULL)
-                       {
-                               for (l=0; l<k; l+=8)
-                               {
-                                       value|=fields[i].out_value[(j+l)/8]<<l;
-                               }
-                       }
-                       /* mask away unused bits for easier debugging */
-                       value&=~(((u32)0xffffffff)<<k);
-
-                       shiftValueInner(shiftState, pause_state, k, value);
-
-                       if (inBuffer!=NULL)
-                       {
-                               // data in, LSB to MSB
-                               value=getShiftValue();
-                               // we're shifting in data to MSB, shift data to be aligned for returning the value
-                               value >>= 32-k;
-
-                               for (l=0; l<k; l+=8)
-                               {
-                                       inBuffer[(j+l)/8]=(value>>l)&0xff;
-                               }
-                       }
-                       j+=k;
-               }
-       }
-}
-
-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)
-{
-
-       int j;
-       int scan_size = 0;
-       jtag_tap_t *tap, *nextTap;
-       for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
-       {
-               nextTap=jtag_tap_next_enabled(tap);
-               tap_state_t end_state;
-               if (nextTap==NULL)
-               {
-                       end_state = state;
-               } else
-               {
-                       end_state = TAP_IRSHIFT;
-               }
-
-               int found = 0;
-
-               scan_size = tap->ir_length;
-
-               /* search the list */
-               for (j=0; j < num_fields; j++)
-               {
-                       if (tap == fields[j].tap)
-                       {
-                               found = 1;
-
-                               scanFields(1, fields+j, TAP_IRSHIFT, end_state);
-                               /* update device information */
-                               buf_cpy(fields[j].out_value, tap->cur_instr, scan_size);
-
-                               tap->bypass = 0;
-                               break;
-                       }
-               }
-
-               if (!found)
-               {
-                       /* if a device isn't listed, set it to BYPASS */
-                       u8 ones[]={0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
-
-                       scan_field_t tmp;
-                       memset(&tmp, 0, sizeof(tmp));
-                       tmp.out_value = ones;
-                       tmp.num_bits = scan_size;
-                       scanFields(1, &tmp, TAP_IRSHIFT, end_state);
-                       /* update device information */
-                       buf_cpy(tmp.out_value, tap->cur_instr, scan_size);
-                       tap->bypass = 1;
-               }
-       }
-
-       return ERROR_OK;
-}
-
-
-
-
-
-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, state);
-
-       return ERROR_OK;
-}
-
-/*extern jtag_command_t **jtag_get_last_command_p(void);*/
-
-int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
-{
-
-       int j;
-       jtag_tap_t *tap, *nextTap;
-       for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
-       {
-               nextTap=jtag_tap_next_enabled(tap);
-               int found=0;
-               tap_state_t end_state;
-               if (nextTap==NULL)
-               {
-                       end_state = state;
-               } else
-               {
-                       end_state = TAP_DRSHIFT;
-               }
-
-               for (j=0; j < num_fields; j++)
-               {
-                       if (tap == fields[j].tap)
-                       {
-                               found = 1;
-
-                               scanFields(1, fields+j, TAP_DRSHIFT, end_state);
-                       }
-               }
-               if (!found)
-               {
-                       scan_field_t tmp;
-                       /* program the scan field to 1 bit length, and ignore it's value */
-                       tmp.num_bits = 1;
-                       tmp.out_value = NULL;
-                       tmp.in_value = NULL;
-
-                       scanFields(1, &tmp, TAP_DRSHIFT, end_state);
-               }
-               else
-               {
-               }
-       }
-       return ERROR_OK;
-}
-
-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, state);
-       return ERROR_OK;
-}
-
-
-int interface_jtag_add_tlr()
-{
-       setCurrentState(TAP_RESET);
-       return ERROR_OK;
-}
-
-
-
-
-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);
-       return ERROR_OK;
-}
-
-static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t clockstate)
-{
-       /* num_cycles can be 0 */
-       setCurrentState(clockstate);
-
-       /* execute num_cycles, 32 at the time. */
-       int i;
-       for (i=0; i<num_cycles; i+=32)
-       {
-               int num;
-               num=32;
-               if (num_cycles-i<num)
-               {
-                       num=num_cycles-i;
-               }
-               shiftValueInner(clockstate, clockstate, num, 0);
-       }
-
-#if !TEST_MANUAL()
-       /* finish in end_state */
-       setCurrentState(state);
-#else
-       tap_state_t t=TAP_IDLE;
-       /* test manual drive code on any target */
-       int tms;
-       u8 tms_scan = tap_get_tms_path(t, state);
-       int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
-
-       for (i = 0; i < tms_count; i++)
-       {
-               tms = (tms_scan >> i) & 1;
-               waitIdle();
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x28,  tms);
-       }
-       waitIdle();
-       ZY1000_POKE(ZY1000_JTAG_BASE+0x20, state);
-#endif
-
-
-       return ERROR_OK;
-}
-
-int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
-{
-       return zy1000_jtag_add_clocks(num_cycles, state, TAP_IDLE);
-}
-
-int interface_jtag_add_clocks(int num_cycles)
-{
-       return zy1000_jtag_add_clocks(num_cycles, cmd_queue_cur_state, cmd_queue_cur_state);
-}
-
-int interface_jtag_add_sleep(u32 us)
-{
-       jtag_sleep(us);
-       return ERROR_OK;
-}
-
-int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
-{
-       int state_count;
-       int tms = 0;
-
-       /*wait for the fifo to be empty*/
-       waitIdle();
-
-       state_count = 0;
-
-       tap_state_t cur_state=cmd_queue_cur_state;
-
-       while (num_states)
-       {
-               if (tap_state_transition(cur_state, false) == path[state_count])
-               {
-                       tms = 0;
-               }
-               else if (tap_state_transition(cur_state, true) == path[state_count])
-               {
-                       tms = 1;
-               }
-               else
-               {
-                       LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_name(cur_state), tap_state_name(path[state_count]));
-                       exit(-1);
-               }
-
-               waitIdle();
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x28,  tms);
-
-               cur_state = path[state_count];
-               state_count++;
-               num_states--;
-       }
-
-       waitIdle();
-       ZY1000_POKE(ZY1000_JTAG_BASE+0x20,  cur_state);
-       return ERROR_OK;
-}
-
-
-
-void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count)
-{
-//     static int const reg_addr=0x5;
-       tap_state_t end_state=jtag_get_end_state();
-       if (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL)
-       {
-               /* better performance via code duplication */
-               if (little)
-               {
-                       int i;
-                       for (i = 0; i < count; i++)
-                       {
-                               shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 1));
-                               shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1<<5));
-                               buffer+=4;
-                       }
-               } else
-               {
-                       int i;
-                       for (i = 0; i < count; i++)
-                       {
-                               shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 0));
-                               shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1<<5));
-                               buffer+=4;
-                       }
-               }
-       }
-       else
-       {
-               int i;
-               for (i = 0; i < count; i++)
-               {
-                       embeddedice_write_reg_inner(tap, reg_addr, fast_target_buffer_get_u32(buffer, little));
-                       buffer += 4;
-               }
-       }
-}
-
-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;
-}
-
-
diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
new file mode 100644 (file)
index 0000000..5fafd9e
--- /dev/null
@@ -0,0 +1,210 @@
+/***************************************************************************\r
+ *   Copyright (C) 2007-2008 by Ã˜yvind Harboe                              *\r
+ *                                                                         *\r
+ *   This program is free software; you can redistribute it and/or modify  *\r
+ *   it under the terms of the GNU General Public License as published by  *\r
+ *   the Free Software Foundation; either version 2 of the License, or     *\r
+ *   (at your option) any later version.                                   *\r
+ *                                                                         *\r
+ *   This program is distributed in the hope that it will be useful,       *\r
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *\r
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *\r
+ *   GNU General Public License for more details.                          *\r
+ *                                                                         *\r
+ *   You should have received a copy of the GNU General Public License     *\r
+ *   along with this program; if not, write to the                         *\r
+ *   Free Software Foundation, Inc.,                                       *\r
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *\r
+ ***************************************************************************/\r
+\r
+#include <cyg/hal/hal_io.h>             // low level i/o\r
+\r
+//#define VERBOSE(a) a\r
+#define VERBOSE(a)\r
+\r
+/* used to test manual mode */\r
+#define TEST_MANUAL() 0\r
+\r
+#if 0\r
+int  diag_printf( const char *fmt, ... );\r
+#define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b); diag_printf("poke 0x%08x,0x%08x\n", a, b)\r
+#define ZY1000_PEEK(a, b) HAL_READ_UINT32(a, b); diag_printf("peek 0x%08x=0x%08x\n", a, b)\r
+#else\r
+#define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b)\r
+#define ZY1000_PEEK(a, b) HAL_READ_UINT32(a, b)\r
+#endif\r
+\r
+// FIFO empty?\r
+static __inline__ void waitIdle(void)\r
+{\r
+       cyg_uint32 empty;\r
+       do\r
+       {\r
+               ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty);\r
+       } while ((empty & 0x100)==0);\r
+}\r
+\r
+static __inline__ void waitQueue(void)\r
+{\r
+//     waitIdle();\r
+}\r
+\r
+static void sampleShiftRegister(void)\r
+{\r
+#if 0\r
+       cyg_uint32 dummy;\r
+       waitIdle();\r
+       ZY1000_PEEK(ZY1000_JTAG_BASE+0xc, dummy);\r
+#endif\r
+}\r
+\r
+/* -O3 will inline this for us */\r
+static void setCurrentState(enum tap_state state)\r
+{\r
+       cyg_uint32 a;\r
+       a=state;\r
+       int repeat=0;\r
+       if (state==TAP_RESET)\r
+       {\r
+               // The FPGA nor we know the current state of the CPU TAP\r
+               // controller. This will move it to TAP for sure.\r
+               //\r
+               // 5 should be enough here, 7 is what OpenOCD uses\r
+               repeat=7;\r
+       }\r
+       waitQueue();\r
+       sampleShiftRegister();\r
+       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat<<8)|(a<<4)|a);\r
+\r
+}\r
+\r
+/*\r
+ * Enter state and cause repeat transitions *out* of that state. So if the endState!=state, then\r
+ * the transition from state to endState counts as a transition out of state.\r
+ */\r
+static __inline__ void shiftValueInner(const enum tap_state state, const enum tap_state endState, int repeat, cyg_uint32 value)\r
+{\r
+       cyg_uint32 a,b;\r
+       a=state;\r
+       b=endState;\r
+       waitQueue();\r
+       sampleShiftRegister();\r
+       ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value);\r
+#if 1\r
+#if TEST_MANUAL()\r
+       if ((state==TAP_DRSHIFT)&&(endState!=TAP_DRSHIFT))\r
+       {\r
+               int i;\r
+               setCurrentState(state);\r
+               for (i=0; i<repeat; i++)\r
+               {\r
+                       int tms;\r
+                       tms=0;\r
+                       if ((i==repeat-1)&&(state!=endState))\r
+                       {\r
+                               tms=1;\r
+                       }\r
+                       /* shift out value */\r
+                       waitIdle();\r
+                       ZY1000_POKE(ZY1000_JTAG_BASE+0x28, (((value>>i)&1)<<1)|tms);\r
+               }\r
+               waitIdle();\r
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x28, 0);\r
+               waitIdle();\r
+               //ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_DRSHIFT); // set this state and things break => expected\r
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_DRPAUSE); // set this and things will work => expected. Not setting this is not sufficient to make things break.\r
+               setCurrentState(endState);\r
+       } else\r
+       {\r
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat<<8)|(a<<4)|b);\r
+       }\r
+#else\r
+       /* fast version */\r
+       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat<<8)|(a<<4)|b);\r
+#endif\r
+#else\r
+       /* maximum debug version */\r
+       if ((repeat>0)&&((state==TAP_DRSHIFT)||(state==TAP_SI)))\r
+       {\r
+               int i;\r
+               /* sample shift register for every bit. */\r
+               for (i=0; i<repeat-1; i++)\r
+               {\r
+                       sampleShiftRegister();\r
+                       ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value>>i);\r
+                       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1<<8)|(a<<4)|a);\r
+               }\r
+               sampleShiftRegister();\r
+               ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value>>(repeat-1));\r
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1<<8)|(a<<4)|b);\r
+       } else\r
+       {\r
+               sampleShiftRegister();\r
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat<<8)|(a<<4)|b);\r
+       }\r
+       sampleShiftRegister();\r
+#endif\r
+}\r
+\r
+\r
+\r
+static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,\r
+               int num_fields,\r
+               const int *num_bits,\r
+               const u32 *value,\r
+               enum tap_state end_state)\r
+{\r
+       enum tap_state pause_state = TAP_DRSHIFT;\r
+\r
+       jtag_tap_t *tap, *nextTap;\r
+       for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)\r
+       {\r
+               nextTap=jtag_tap_next_enabled(tap);\r
+               if (nextTap==NULL)\r
+               {\r
+                       pause_state = end_state;\r
+               }\r
+               if (tap == target_tap)\r
+               {\r
+                       int j;\r
+                       for (j=0; j<(num_fields-1); j++)\r
+                       {\r
+                               shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[j], value[j]);\r
+                       }\r
+                       shiftValueInner(TAP_DRSHIFT, pause_state, num_bits[j], value[j]);\r
+               } else\r
+               {\r
+                       /* program the scan field to 1 bit length, and ignore it's value */\r
+                       shiftValueInner(TAP_DRSHIFT, pause_state, 1, 0);\r
+               }\r
+       }\r
+}\r
+\r
+static __inline__ void interface_jtag_add_dr_out(jtag_tap_t *target_tap,\r
+               int num_fields,\r
+               const int *num_bits,\r
+               const u32 *value,\r
+               enum tap_state end_state)\r
+{\r
+\r
+       int singletap=(jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL);\r
+       if ((singletap)&&(num_fields==3))\r
+       {\r
+               /* used by embeddedice_write_reg_inner() */\r
+               shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[0], value[0]);\r
+               shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[1], value[1]);\r
+               shiftValueInner(TAP_DRSHIFT, end_state, num_bits[2], value[2]);\r
+       } else if ((singletap)&&(num_fields==2))\r
+       {\r
+               /* used by arm7 code */\r
+               shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[0], value[0]);\r
+               shiftValueInner(TAP_DRSHIFT, end_state, num_bits[1], value[1]);\r
+       } else\r
+       {\r
+               interface_jtag_add_dr_out_core(target_tap, num_fields, num_bits, value, end_state);\r
+       }\r
+}\r
+\r
+#define interface_jtag_add_callback(callback, in) callback(in)\r
+\r
+#define interface_jtag_add_callback4(callback, in, data1, data2, data3) jtag_set_error(callback(in, data1, data2, data3))\r
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
new file mode 100644 (file)
index 0000000..ad148f1
--- /dev/null
@@ -0,0 +1,809 @@
+/***************************************************************************
+ *   Copyright (C) 2007-2008 by Ã˜yvind Harboe                              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "embeddedice.h"
+#include "minidriver.h"
+#include "interface.h"
+
+#include <cyg/hal/hal_io.h>             // low level i/o
+#include <cyg/hal/hal_diag.h>
+
+
+#define ZYLIN_VERSION "1.52"
+#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
+const char *zylin_config_dir="/config/settings";
+
+/* low level command set
+ */
+int zy1000_read(void);
+static void zy1000_write(int tck, int tms, int tdi);
+void zy1000_reset(int trst, int srst);
+
+
+int zy1000_speed(int speed);
+int zy1000_register_commands(struct command_context_s *cmd_ctx);
+int zy1000_init(void);
+int zy1000_quit(void);
+
+/* interface commands */
+int zy1000_handle_zy1000_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+
+static int zy1000_khz(int khz, int *jtag_speed)
+{
+       if (khz==0)
+       {
+               *jtag_speed=0;
+       }
+       else
+       {
+               *jtag_speed=64000/khz;
+       }
+       return ERROR_OK;
+}
+
+static int zy1000_speed_div(int speed, int *khz)
+{
+       if (speed==0)
+       {
+               *khz = 0;
+       }
+       else
+       {
+               *khz=64000/speed;
+       }
+
+       return ERROR_OK;
+}
+
+static bool readPowerDropout(void)
+{
+       cyg_uint32 state;
+       // sample and clear power dropout
+       HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x80);
+       HAL_READ_UINT32(ZY1000_JTAG_BASE+0x10, state);
+       bool powerDropout;
+       powerDropout = (state & 0x80) != 0;
+       return powerDropout;
+}
+
+
+static bool readSRST(void)
+{
+       cyg_uint32 state;
+       // sample and clear SRST sensing
+       HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x00000040);
+       HAL_READ_UINT32(ZY1000_JTAG_BASE+0x10, state);
+       bool srstAsserted;
+       srstAsserted = (state & 0x40) != 0;
+       return srstAsserted;
+}
+
+static int zy1000_srst_asserted(int *srst_asserted)
+{
+       *srst_asserted=readSRST();
+       return ERROR_OK;
+}
+
+static int zy1000_power_dropout(int *dropout)
+{
+       *dropout=readPowerDropout();
+       return ERROR_OK;
+}
+
+
+jtag_interface_t zy1000_interface =
+{
+       .name = "ZY1000",
+       .execute_queue = NULL,
+       .speed = zy1000_speed,
+       .register_commands = zy1000_register_commands,
+       .init = zy1000_init,
+       .quit = zy1000_quit,
+       .khz = zy1000_khz,
+       .speed_div = zy1000_speed_div,
+       .power_dropout = zy1000_power_dropout,
+       .srst_asserted = zy1000_srst_asserted,
+};
+
+static void zy1000_write(int tck, int tms, int tdi)
+{
+
+}
+
+int zy1000_read(void)
+{
+       return -1;
+}
+
+extern bool readSRST(void);
+
+void zy1000_reset(int trst, int srst)
+{
+       LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
+       if(!srst)
+       {
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000001);
+       }
+       else
+       {
+               /* Danger!!! if clk!=0 when in
+                * idle in TAP_IDLE, reset halt on str912 will fail.
+                */
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000001);
+       }
+
+       if(!trst)
+       {
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000002);
+       }
+       else
+       {
+               /* assert reset */
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000002);
+       }
+
+       if (trst||(srst&&(jtag_reset_config & RESET_SRST_PULLS_TRST)))
+       {
+               waitIdle();
+               /* we're now in the RESET state until trst is deasserted */
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_RESET);
+       } else
+       {
+               /* We'll get RCLK failure when we assert TRST, so clear any false positives here */
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400);
+       }
+
+       /* wait for srst to float back up */
+       if (!srst)
+       {
+               int i;
+               for (i=0; i<1000; i++)
+               {
+                       // We don't want to sense our own reset, so we clear here.
+                       // There is of course a timing hole where we could loose
+                       // a "real" reset.
+                       if (!readSRST())
+                               break;
+
+                       /* wait 1ms */
+                       alive_sleep(1);
+               }
+
+               if (i==1000)
+               {
+                       LOG_USER("SRST didn't deassert after %dms", i);
+               } else if (i>1)
+               {
+                       LOG_USER("SRST took %dms to deassert", i);
+               }
+       }
+}
+
+int zy1000_speed(int speed)
+{
+       if(speed == 0)
+       {
+               /*0 means RCLK*/
+               speed = 0;
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x100);
+               LOG_DEBUG("jtag_speed using RCLK");
+       }
+       else
+       {
+               if(speed > 8190 || speed < 2)
+               {
+                       LOG_USER("valid ZY1000 jtag_speed=[8190,2]. Divisor is 64MHz / even values between 8190-2, i.e. min 7814Hz, max 32MHz");
+                       return ERROR_INVALID_ARGUMENTS;
+               }
+
+               LOG_USER("jtag_speed %d => JTAG clk=%f", speed, 64.0/(float)speed);
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x100);
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x1c, speed&~1);
+       }
+       return ERROR_OK;
+}
+
+static bool savePower;
+
+
+static void setPower(bool power)
+{
+       savePower = power;
+       if (power)
+       {
+               HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x14, 0x8);
+       } else
+       {
+               HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x8);
+       }
+}
+
+int handle_power_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+       if (argc > 1)
+       {
+               return ERROR_INVALID_ARGUMENTS;
+       }
+
+       if (argc == 1)
+       {
+               if (strcmp(args[0], "on") == 0)
+               {
+                       setPower(1);
+               }
+               else if (strcmp(args[0], "off") == 0)
+               {
+                       setPower(0);
+               } else
+               {
+                       command_print(cmd_ctx, "arg is \"on\" or \"off\"");
+                       return ERROR_INVALID_ARGUMENTS;
+               }
+       }
+
+       command_print(cmd_ctx, "Target power %s", savePower ? "on" : "off");
+
+       return ERROR_OK;
+}
+
+
+/* Give TELNET a way to find out what version this is */
+static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+       if ((argc < 1) || (argc > 2))
+               return JIM_ERR;
+       char buff[128];
+       const char *version_str=NULL;
+
+       if (argc == 1)
+       {
+               version_str=ZYLIN_OPENOCD_VERSION;
+       } else
+       {
+               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;
+               }
+               else if (strcmp("zy1000", str) == 0)
+               {
+                       version_str=ZYLIN_VERSION;
+               }
+               else if (strcmp("date", str) == 0)
+               {
+                       version_str=ZYLIN_DATE;
+               }
+               else
+               {
+                       return JIM_ERR;
+               }
+       }
+
+       Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
+
+       return JIM_OK;
+}
+
+
+static int
+zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
+                                                                  int argc,
+               Jim_Obj * const *argv)
+{
+       if (argc != 1)
+       {
+               Jim_WrongNumArgs(interp, 1, argv, "powerstatus");
+               return JIM_ERR;
+       }
+
+       cyg_uint32 status;
+       ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, status);
+
+       Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80)!=0));
+
+       return JIM_OK;
+}
+
+int zy1000_register_commands(struct command_context_s *cmd_ctx)
+{
+       register_command(cmd_ctx, NULL, "power", handle_power_command, COMMAND_ANY,
+                       "power <on/off> - turn power switch to target on/off. No arguments - print status.");
+
+       Jim_CreateCommand(interp, "zy1000_version", jim_zy1000_version, NULL, NULL);
+
+
+       Jim_CreateCommand(interp, "powerstatus", zylinjtag_Jim_Command_powerstatus, NULL, NULL);
+
+       return ERROR_OK;
+}
+
+
+
+
+int zy1000_init(void)
+{
+       LOG_USER("%s", ZYLIN_OPENOCD_VERSION);
+
+       ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x30); // Turn on LED1 & LED2
+
+       setPower(true); // on by default
+
+
+        /* deassert resets. Important to avoid infinite loop waiting for SRST to deassert */
+       zy1000_reset(0, 0);
+       zy1000_speed(jtag_speed);
+
+       return ERROR_OK;
+}
+
+int zy1000_quit(void)
+{
+
+       return ERROR_OK;
+}
+
+
+
+int interface_jtag_execute_queue(void)
+{
+       cyg_uint32 empty;
+
+       waitIdle();
+       ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty);
+       /* clear JTAG error register */
+       ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400);
+
+       if ((empty&0x400)!=0)
+       {
+               LOG_WARNING("RCLK timeout");
+               /* the error is informative only as we don't want to break the firmware if there
+                * is a false positive.
+                */
+//             return ERROR_FAIL;
+       }
+       return ERROR_OK;
+}
+
+
+
+
+
+static cyg_uint32 getShiftValue(void)
+{
+       cyg_uint32 value;
+       waitIdle();
+       ZY1000_PEEK(ZY1000_JTAG_BASE+0xc, value);
+       VERBOSE(LOG_INFO("getShiftValue %08x", value));
+       return value;
+}
+#if 0
+static cyg_uint32 getShiftValueFlip(void)
+{
+       cyg_uint32 value;
+       waitIdle();
+       ZY1000_PEEK(ZY1000_JTAG_BASE+0x18, value);
+       VERBOSE(LOG_INFO("getShiftValue %08x (flipped)", value));
+       return value;
+}
+#endif
+
+#if 0
+static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endState, int repeat, cyg_uint32 value)
+{
+       VERBOSE(LOG_INFO("shiftValueInner %s %s %d %08x (flipped)", tap_state_name(state), tap_state_name(endState), repeat, value));
+       cyg_uint32 a,b;
+       a=state;
+       b=endState;
+       ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value);
+       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1<<15)|(repeat<<8)|(a<<4)|b);
+       VERBOSE(getShiftValueFlip());
+}
+#endif
+
+extern int jtag_check_value(u8 *captured, void *priv);
+
+static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_t shiftState, tap_state_t end_state)
+{
+       int i;
+       int j;
+       int k;
+
+       for (i = 0; i < num_fields; i++)
+       {
+               cyg_uint32 value;
+
+               static u8 *in_buff=NULL; /* pointer to buffer for scanned data */
+               static int in_buff_size=0;
+               u8 *inBuffer=NULL;
+
+
+               // figure out where to store the input data
+               int num_bits=fields[i].num_bits;
+               if (fields[i].in_value!=NULL)
+               {
+                       inBuffer=fields[i].in_value;
+               }
+
+               // here we shuffle N bits out/in
+               j=0;
+               while (j<num_bits)
+               {
+                       tap_state_t pause_state;
+                       int l;
+                       k=num_bits-j;
+                       pause_state=(shiftState==TAP_DRSHIFT)?TAP_DRSHIFT:TAP_IRSHIFT;
+                       if (k>32)
+                       {
+                               k=32;
+                               /* we have more to shift out */
+                       } else if (i == num_fields-1)
+                       {
+                               /* this was the last to shift out this time */
+                               pause_state=end_state;
+                       }
+
+                       // we have (num_bits+7)/8 bytes of bits to toggle out.
+                       // bits are pushed out LSB to MSB
+                       value=0;
+                       if (fields[i].out_value!=NULL)
+                       {
+                               for (l=0; l<k; l+=8)
+                               {
+                                       value|=fields[i].out_value[(j+l)/8]<<l;
+                               }
+                       }
+                       /* mask away unused bits for easier debugging */
+                       value&=~(((u32)0xffffffff)<<k);
+
+                       shiftValueInner(shiftState, pause_state, k, value);
+
+                       if (inBuffer!=NULL)
+                       {
+                               // data in, LSB to MSB
+                               value=getShiftValue();
+                               // we're shifting in data to MSB, shift data to be aligned for returning the value
+                               value >>= 32-k;
+
+                               for (l=0; l<k; l+=8)
+                               {
+                                       inBuffer[(j+l)/8]=(value>>l)&0xff;
+                               }
+                       }
+                       j+=k;
+               }
+       }
+}
+
+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)
+{
+
+       int j;
+       int scan_size = 0;
+       jtag_tap_t *tap, *nextTap;
+       for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
+       {
+               nextTap=jtag_tap_next_enabled(tap);
+               tap_state_t end_state;
+               if (nextTap==NULL)
+               {
+                       end_state = state;
+               } else
+               {
+                       end_state = TAP_IRSHIFT;
+               }
+
+               int found = 0;
+
+               scan_size = tap->ir_length;
+
+               /* search the list */
+               for (j=0; j < num_fields; j++)
+               {
+                       if (tap == fields[j].tap)
+                       {
+                               found = 1;
+
+                               scanFields(1, fields+j, TAP_IRSHIFT, end_state);
+                               /* update device information */
+                               buf_cpy(fields[j].out_value, tap->cur_instr, scan_size);
+
+                               tap->bypass = 0;
+                               break;
+                       }
+               }
+
+               if (!found)
+               {
+                       /* if a device isn't listed, set it to BYPASS */
+                       u8 ones[]={0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
+
+                       scan_field_t tmp;
+                       memset(&tmp, 0, sizeof(tmp));
+                       tmp.out_value = ones;
+                       tmp.num_bits = scan_size;
+                       scanFields(1, &tmp, TAP_IRSHIFT, end_state);
+                       /* update device information */
+                       buf_cpy(tmp.out_value, tap->cur_instr, scan_size);
+                       tap->bypass = 1;
+               }
+       }
+
+       return ERROR_OK;
+}
+
+
+
+
+
+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, state);
+
+       return ERROR_OK;
+}
+
+/*extern jtag_command_t **jtag_get_last_command_p(void);*/
+
+int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
+{
+
+       int j;
+       jtag_tap_t *tap, *nextTap;
+       for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
+       {
+               nextTap=jtag_tap_next_enabled(tap);
+               int found=0;
+               tap_state_t end_state;
+               if (nextTap==NULL)
+               {
+                       end_state = state;
+               } else
+               {
+                       end_state = TAP_DRSHIFT;
+               }
+
+               for (j=0; j < num_fields; j++)
+               {
+                       if (tap == fields[j].tap)
+                       {
+                               found = 1;
+
+                               scanFields(1, fields+j, TAP_DRSHIFT, end_state);
+                       }
+               }
+               if (!found)
+               {
+                       scan_field_t tmp;
+                       /* program the scan field to 1 bit length, and ignore it's value */
+                       tmp.num_bits = 1;
+                       tmp.out_value = NULL;
+                       tmp.in_value = NULL;
+
+                       scanFields(1, &tmp, TAP_DRSHIFT, end_state);
+               }
+               else
+               {
+               }
+       }
+       return ERROR_OK;
+}
+
+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, state);
+       return ERROR_OK;
+}
+
+
+int interface_jtag_add_tlr()
+{
+       setCurrentState(TAP_RESET);
+       return ERROR_OK;
+}
+
+
+
+
+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);
+       return ERROR_OK;
+}
+
+static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t clockstate)
+{
+       /* num_cycles can be 0 */
+       setCurrentState(clockstate);
+
+       /* execute num_cycles, 32 at the time. */
+       int i;
+       for (i=0; i<num_cycles; i+=32)
+       {
+               int num;
+               num=32;
+               if (num_cycles-i<num)
+               {
+                       num=num_cycles-i;
+               }
+               shiftValueInner(clockstate, clockstate, num, 0);
+       }
+
+#if !TEST_MANUAL()
+       /* finish in end_state */
+       setCurrentState(state);
+#else
+       tap_state_t t=TAP_IDLE;
+       /* test manual drive code on any target */
+       int tms;
+       u8 tms_scan = tap_get_tms_path(t, state);
+       int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
+
+       for (i = 0; i < tms_count; i++)
+       {
+               tms = (tms_scan >> i) & 1;
+               waitIdle();
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x28,  tms);
+       }
+       waitIdle();
+       ZY1000_POKE(ZY1000_JTAG_BASE+0x20, state);
+#endif
+
+
+       return ERROR_OK;
+}
+
+int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
+{
+       return zy1000_jtag_add_clocks(num_cycles, state, TAP_IDLE);
+}
+
+int interface_jtag_add_clocks(int num_cycles)
+{
+       return zy1000_jtag_add_clocks(num_cycles, cmd_queue_cur_state, cmd_queue_cur_state);
+}
+
+int interface_jtag_add_sleep(u32 us)
+{
+       jtag_sleep(us);
+       return ERROR_OK;
+}
+
+int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
+{
+       int state_count;
+       int tms = 0;
+
+       /*wait for the fifo to be empty*/
+       waitIdle();
+
+       state_count = 0;
+
+       tap_state_t cur_state=cmd_queue_cur_state;
+
+       while (num_states)
+       {
+               if (tap_state_transition(cur_state, false) == path[state_count])
+               {
+                       tms = 0;
+               }
+               else if (tap_state_transition(cur_state, true) == path[state_count])
+               {
+                       tms = 1;
+               }
+               else
+               {
+                       LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_name(cur_state), tap_state_name(path[state_count]));
+                       exit(-1);
+               }
+
+               waitIdle();
+               ZY1000_POKE(ZY1000_JTAG_BASE+0x28,  tms);
+
+               cur_state = path[state_count];
+               state_count++;
+               num_states--;
+       }
+
+       waitIdle();
+       ZY1000_POKE(ZY1000_JTAG_BASE+0x20,  cur_state);
+       return ERROR_OK;
+}
+
+
+
+void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count)
+{
+//     static int const reg_addr=0x5;
+       tap_state_t end_state=jtag_get_end_state();
+       if (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL)
+       {
+               /* better performance via code duplication */
+               if (little)
+               {
+                       int i;
+                       for (i = 0; i < count; i++)
+                       {
+                               shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 1));
+                               shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1<<5));
+                               buffer+=4;
+                       }
+               } else
+               {
+                       int i;
+                       for (i = 0; i < count; i++)
+                       {
+                               shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 0));
+                               shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1<<5));
+                               buffer+=4;
+                       }
+               }
+       }
+       else
+       {
+               int i;
+               for (i = 0; i < count; i++)
+               {
+                       embeddedice_write_reg_inner(tap, reg_addr, fast_target_buffer_get_u32(buffer, little));
+                       buffer += 4;
+               }
+       }
+}
+
+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;
+}
+
+