X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fzy1000.c;h=73a40f2ed8c5910b1ec3efd0f11cb1d6e7230100;hb=a5467296097cc0a820da3aad65dcd9de196fc1be;hp=5583032361c03c02c5f6dfd2b04d2e1234f290e2;hpb=279affdb982be60dd80517e5c07651726ac46b2c;p=openocd.git diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c index 5583032361..73a40f2ed8 100644 --- a/src/jtag/zy1000.c +++ b/src/jtag/zy1000.c @@ -20,39 +20,38 @@ #include "config.h" #endif - -#include "log.h" -#include "jtag.h" +#define INCLUDE_JTAG_INTERFACE_H +#include "embeddedice.h" +#include "minidriver.h" #include "bitbang.h" -#include "../target/embeddedice.h" - #include // low level i/o -#include // common registers -#include // platform registers #include -#include - -extern int jtag_error; +#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 eCosBoard_read(void); -static void eCosBoard_write(int tck, int tms, int tdi); -void eCosBoard_reset(int trst, int srst); +int zy1000_read(void); +static void zy1000_write(int tck, int tms, int tdi); +void zy1000_reset(int trst, int srst); -int eCosBoard_speed(int speed); -int eCosBoard_register_commands(struct command_context_s *cmd_ctx); -int eCosBoard_init(void); -int eCosBoard_quit(void); +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 eCosBoard_handle_eCosBoard_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int zy1000_handle_zy1000_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int eCosBoard_khz(int khz, int *jtag_speed) +static int zy1000_khz(int khz, int *jtag_speed) { if (khz==0) { @@ -65,7 +64,7 @@ static int eCosBoard_khz(int khz, int *jtag_speed) return ERROR_OK; } -static int eCosBoard_speed_div(int speed, int *khz) +static int zy1000_speed_div(int speed, int *khz) { if (speed==0) { @@ -79,74 +78,111 @@ static int eCosBoard_speed_div(int speed, int *khz) 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 eCosBoard_interface = +jtag_interface_t zy1000_interface = { .name = "ZY1000", .execute_queue = bitbang_execute_queue, - .speed = eCosBoard_speed, - .register_commands = eCosBoard_register_commands, - .init = eCosBoard_init, - .quit = eCosBoard_quit, - .khz = eCosBoard_khz, - .speed_div = eCosBoard_speed_div, + .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, }; -bitbang_interface_t eCosBoard_bitbang = +bitbang_interface_t zy1000_bitbang = { - .read = eCosBoard_read, - .write = eCosBoard_write, - .reset = eCosBoard_reset + .read = zy1000_read, + .write = zy1000_write, + .reset = zy1000_reset }; -static void eCosBoard_write(int tck, int tms, int tdi) +static void zy1000_write(int tck, int tms, int tdi) { } -int eCosBoard_read(void) +int zy1000_read(void) { return -1; } -extern bool readSRST(); +extern bool readSRST(void); -void eCosBoard_reset(int trst, int srst) +void zy1000_reset(int trst, int srst) { LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst); if(!srst) { - ZY1000_POKE(0x08000014, 0x00000001); + ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000001); } else { /* Danger!!! if clk!=0 when in - * idle in TAP_RTI, reset halt on str912 will fail. + * idle in TAP_IDLE, reset halt on str912 will fail. */ - ZY1000_POKE(0x08000010, 0x00000001); + ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000001); } if(!trst) { - ZY1000_POKE(0x08000014, 0x00000002); + ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000002); } else { /* assert reset */ - ZY1000_POKE(0x08000010, 0x00000002); + ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000002); } - + if (trst||(srst&&(jtag_reset_config & RESET_SRST_PULLS_TRST))) { waitIdle(); - /* we're now in the TLR state until trst is deasserted */ - ZY1000_POKE(0x08000020, TAP_TLR); + /* 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(0x08000014, 0x400); + ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400); } /* wait for srst to float back up */ @@ -175,112 +211,173 @@ void eCosBoard_reset(int trst, int srst) } } -int eCosBoard_speed(int speed) +int zy1000_speed(int speed) { if(speed == 0) { /*0 means RCLK*/ speed = 0; - ZY1000_POKE(0x08000010, 0x100); + ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x100); LOG_DEBUG("jtag_speed using RCLK"); } else { if(speed > 8190 || speed < 2) { - LOG_ERROR("valid ZY1000 jtag_speed=[8190,2]. Divisor is 64MHz / even values between 8190-2, i.e. min 7814Hz, max 32MHz"); + 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(0x08000014, 0x100); - ZY1000_POKE(0x0800001c, speed&~1); + ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x100); + ZY1000_POKE(ZY1000_JTAG_BASE+0x1c, speed&~1); } return ERROR_OK; } -int eCosBoard_register_commands(struct command_context_s *cmd_ctx) +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; } -int eCosBoard_init(void) +/* 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) { - ZY1000_POKE(0x08000010, 0x30); // Turn on LED1 & LED2 + if ((argc < 1) || (argc > 2)) + return JIM_ERR; + char buff[128]; + const char *version_str=NULL; - /* deassert resets. Important to avoid infinite loop waiting for SRST to deassert */ - eCosBoard_reset(0, 0); - eCosBoard_speed(jtag_speed); + 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; + } + } - bitbang_interface = &eCosBoard_bitbang; + Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1)); - return ERROR_OK; + 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 eCosBoard_quit(void) +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; } -/* loads a file and returns a pointer to it in memory. The file contains - * a 0 byte(sentinel) after len bytes - the length of the file. */ -int loadFile(const char *fileName, void **data, int *len) + +int zy1000_init(void) { - FILE * pFile; - pFile = fopen (fileName,"rb"); - if (pFile==NULL) - { - LOG_ERROR("Can't open %s\n", fileName); - return ERROR_JTAG_DEVICE_ERROR; - } - if (fseek (pFile, 0, SEEK_END)!=0) - { - LOG_ERROR("Can't open %s\n", fileName); - fclose(pFile); - return ERROR_JTAG_DEVICE_ERROR; - } - *len=ftell (pFile); - if (*len==-1) - { - LOG_ERROR("Can't open %s\n", fileName); - fclose(pFile); - return ERROR_JTAG_DEVICE_ERROR; - } + LOG_USER("%s", ZYLIN_OPENOCD_VERSION); - if (fseek (pFile, 0, SEEK_SET)!=0) - { - LOG_ERROR("Can't open %s\n", fileName); - fclose(pFile); - return ERROR_JTAG_DEVICE_ERROR; - } - *data=malloc(*len+1); - if (*data==NULL) - { - LOG_ERROR("Can't open %s\n", fileName); - fclose(pFile); - return ERROR_JTAG_DEVICE_ERROR; - } + ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x30); // Turn on LED1 & LED2 - if (fread(*data, 1, *len, pFile)!=*len) - { - fclose(pFile); - free(*data); - LOG_ERROR("Can't open %s\n", fileName); - return ERROR_JTAG_DEVICE_ERROR; - } - fclose (pFile); - *(((char *)(*data))+*len)=0; /* sentinel */ + setPower(true); // on by default - return ERROR_OK; + /* deassert resets. Important to avoid infinite loop waiting for SRST to deassert */ + zy1000_reset(0, 0); + zy1000_speed(jtag_speed); + bitbang_interface = &zy1000_bitbang; + return ERROR_OK; } +int zy1000_quit(void) +{ + + return ERROR_OK; +} @@ -289,9 +386,9 @@ int interface_jtag_execute_queue(void) cyg_uint32 empty; waitIdle(); - ZY1000_PEEK(0x08000010, empty); + ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty); /* clear JTAG error register */ - ZY1000_POKE(0x08000014, 0x400); + ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400); if ((empty&0x400)!=0) { @@ -308,46 +405,46 @@ int interface_jtag_execute_queue(void) -static cyg_uint32 getShiftValue() +static cyg_uint32 getShiftValue(void) { cyg_uint32 value; waitIdle(); - ZY1000_PEEK(0x0800000c, value); + ZY1000_PEEK(ZY1000_JTAG_BASE+0xc, value); VERBOSE(LOG_INFO("getShiftValue %08x", value)); return value; } #if 0 -static cyg_uint32 getShiftValueFlip() +static cyg_uint32 getShiftValueFlip(void) { cyg_uint32 value; waitIdle(); - ZY1000_PEEK(0x08000018, value); + ZY1000_PEEK(ZY1000_JTAG_BASE+0x18, value); VERBOSE(LOG_INFO("getShiftValue %08x (flipped)", value)); return value; } #endif #if 0 -static void shiftValueInnerFlip(const enum tap_state state, const enum tap_state endState, int repeat, cyg_uint32 value) +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_strings[state], tap_state_strings[endState], repeat, 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(0x0800000c, value); - ZY1000_POKE(0x08000008, (1<<15)|(repeat<<8)|(a<<4)|b); + 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 void gotoEndState() +static void gotoEndState(void) { setCurrentState(cmd_queue_end_state); } -static __inline void scanFields(int num_fields, scan_field_t *fields, enum tap_state shiftState, int pause) +static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_t shiftState, tap_state_t end_state) { int i; int j; @@ -367,42 +464,24 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, enum tap_s if (fields[i].in_value!=NULL) { inBuffer=fields[i].in_value; - } else if (fields[i].in_handler!=NULL) - { - if (in_buff_size*832) { k=32; /* we have more to shift out */ - } else if (pause&&(i == num_fields-1)) + } else if (i == num_fields-1) { /* this was the last to shift out this time */ - pause_state=(shiftState==TAP_SD)?TAP_PD:TAP_PI; + pause_state=end_state; } // we have (num_bits+7)/8 bytes of bits to toggle out. @@ -434,61 +513,49 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, enum tap_s } j+=k; } - - if (fields[i].in_handler!=NULL) - { - // invoke callback - int r=fields[i].in_handler(inBuffer, fields[i].in_handler_priv, fields+i); - if (r!=ERROR_OK) - { - /* this will cause jtag_execute_queue() to return an error */ - jtag_error=r; - } - } } } -int interface_jtag_add_end_state(enum tap_state state) +int interface_jtag_add_end_state(tap_state_t state) { return ERROR_OK; } -int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_state state) +int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state) { - int i, j; + int j; int scan_size = 0; - jtag_device_t *device; - - for (i=0; i < jtag_num_devices; i++) + jtag_tap_t *tap, *nextTap; + for(tap = jtag_NextEnabledTap(NULL); tap!= NULL; tap=nextTap) { - int pause=i==(jtag_num_devices-1); + nextTap=jtag_NextEnabledTap(tap); + tap_state_t end_state; + if (nextTap==NULL) + { + end_state = cmd_queue_end_state; + } else + { + end_state = TAP_IRSHIFT; + } + int found = 0; - device = jtag_get_device(i); - scan_size = device->ir_length; + + scan_size = tap->ir_length; /* search the list */ for (j=0; j < num_fields; j++) { - if (i == fields[j].device) + if (tap == fields[j].tap) { found = 1; - if ((jtag_verify_capture_ir)&&(fields[j].in_handler==NULL)) - { - jtag_set_check_value(fields+j, device->expected, device->expected_mask, NULL); - } else if (jtag_verify_capture_ir) - { - fields[j].in_check_value = device->expected; - fields[j].in_check_mask = device->expected_mask; - } - - scanFields(1, fields+j, TAP_SI, pause); + scanFields(1, fields+j, TAP_IRSHIFT, end_state); /* update device information */ - buf_cpy(fields[j].out_value, jtag_get_device(i)->cur_instr, scan_size); + buf_cpy(fields[j].out_value, tap->cur_instr, scan_size); - device->bypass = 0; + tap->bypass = 0; break; } } @@ -502,13 +569,12 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_st memset(&tmp, 0, sizeof(tmp)); tmp.out_value = ones; tmp.num_bits = scan_size; - scanFields(1, &tmp, TAP_SI, pause); + scanFields(1, &tmp, TAP_IRSHIFT, end_state); /* update device information */ - buf_cpy(tmp.out_value, jtag_get_device(i)->cur_instr, scan_size); - device->bypass = 1; + buf_cpy(tmp.out_value, tap->cur_instr, scan_size); + tap->bypass = 1; } } - gotoEndState(); return ERROR_OK; } @@ -517,83 +583,69 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_st -int interface_jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, enum tap_state state) +int interface_jtag_add_plain_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state) { - scanFields(num_fields, fields, TAP_SI, 1); - gotoEndState(); + scanFields(num_fields, fields, TAP_IRSHIFT, cmd_queue_end_state); return ERROR_OK; } /*extern jtag_command_t **jtag_get_last_command_p(void);*/ -int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, enum tap_state state) +int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state) { - int i, j; - for (i=0; i < jtag_num_devices; i++) + + int j; + jtag_tap_t *tap, *nextTap; + for(tap = jtag_NextEnabledTap(NULL); tap!= NULL; tap=nextTap) { - int found = 0; - int pause = (i==(jtag_num_devices-1)); + nextTap=jtag_NextEnabledTap(tap); + int found=0; + tap_state_t end_state; + if (nextTap==NULL) + { + end_state = cmd_queue_end_state; + } else + { + end_state = TAP_DRSHIFT; + } for (j=0; j < num_fields; j++) { - if (i == fields[j].device) + if (tap == fields[j].tap) { found = 1; - scanFields(1, fields+j, TAP_SD, pause); + scanFields(1, fields+j, TAP_DRSHIFT, end_state); } } if (!found) { -#ifdef _DEBUG_JTAG_IO_ - /* if a device isn't listed, the BYPASS register should be selected */ - if (!jtag_get_device(i)->bypass) - { - LOG_ERROR("BUG: no scan data for a device not in BYPASS"); - exit(-1); - } -#endif - 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.out_mask = NULL; tmp.in_value = NULL; - tmp.in_check_value = NULL; - tmp.in_check_mask = NULL; - tmp.in_handler = NULL; - tmp.in_handler_priv = NULL; - scanFields(1, &tmp, TAP_SD, pause); + scanFields(1, &tmp, TAP_DRSHIFT, end_state); } else { -#ifdef _DEBUG_JTAG_IO_ - /* if a device is listed, the BYPASS register must not be selected */ - if (jtag_get_device(i)->bypass) - { - LOG_WARNING("scan data for a device in BYPASS"); - } -#endif } } - gotoEndState(); return ERROR_OK; } -int interface_jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, enum tap_state state) +int interface_jtag_add_plain_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state) { - scanFields(num_fields, fields, TAP_SD, 1); - gotoEndState(); + scanFields(num_fields, fields, TAP_DRSHIFT, cmd_queue_end_state); return ERROR_OK; } int interface_jtag_add_tlr() { - setCurrentState(TAP_TLR); + setCurrentState(TAP_RESET); return ERROR_OK; } @@ -605,14 +657,14 @@ extern int jtag_ntrst_delay; int interface_jtag_add_reset(int req_trst, int req_srst) { - eCosBoard_reset(req_trst, req_srst); + zy1000_reset(req_trst, req_srst); return ERROR_OK; } -int interface_jtag_add_runtest(int num_cycles, enum tap_state state) +static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t clockstate) { /* num_cycles can be 0 */ - setCurrentState(TAP_RTI); + setCurrentState(clockstate); /* execute num_cycles, 32 at the time. */ int i; @@ -624,39 +676,50 @@ int interface_jtag_add_runtest(int num_cycles, enum tap_state state) { num=num_cycles-i; } - shiftValueInner(TAP_RTI, TAP_RTI, num, 0); + shiftValueInner(clockstate, clockstate, num, 0); } #if !TEST_MANUAL() /* finish in end_state */ setCurrentState(state); #else - enum tap_state t=TAP_RTI; + tap_state_t t=TAP_IDLE; /* test manual drive code on any target */ int tms; - u8 tms_scan = TAP_MOVE(t, state); - - for (i = 0; i < 7; i++) + 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(0x08000028, tms); + ZY1000_POKE(ZY1000_JTAG_BASE+0x28, tms); } waitIdle(); - ZY1000_POKE(0x08000020, state); + 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_end_state); +} + int interface_jtag_add_sleep(u32 us) { jtag_sleep(us); return ERROR_OK; } -int interface_jtag_add_pathmove(int num_states, enum tap_state *path) +int interface_jtag_add_pathmove(int num_states, const tap_state_t *path) { int state_count; int tms = 0; @@ -666,26 +729,26 @@ int interface_jtag_add_pathmove(int num_states, enum tap_state *path) state_count = 0; - enum tap_state cur_state=cmd_queue_cur_state; + tap_state_t cur_state=cmd_queue_cur_state; while (num_states) { - if (tap_transitions[cur_state].low == path[state_count]) + if (tap_state_transition(cur_state, false) == path[state_count]) { tms = 0; } - else if (tap_transitions[cur_state].high == path[state_count]) + 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_strings[cur_state], tap_state_strings[path[state_count]]); + 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(0x08000028, tms); + ZY1000_POKE(ZY1000_JTAG_BASE+0x28, tms); cur_state = path[state_count]; state_count++; @@ -693,17 +756,17 @@ int interface_jtag_add_pathmove(int num_states, enum tap_state *path) } waitIdle(); - ZY1000_POKE(0x08000020, cur_state); + ZY1000_POKE(ZY1000_JTAG_BASE+0x20, cur_state); return ERROR_OK; } -void embeddedice_write_dcc(int chain_pos, int reg_addr, u8 *buffer, int little, int count) +void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count) { // static int const reg_addr=0x5; - enum tap_state end_state=cmd_queue_end_state; - if (jtag_num_devices==1) + tap_state_t end_state=cmd_queue_end_state; + if (jtag_NextEnabledTap(jtag_NextEnabledTap(NULL))==NULL) { /* better performance via code duplication */ if (little) @@ -711,8 +774,8 @@ void embeddedice_write_dcc(int chain_pos, int reg_addr, u8 *buffer, int little, int i; for (i = 0; i < count; i++) { - shiftValueInner(TAP_SD, TAP_SD, 32, fast_target_buffer_get_u32(buffer, 1)); - shiftValueInner(TAP_SD, end_state, 6, reg_addr|(1<<5)); + 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 @@ -720,8 +783,8 @@ void embeddedice_write_dcc(int chain_pos, int reg_addr, u8 *buffer, int little, int i; for (i = 0; i < count; i++) { - shiftValueInner(TAP_SD, TAP_SD, 32, fast_target_buffer_get_u32(buffer, 0)); - shiftValueInner(TAP_SD, end_state, 6, reg_addr|(1<<5)); + 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; } } @@ -731,9 +794,33 @@ void embeddedice_write_dcc(int chain_pos, int reg_addr, u8 *buffer, int little, int i; for (i = 0; i < count; i++) { - embeddedice_write_reg_inner(chain_pos, reg_addr, fast_target_buffer_get_u32(buffer, little)); + 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; +} + +