#include "config.h"
#endif
+#include <pthread.h>
+
#include <target/embeddedice.h>
#include <jtag/minidriver.h>
#include <jtag/interface.h>
#ifdef CYGPKG_HAL_NIOS2
#include <cyg/hal/io.h>
#include <cyg/firmwareutil/firmwareutil.h>
+#define ZYLIN_KHZ 60000
+#else
+#define ZYLIN_KHZ 64000
#endif
#define ZYLIN_VERSION GIT_ZY1000_VERSION
#define ZYLIN_OPENOCD GIT_OPENOCD_VERSION
#define ZYLIN_OPENOCD_VERSION "ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE
+#else
+/* Assume we're connecting to a revc w/60MHz clock. */
+#define ZYLIN_KHZ 60000
#endif
}
else
{
- *jtag_speed = 64000/khz;
+ int speed;
+ /* Round speed up to nearest divisor.
+ *
+ * E.g. 16000kHz
+ * (64000 + 15999) / 16000 = 4
+ * (4 + 1) / 2 = 2
+ * 2 * 2 = 4
+ *
+ * 64000 / 4 = 16000
+ *
+ * E.g. 15999
+ * (64000 + 15998) / 15999 = 5
+ * (5 + 1) / 2 = 3
+ * 3 * 2 = 6
+ *
+ * 64000 / 6 = 10666
+ *
+ */
+ speed = (ZYLIN_KHZ + (khz -1)) / khz;
+ speed = (speed + 1 ) / 2;
+ speed *= 2;
+ if (speed > 8190)
+ {
+ /* maximum dividend */
+ speed = 8190;
+ }
+ *jtag_speed = speed;
}
return ERROR_OK;
}
}
else
{
- *khz = 64000/speed;
+ *khz = ZYLIN_KHZ / speed;
}
return ERROR_OK;
return ERROR_OK;
}
+/* Wait for SRST to assert or deassert */
+static void waitSRST(bool asserted)
+{
+ bool first = true;
+ long long start = 0;
+ long total = 0;
+ const char *mode = asserted ? "assert" : "deassert";
+
+ for (;;)
+ {
+ bool srstAsserted = readSRST();
+ if ( (asserted && srstAsserted) || (!asserted && !srstAsserted) )
+ {
+ if (total > 1)
+ {
+ LOG_USER("SRST took %dms to %s", (int)total, mode);
+ }
+ break;
+ }
+
+ if (first)
+ {
+ first = false;
+ start = timeval_ms();
+ }
+
+ total = timeval_ms() - start;
+
+ keep_alive();
+
+ if (total > 5000)
+ {
+ LOG_ERROR("SRST took too long to %s: %dms", mode, (int)total);
+ break;
+ }
+ }
+}
+
+
void zy1000_reset(int trst, int srst)
{
LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
* idle in TAP_IDLE, reset halt on str912 will fail.
*/
ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000001);
+
+ waitSRST(true);
}
if (!trst)
if ((!srst && ((jtag_get_reset_config() & RESET_TRST_PULLS_SRST) == 0))||
(!srst && !trst && (jtag_get_reset_config() & RESET_TRST_PULLS_SRST)))
{
- bool first = true;
- long long start = 0;
- long total = 0;
- for (;;)
- {
- // 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())
- {
- if (total > 1)
- {
- LOG_USER("SRST took %dms to deassert", (int)total);
- }
- break;
- }
-
- if (first)
- {
- first = false;
- start = timeval_ms();
- }
-
- total = timeval_ms() - start;
-
- keep_alive();
-
- if (total > 5000)
- {
- LOG_ERROR("SRST took too long to deassert: %dms", (int)total);
- break;
- }
- }
-
+ waitSRST(false);
}
}
{
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");
+ LOG_USER("valid ZY1000 jtag_speed=[8190,2]. With divisor is %dkHz / even values between 8190-2, i.e. min %dHz, max %dMHz",
+ ZYLIN_KHZ, (ZYLIN_KHZ * 1000) / 8190, ZYLIN_KHZ / (2 * 1000));
return ERROR_INVALID_ARGUMENTS;
}
- LOG_USER("jtag_speed %d => JTAG clk=%f", speed, 64.0/(float)speed);
+ int khz;
+ speed &= ~1;
+ zy1000_speed_div(speed, &khz);
+ LOG_USER("jtag_speed %d => JTAG clk=%d kHz", speed, khz);
ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x100);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x1c, speed&~1);
+ ZY1000_POKE(ZY1000_JTAG_BASE + 0x1c, speed);
}
return ERROR_OK;
}
return ERROR_OK;
}
-#if !BUILD_ECOSBOARD
+#if !BUILD_ZY1000_MASTER
static char *tcp_server = "notspecified";
static int jim_zy1000_server(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
report_info,
};
+// File written to /ram/firmware.phi before arriving at this fn
static int jim_zy1000_writefirmware(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
- if (argc != 2)
- return JIM_ERR;
-
- int length;
- const char *str = Jim_GetString(argv[1], &length);
-
- /* */
- int tmpFile;
- if ((tmpFile = open(firmware_info.file, O_RDWR | O_CREAT | O_TRUNC)) <= 0)
- {
- return JIM_ERR;
- }
- bool success;
- success = write(tmpFile, str, length) == length;
- close(tmpFile);
- if (!success)
+ if (argc != 1)
return JIM_ERR;
if (!cyg_firmware_upgrade(NULL, firmware_info))
"With no arguments, prints status.",
.usage = "('on'|'off)",
},
+#if BUILD_ZY1000_MASTER
#if BUILD_ECOSBOARD
{
.name = "zy1000_version",
.help = "Print version info for zy1000.",
.usage = "['openocd'|'zy1000'|'date'|'time'|'pcb'|'fpga']",
},
+#endif
#else
{
.name = "zy1000_server",
static bool readLong(uint32_t *out_data)
{
- if (out_pos > 0)
- {
- if (!flush_writes())
- {
- return false;
- }
- }
-
uint32_t data = 0;
int i;
for (i = 0; i < 4; i++)
uint8_t c;
if (in_pos == in_write)
{
+ /* If we have some data that we can send, send them before
+ * we wait for more data
+ */
+ if (out_pos > 0)
+ {
+ if (!flush_writes())
+ {
+ return false;
+ }
+ }
+
/* read more */
int t;
t = read(tcp_ip, in_buffer, sizeof(in_buffer));
};
-#if !BUILD_ECOSBOARD
+#if !BUILD_ZY1000_MASTER
#include <sys/socket.h> /* for socket(), connect(), send(), and recv() */
#include <arpa/inet.h> /* for sockaddr_in and inet_addr() */
#endif
-#if BUILD_ECOSBOARD
-static char tcpip_stack[2048];
-static cyg_thread tcpip_thread_object;
-static cyg_handle_t tcpip_thread_handle;
+#if BUILD_ZY1000_MASTER
+
+pthread_t thread;
+#if BUILD_ECOSBOARD
static char watchdog_stack[2048];
static cyg_thread watchdog_thread_object;
static cyg_handle_t watchdog_thread_handle;
+#endif
/* Infinite loop peeking & poking */
static void tcpipserver(void)
uint32_t data;
if (!readLong(&data))
return;
- jtag_sleep(data);
+ /* Wait for some us */
+ usleep(data);
break;
}
case ZY1000_CMD_WAITIDLE:
}
-static void tcpip_server(cyg_addrword_t data)
+static void *tcpip_server(void *data)
{
int so_reuseaddr_option = 1;
close(tcp_ip);
}
+ /* Never reached actually */
close(fd);
+ return NULL;
}
#ifdef WATCHDOG_BASE
}
#endif
+#endif
+
+#if BUILD_ZY1000_MASTER
int interface_jtag_add_sleep(uint32_t us)
{
jtag_sleep(us);
return ERROR_OK;
}
-
#endif
+#if BUILD_ZY1000_MASTER && !BUILD_ECOSBOARD
+volatile void *zy1000_jtag_master;
+#include <sys/mman.h>
+#endif
int zy1000_init(void)
{
#if BUILD_ECOSBOARD
LOG_USER("%s", ZYLIN_OPENOCD_VERSION);
+#elif BUILD_ZY1000_MASTER
+ int fd;
+ if((fd = open("/dev/mem", O_RDWR | O_SYNC)) == -1)
+ {
+ LOG_ERROR("No access to /dev/mem");
+ return ERROR_FAIL;
+ }
+#ifndef REGISTERS_BASE
+#define REGISTERS_BASE 0x9002000
+#define REGISTERS_SPAN 128
#endif
+
+ zy1000_jtag_master = mmap(0, REGISTERS_SPAN, PROT_READ | PROT_WRITE, MAP_SHARED, fd, REGISTERS_BASE);
+
+ if(zy1000_jtag_master == (void *) -1)
+ {
+ close(fd);
+ LOG_ERROR("No access to /dev/mem");
+ return ERROR_FAIL;
+ }
+#endif
+
+
ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x30); // Turn on LED1 & LED2
/* deassert resets. Important to avoid infinite loop waiting for SRST to deassert */
zy1000_reset(0, 0);
- zy1000_speed(jtag_get_speed());
+ int jtag_speed_var;
+ int retval = jtag_get_speed(&jtag_speed_var);
+ if (retval != ERROR_OK)
+ return retval;
+ zy1000_speed(jtag_speed_var);
+#if BUILD_ZY1000_MASTER
+ pthread_create(&thread, NULL, tcpip_server, NULL);
#if BUILD_ECOSBOARD
- cyg_thread_create(1, tcpip_server, (cyg_addrword_t) 0, "tcip/ip server",
- (void *) tcpip_stack, sizeof(tcpip_stack),
- &tcpip_thread_handle, &tcpip_thread_object);
- cyg_thread_resume(tcpip_thread_handle);
#ifdef WATCHDOG_BASE
cyg_thread_create(1, watchdog_server, (cyg_addrword_t) 0, "watchdog tcip/ip server",
(void *) watchdog_stack, sizeof(watchdog_stack),
&watchdog_thread_handle, &watchdog_thread_object);
cyg_thread_resume(watchdog_thread_handle);
#endif
+#endif
#endif
return ERROR_OK;
Code Review / openocd.git / blobdiff