Andreas Fritiofson <andreas.fritiofson@gmail.com> UTF8 fixes

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

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 73efcd2ef4bea9e07e4a3696d89c273125099d4d..8e896380c2ae29d7063eeb3fc344d1939ac747f6 100644 (file)
--- 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-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  *
@@ -28,7 +28,7 @@
 #include <cyg/hal/hal_diag.h>
 
 
-#define ZYLIN_VERSION "1.52"
+#define ZYLIN_VERSION "1.54"
 #define ZYLIN_DATE __DATE__
 #define ZYLIN_TIME __TIME__
 #define ZYLIN_OPENOCD "$Revision$"
@@ -164,7 +164,7 @@ void zy1000_reset(int trst, int srst)
        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
@@ -179,7 +179,7 @@ void zy1000_reset(int trst, int srst)
                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);
                }
@@ -283,6 +283,14 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv
                {
                        version_str = ZYLIN_DATE;
                }
+               else if (strcmp("pcb", str) == 0)
+               {
+#ifdef CYGPKG_HAL_NIOS2
+                       version_str="c";
+#else
+                       version_str="b";
+#endif
+               }
                else
                {
                        return JIM_ERR;
@@ -295,6 +303,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,
@@ -324,6 +363,11 @@ int zy1000_register_commands(struct command_context_s *cmd_ctx)
 
        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;
 }
 
@@ -412,7 +456,12 @@ static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endSt
 
 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;
@@ -434,20 +483,20 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_
 
                // 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.
@@ -455,7 +504,7 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_
                        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;
                                }
@@ -472,7 +521,7 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_
                                // 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;
                                }
@@ -497,14 +546,7 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s
        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;
 
@@ -517,7 +559,7 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s
                        {
                                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);
 
@@ -535,12 +577,13 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s
                        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;
 }
@@ -551,7 +594,8 @@ 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)
 {
-       scanFields(num_fields, fields, TAP_IRSHIFT, state);
+       scanFields(num_fields, fields, TAP_IRSHIFT, 1);
+       gotoEndState(state);
 
        return ERROR_OK;
 }
@@ -567,14 +611,7 @@ int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_s
        {
                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++)
                {
@@ -582,7 +619,7 @@ int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_s
                        {
                                found = 1;
 
-                               scanFields(1, fields + j, TAP_DRSHIFT, end_state);
+                               scanFields(1, fields+j, TAP_DRSHIFT, pause);
                        }
                }
                if (!found)
@@ -593,18 +630,20 @@ int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_s
                        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;
 }
 
@@ -634,11 +673,11 @@ 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<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;
                }