zy1000: reset bugfix

[openocd.git] / src / jtag / zy1000 / zy1000.c

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 30b9a4ba44b178a47424623fc1ee678e73e8dc1e..9070f2e382c6e385184572516d17cd928fc7b08c 100644 (file)
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -55,6 +55,11 @@
 
 #include <time.h>
 
+#ifdef CYGPKG_HAL_NIOS2
+#include <cyg/hal/io.h>
+#include <cyg/firmwareutil/firmwareutil.h>
+#endif
+
 #define ZYLIN_VERSION GIT_ZY1000_VERSION
 #define ZYLIN_DATE __DATE__
 #define ZYLIN_TIME __TIME__
@@ -127,6 +132,13 @@ static int zy1000_power_dropout(int *dropout)
 void zy1000_reset(int trst, int srst)
 {
        LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
+
+       /* flush the JTAG FIFO. Not flushing the queue before messing with
+        * reset has such interesting bugs as causing hard to reproduce
+        * RCLK bugs as RCLK will stop responding when TRST is asserted
+        */
+       waitIdle();
+
        if (!srst)
        {
                ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000001);
@@ -151,7 +163,6 @@ void zy1000_reset(int trst, int srst)
 
        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);
        } else
@@ -322,33 +333,57 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv
 
 
 #ifdef CYGPKG_HAL_NIOS2
+
+
+struct info_forward
+{
+       void *data;
+       struct cyg_upgrade_info *upgraded_file;
+};
+
+static void report_info(void *data, const char * format, va_list args)
+{
+       char *s = alloc_vprintf(format, args);
+       LOG_USER_N("%s", s);
+       free(s);
+}
+
+struct cyg_upgrade_info firmware_info =
+{
+               (cyg_uint8 *)0x84000000,
+               "/ram/firmware.phi",
+               "Firmware",
+               0x0300000,
+               0x1f00000 -
+               0x0300000,
+               "ZylinNiosFirmware\n",
+               report_info,
+};
+
 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)
+       /* */
+       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)
                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;
+       if (!cyg_firmware_upgrade(NULL, firmware_info))
+               return JIM_ERR;
 
-    return JIM_OK;
+       return JIM_OK;
 }
 #endif
 
@@ -803,29 +838,32 @@ void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer,
 static const struct command_registration zy1000_commands[] = {
        {
                .name = "power",
-               .handler = &handle_power_command,
+               .handler = handle_power_command,
                .mode = COMMAND_ANY,
-               .help = "turn power switch to target on/off. No arguments - print status.",
-               .usage = "power <on/off>",
+               .help = "Turn power switch to target on/off. "
+                       "With no arguments, prints status.",
+               .usage = "('on'|'off)",
        },
        {
                .name = "zy1000_version",
                .mode = COMMAND_ANY,
-               .jim_handler = &jim_zy1000_version,
-               .help = "print version info for zy1000",
+               .jim_handler = jim_zy1000_version,
+               .help = "Print version info for zy1000.",
+               .usage = "['openocd'|'zy1000'|'date'|'time'|'pcb'|'fpga']",
        },
        {
                .name = "powerstatus",
                .mode = COMMAND_ANY,
-               .jim_handler = & zylinjtag_Jim_Command_powerstatus,
-               .help = "print power status of target",
+               .jim_handler = zylinjtag_Jim_Command_powerstatus,
+               .help = "Returns power status of target",
        },
 #ifdef CYGPKG_HAL_NIOS2
        {
                .name = "updatezy1000firmware",
                .mode = COMMAND_ANY,
-               .jim_handler = &jim_zy1000_writefirmware,
+               .jim_handler = jim_zy1000_writefirmware,
                .help = "writes firmware to flash",
+               /* .usage = "some_string", */
        },
 #endif
        COMMAND_REGISTRATION_DONE