/***************************************************************************
- * Copyright (C) 2007-2008 by Øyvind Harboe *
+ * 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 *
#include "embeddedice.h"
#include "minidriver.h"
#include "interface.h"
+#include "zy1000_version.h"
#include <cyg/hal/hal_io.h> // low level i/o
#include <cyg/hal/hal_diag.h>
-
-#define ZYLIN_VERSION "1.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
+#define ZYLIN_OPENOCD GIT_OPENOCD_VERSION
+#define ZYLIN_OPENOCD_VERSION "ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE
/* low level command set
*/
{
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;
{
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;
LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
if (!srst)
{
- ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000001);
+ 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);
+ ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000001);
}
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)))
{
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
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);
}
{
/*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
}
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;
}
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);
}
}
const char *str = Jim_GetString(argv[1], NULL);
if (strcmp("openocd", str) == 0)
{
- int revision;
- revision = atol(ZYLIN_OPENOCD+strlen("XRevision: "));
- sprintf(buff, "%d", revision);
- version_str = buff;
+ version_str = ZYLIN_OPENOCD;
}
else if (strcmp("zy1000", str) == 0)
{
{
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
+ }
else
{
return JIM_ERR;
}
+#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,
}
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_CreateCommand(interp, "powerstatus", zylinjtag_Jim_Command_powerstatus, NULL, NULL);
+#ifdef CYGPKG_HAL_NIOS2
+ Jim_CreateCommand(interp, "updatezy1000firmware", jim_zy1000_writefirmware, NULL, NULL);
+#endif
+
+
return ERROR_OK;
}
{
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
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)
{
{
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;
}
{
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;
}
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);
+ 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 __inline void scanFields(int num_fields, const scan_field_t *fields, tap_state_t shiftState, tap_state_t end_state)
+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, int pause)
{
int i;
int j;
// here we shuffle N bits out/in
j = 0;
- while (j<num_bits)
+ 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)
+ if (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)
{
- for (l = 0; l<k; l += 8)
+ for (l = 0; l < k; l += 8)
{
- value|=fields[i].out_value[(j+l)/8]<<l;
+ value|=fields[i].out_value[(j + l)/8]<<l;
}
}
/* mask away unused bits for easier debugging */
// 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)
+ for (l = 0; l < k; l += 8)
{
- inBuffer[(j+l)/8]=(value >> l)&0xff;
+ 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)
{
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 pause = (nextTap==NULL);
int found = 0;
{
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);
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;
}
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);
+ scanFields(num_fields, fields, TAP_IRSHIFT, 1);
+ gotoEndState(state);
return ERROR_OK;
}
{
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;
- }
+ int pause = (nextTap==NULL);
for (j = 0; j < num_fields; j++)
{
{
found = 1;
- scanFields(1, fields+j, TAP_DRSHIFT, end_state);
+ scanFields(1, fields+j, TAP_DRSHIFT, pause);
}
}
if (!found)
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)
{
- scanFields(num_fields, fields, TAP_DRSHIFT, state);
+ scanFields(num_fields, fields, TAP_DRSHIFT, 1);
+ gotoEndState(state);
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);
/* execute num_cycles, 32 at the time. */
int i;
- for (i = 0; i<num_cycles; i += 32)
+ for (i = 0; i < num_cycles; i += 32)
{
int num;
num = 32;
- if (num_cycles-i<num)
+ if (num_cycles-i < num)
{
num = num_cycles-i;
}
{
tms = (tms_scan >> 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
}
waitIdle();
- ZY1000_POKE(ZY1000_JTAG_BASE+0x28, tms);
+ ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, tms);
cur_state = path[state_count];
state_count++;
}
waitIdle();
- ZY1000_POKE(ZY1000_JTAG_BASE+0x20, cur_state);
+ ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, cur_state);
return ERROR_OK;
}
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));
+ shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr | (1 << 5));
buffer += 4;
}
} else
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));
+ shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr | (1 << 5));
buffer += 4;
}
}
projects / openocd / blobdiff