X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fzy1000%2Fzy1000.c;h=5ddc7c5ce0768000f7a5a2024bd939310449229a;hb=96d2b61c049773c02a41b220a0104d24c75fd284;hp=f4fee3afb1b275502b62a8b30011896a3e45d0ce;hpb=01823f5e0b0a602e1e99d535dbd0ff5a46cf077b;p=openocd.git diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index f4fee3afb1..5ddc7c5ce0 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Øyvind Harboe * + * Copyright (C) 2007-2009 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 * @@ -16,59 +16,74 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + +/* This file supports the zy1000 debugger: http://www.zylin.com/zy1000.html + * + * The zy1000 is a standalone debugger that has a web interface and + * requires no drivers on the developer host as all communication + * is via TCP/IP. The zy1000 gets it performance(~400-700kBytes/s + * DCC downloads @ 16MHz target) as it has an FPGA to hardware + * accelerate the JTAG commands, while offering *very* low latency + * between OpenOCD and the FPGA registers. + * + * The disadvantage of the zy1000 is that it has a feeble CPU compared to + * a PC(ca. 50-500 DMIPS depending on how one counts it), whereas a PC + * is on the order of 10000 DMIPS(i.e. at a factor of 20-200). + * + * The zy1000 revc hardware is using an Altera Nios CPU, whereas the + * revb is using ARM7 + Xilinx. + * + * See Zylin web pages or contact Zylin for more information. + * + * The reason this code is in OpenOCD rather than OpenOCD linked with the + * ZY1000 code is that OpenOCD is the long road towards getting + * libopenocd into place. libopenocd will support both low performance, + * low latency systems(embedded) and high performance high latency + * systems(PCs). + */ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "embeddedice.h" -#include "minidriver.h" -#include "interface.h" +#include +#include +#include +#include "zy1000_version.h" #include // low level i/o #include +#include -#define ZYLIN_VERSION "1.52" +#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 - -/* low level command set - */ -void zy1000_reset(int trst, int srst); +#define ZYLIN_OPENOCD GIT_OPENOCD_VERSION +#define ZYLIN_OPENOCD_VERSION "ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE -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) + if (khz == 0) { - *jtag_speed=0; + *jtag_speed = 0; } else { - *jtag_speed=64000/khz; + *jtag_speed = 64000/khz; } return ERROR_OK; } static int zy1000_speed_div(int speed, int *khz) { - if (speed==0) + if (speed == 0) { *khz = 0; } else { - *khz=64000/speed; + *khz = 64000/speed; } return ERROR_OK; @@ -78,8 +93,8 @@ 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); + HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x80); + HAL_READ_UINT32(ZY1000_JTAG_BASE + 0x10, state); bool powerDropout; powerDropout = (state & 0x80) != 0; return powerDropout; @@ -90,8 +105,8 @@ 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); + HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x00000040); + HAL_READ_UINT32(ZY1000_JTAG_BASE + 0x10, state); bool srstAsserted; srstAsserted = (state & 0x40) != 0; return srstAsserted; @@ -99,72 +114,57 @@ static bool readSRST(void) static int zy1000_srst_asserted(int *srst_asserted) { - *srst_asserted=readSRST(); + *srst_asserted = readSRST(); return ERROR_OK; } static int zy1000_power_dropout(int *dropout) { - *dropout=readPowerDropout(); + *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, -}; - void zy1000_reset(int trst, int srst) { LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst); - if(!srst) + if (!srst) { - ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000001); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000001); } else { - /* Danger!!! if clk!=0 when in + /* Danger!!! if clk != 0 when in * idle in TAP_IDLE, reset halt on str912 will fail. */ - ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000001); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000001); } - if(!trst) + if (!trst) { - ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000002); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000002); } else { /* assert reset */ - ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000002); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000002); } - if (trst||(srst&&(jtag_get_reset_config() & RESET_SRST_PULLS_TRST))) + if (trst||(srst && (jtag_get_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); + 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); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400); } /* wait for srst to float back up */ if (!srst) { int i; - for (i=0; i<1000; 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 @@ -176,10 +176,10 @@ void zy1000_reset(int trst, int srst) alive_sleep(1); } - if (i==1000) + if (i == 1000) { LOG_USER("SRST didn't deassert after %dms", i); - } else if (i>1) + } else if (i > 1) { LOG_USER("SRST took %dms to deassert", i); } @@ -188,24 +188,24 @@ void zy1000_reset(int trst, int srst) int zy1000_speed(int speed) { - if(speed == 0) + if (speed == 0) { /*0 means RCLK*/ speed = 0; - ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x100); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x100); LOG_DEBUG("jtag_speed using RCLK"); } else { - if(speed > 8190 || speed < 2) + 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); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x100); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x1c, speed&~1); } return ERROR_OK; } @@ -218,38 +218,30 @@ static void setPower(bool power) savePower = power; if (power) { - HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x14, 0x8); + HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x14, 0x8); } else { - HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x8); + HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x8); } } -int handle_power_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_power_command) { - if (argc > 1) + switch (CMD_ARGC) { - return ERROR_INVALID_ARGUMENTS; + case 1: { + bool enable; + COMMAND_PARSE_ON_OFF(CMD_ARGV[0], enable); + setPower(enable); + // fall through } - - 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; - } + case 0: + LOG_INFO("Target power %s", savePower ? "on" : "off"); + break; + default: + return ERROR_INVALID_ARGUMENTS; } - command_print(cmd_ctx, "Target power %s", savePower ? "on" : "off"); - return ERROR_OK; } @@ -257,32 +249,66 @@ int handle_power_command(struct command_context_s *cmd_ctx, char *cmd, char **ar /* 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)) + if ((argc < 1) || (argc > 3)) return JIM_ERR; - char buff[128]; - const char *version_str=NULL; + const char *version_str = NULL; if (argc == 1) { - version_str=ZYLIN_OPENOCD_VERSION; + version_str = ZYLIN_OPENOCD_VERSION; } else { const char *str = Jim_GetString(argv[1], NULL); + const char *str2 = NULL; + if (argc > 2) + str2 = Jim_GetString(argv[2], 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) { - version_str=ZYLIN_VERSION; + version_str = ZYLIN_VERSION; } else if (strcmp("date", str) == 0) { - version_str=ZYLIN_DATE; + version_str = ZYLIN_DATE; + } + else if (strcmp("time", str) == 0) + { + version_str = ZYLIN_TIME; } + else if (strcmp("pcb", str) == 0) + { +#ifdef CYGPKG_HAL_NIOS2 + version_str="c"; +#else + version_str="b"; +#endif + } +#ifdef CYGPKG_HAL_NIOS2 + else if (strcmp("fpga", str) == 0) + { + + /* return a list of 32 bit integers to describe the expected + * and actual FPGA + */ + static char *fpga_id = "0x12345678 0x12345678 0x12345678 0x12345678"; + cyg_uint32 id, timestamp; + HAL_READ_UINT32(SYSID_BASE, id); + HAL_READ_UINT32(SYSID_BASE+4, timestamp); + sprintf(fpga_id, "0x%08x 0x%08x 0x%08x 0x%08x", id, timestamp, SYSID_ID, SYSID_TIMESTAMP); + version_str = fpga_id; + if ((argc>2) && (strcmp("time", str2) == 0)) + { + time_t last_mod = timestamp; + char * t = ctime (&last_mod) ; + t[strlen(t)-1] = 0; + version_str = t; + } + } +#endif + else { return JIM_ERR; @@ -295,6 +321,37 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv } +#ifdef CYGPKG_HAL_NIOS2 +static int jim_zy1000_writefirmware(Jim_Interp *interp, int argc, Jim_Obj *const *argv) +{ + if (argc != 2) + return JIM_ERR; + + int length; + int stat; + const char *str = Jim_GetString(argv[1], &length); + + /* BUG!!!! skip header! */ + void *firmware_address=0x4000000; + int firmware_length=0x100000; + + if (length>firmware_length) + return JIM_ERR; + + void *err_addr; + + if ((stat = flash_erase((void *)firmware_address, firmware_length, (void **)&err_addr)) != 0) + { + return JIM_ERR; + } + + if ((stat = flash_program(firmware_address, str, length, (void **)&err_addr)) != 0) + return JIM_ERR; + + return JIM_OK; +} +#endif + static int zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp, int argc, @@ -307,26 +364,13 @@ zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp, } cyg_uint32 status; - ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, status); + ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, status); - Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80)!=0)); + 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 - 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; -} - @@ -334,7 +378,7 @@ int zy1000_init(void) { LOG_USER("%s", ZYLIN_OPENOCD_VERSION); - ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x30); // Turn on LED1 & LED2 + ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x30); // Turn on LED1 & LED2 setPower(true); // on by default @@ -359,11 +403,11 @@ int interface_jtag_execute_queue(void) cyg_uint32 empty; waitIdle(); - ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty); + ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty); /* clear JTAG error register */ - ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400); - if ((empty&0x400)!=0) + if ((empty&0x400) != 0) { LOG_WARNING("RCLK timeout"); /* the error is informative only as we don't want to break the firmware if there @@ -382,7 +426,7 @@ static cyg_uint32 getShiftValue(void) { cyg_uint32 value; waitIdle(); - ZY1000_PEEK(ZY1000_JTAG_BASE+0xc, value); + ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, value); VERBOSE(LOG_INFO("getShiftValue %08x", value)); return value; } @@ -391,7 +435,7 @@ static cyg_uint32 getShiftValueFlip(void) { cyg_uint32 value; waitIdle(); - ZY1000_PEEK(ZY1000_JTAG_BASE+0x18, value); + ZY1000_PEEK(ZY1000_JTAG_BASE + 0x18, value); VERBOSE(LOG_INFO("getShiftValue %08x (flipped)", value)); return value; } @@ -402,17 +446,20 @@ static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endSt { 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); + 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(uint8_t *captured, void *priv); +static void gotoEndState(tap_state_t end_state) +{ + setCurrentState(end_state); +} -static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_state_t shiftState, tap_state_t end_state) +static __inline void scanFields(int num_fields, const struct scan_field *fields, tap_state_t shiftState, int pause) { int i; int j; @@ -422,102 +469,96 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_ { cyg_uint32 value; - uint8_t *inBuffer=NULL; + uint8_t *inBuffer = NULL; // figure out where to store the input data - int num_bits=fields[i].num_bits; - if (fields[i].in_value!=NULL) + int num_bits = fields[i].num_bits; + if (fields[i].in_value != NULL) { - inBuffer=fields[i].in_value; + inBuffer = fields[i].in_value; } // here we shuffle N bits out/in - j=0; - while (j32) + k = num_bits-j; + pause_state = (shiftState == TAP_DRSHIFT)?TAP_DRSHIFT:TAP_IRSHIFT; + if (k > 32) { - k=32; + k = 32; /* we have more to shift out */ - } else if (i == num_fields-1) + } else if (pause&&(i == num_fields-1)) { /* this was the last to shift out this time */ - pause_state=end_state; + pause_state = (shiftState==TAP_DRSHIFT)?TAP_DRPAUSE:TAP_IRPAUSE; } - // we have (num_bits+7)/8 bytes of bits to toggle out. + // 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) + value = 0; + if (fields[i].out_value != NULL) { - for (l=0; l= 32 is not defined by the C standard + * and will in fact shift by &0x1f bits on nios */ + } shiftValueInner(shiftState, pause_state, k, value); - if (inBuffer!=NULL) + if (inBuffer != NULL) { // data in, LSB to MSB - value=getShiftValue(); + 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>l)&0xff; + inBuffer[(j + l)/8]=(value >> l)&0xff; } } - j+=k; + 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 interface_jtag_add_ir_scan(int num_fields, const struct scan_field *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) + struct jtag_tap *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; - } + nextTap = jtag_tap_next_enabled(tap); + int pause = (nextTap==NULL); int found = 0; scan_size = tap->ir_length; /* search the list */ - for (j=0; j < num_fields; j++) + for (j = 0; j < num_fields; j++) { if (tap == fields[j].tap) { found = 1; - scanFields(1, fields+j, TAP_IRSHIFT, end_state); + scanFields(1, fields + j, TAP_IRSHIFT, pause); /* update device information */ buf_cpy(fields[j].out_value, tap->cur_instr, scan_size); @@ -531,16 +572,17 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s /* if a device isn't listed, set it to BYPASS */ uint8_t ones[]={0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; - scan_field_t tmp; + struct scan_field tmp; memset(&tmp, 0, sizeof(tmp)); tmp.out_value = ones; tmp.num_bits = scan_size; - scanFields(1, &tmp, TAP_IRSHIFT, end_state); + scanFields(1, &tmp, TAP_IRSHIFT, pause); /* update device information */ buf_cpy(tmp.out_value, tap->cur_instr, scan_size); tap->bypass = 1; } } + gotoEndState(state); return ERROR_OK; } @@ -549,62 +591,56 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s -int interface_jtag_add_plain_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state) +int interface_jtag_add_plain_ir_scan(int num_fields, const struct scan_field *fields, tap_state_t state) { - scanFields(num_fields, fields, TAP_IRSHIFT, state); + scanFields(num_fields, fields, TAP_IRSHIFT, 1); + gotoEndState(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 interface_jtag_add_dr_scan(int num_fields, const struct scan_field *fields, tap_state_t state) { int j; - jtag_tap_t *tap, *nextTap; - for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap) + struct jtag_tap *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; - } + nextTap = jtag_tap_next_enabled(tap); + int found = 0; + int pause = (nextTap==NULL); - for (j=0; j < num_fields; j++) + for (j = 0; j < num_fields; j++) { if (tap == fields[j].tap) { found = 1; - scanFields(1, fields+j, TAP_DRSHIFT, end_state); + scanFields(1, fields+j, TAP_DRSHIFT, pause); } } if (!found) { - scan_field_t tmp; + struct scan_field 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); + scanFields(1, &tmp, TAP_DRSHIFT, pause); } else { } } + gotoEndState(state); return ERROR_OK; } -int interface_jtag_add_plain_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state) +int interface_jtag_add_plain_dr_scan(int num_fields, const struct scan_field *fields, tap_state_t state) { - scanFields(num_fields, fields, TAP_DRSHIFT, state); + scanFields(num_fields, fields, TAP_DRSHIFT, 1); + gotoEndState(state); return ERROR_OK; } @@ -618,9 +654,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); @@ -634,13 +667,13 @@ static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t /* execute num_cycles, 32 at the time. */ int i; - for (i=0; i> i) & 1; waitIdle(); - ZY1000_POKE(ZY1000_JTAG_BASE+0x28, tms); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, tms); } waitIdle(); - ZY1000_POKE(ZY1000_JTAG_BASE+0x20, state); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, state); #endif @@ -695,7 +728,7 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path) state_count = 0; - tap_state_t cur_state=cmd_queue_cur_state; + tap_state_t cur_state = cmd_queue_cur_state; while (num_states) { @@ -714,7 +747,7 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path) } waitIdle(); - ZY1000_POKE(ZY1000_JTAG_BASE+0x28, tms); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, tms); cur_state = path[state_count]; state_count++; @@ -722,17 +755,17 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path) } waitIdle(); - ZY1000_POKE(ZY1000_JTAG_BASE+0x20, cur_state); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, cur_state); return ERROR_OK; } -void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int little, int count) +void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *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) +// 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) @@ -741,8 +774,8 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int l 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; + shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr | (1 << 5)); + buffer += 4; } } else { @@ -750,8 +783,8 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int l 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; + shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr | (1 << 5)); + buffer += 4; } } } @@ -767,3 +800,50 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int l } +static const struct command_registration zy1000_commands[] = { + { + .name = "power", + .handler = &handle_power_command, + .mode = COMMAND_ANY, + .help = "turn power switch to target on/off. No arguments - print status.", + .usage = "power ", + }, + { + .name = "zy1000_version", + .mode = COMMAND_ANY, + .jim_handler = &jim_zy1000_version, + .help = "print version info for zy1000", + }, + { + .name = "powerstatus", + .mode = COMMAND_ANY, + .jim_handler = & zylinjtag_Jim_Command_powerstatus, + .help = "print power status of target", + }, +#ifdef CYGPKG_HAL_NIOS2 + { + .name = "updatezy1000firmware", + .mode = COMMAND_ANY, + .jim_handler = &jim_zy1000_writefirmware, + .help = "writes firmware to flash", + }, +#endif + COMMAND_REGISTRATION_DONE +}; + + + +struct jtag_interface zy1000_interface = +{ + .name = "ZY1000", + .execute_queue = NULL, + .speed = zy1000_speed, + .commands = zy1000_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, +}; +